summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-08 14:02:54 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-08 14:02:54 +0000
commitae8d5c553da4ba827b4462c5803d9920ea068fb6 (patch)
tree11fbdf239a1be7e9fcd8fc8236cff8d3dd81cd0c
parent5b2f43708ad299e62a2581bde8f760d586d4259e (diff)
downloadcontrol-center-ae8d5c553da4ba827b4462c5803d9920ea068fb6.tar
control-center-ae8d5c553da4ba827b4462c5803d9920ea068fb6.tar.gz
control-center-ae8d5c553da4ba827b4462c5803d9920ea068fb6.tar.bz2
control-center-ae8d5c553da4ba827b4462c5803d9920ea068fb6.tar.xz
control-center-ae8d5c553da4ba827b4462c5803d9920ea068fb6.zip
use harddrake2
-rwxr-xr-xcontrol-center13
1 files changed, 10 insertions, 3 deletions
diff --git a/control-center b/control-center
index b4cd903f..12d41023 100755
--- a/control-center
+++ b/control-center
@@ -87,7 +87,7 @@ my $exec_hash =
_("Boot Config") => [ "drakboot", "$_sbindir/drakboot", 1 ],
_("Auto Install") => [ "drakautoinst", "$_sbindir/drakautoinst", 1 ],
_("Display") => [ "XFdrake", "$_sbindir/XFdrake", 1 ],
- _("Hardware List") => [ "harddrake", "$_sbindir/harddrake", 1 ],
+ _("Hardware List") => [ "harddrake", "$_sbindir/harddrake2", 1 ],
_("Mouse") => [ "mousedrake", "$_sbindir/mousedrake", 1 ],
_("Printer") => [ "printerdrake", "$_sbindir/printerdrake", 1, "$_sbindir/printerdrake" ],
_("Scanner") => [ "scannerdrake", "$_sbindir/scannerdrake", 1 ],
@@ -204,9 +204,17 @@ my @tree =
[_("Date & Time") , 'time-mdk'],
[_("Software Manager"), 'rpmdrake-mdk'],
[_("Logs"), 'logdrake-mdk'],
+<<<<<<< control-center
+ [_("Console"), 'drakboot-mdk'],
+=======
[_("Console"), 'console-mdk'],
+<<<<<<< control-center
+ [_("Users"), 'user-mdk'],
+>>>>>>> 1.111
+=======
# [_("Users"), 'user-mdk'],
# [_("RFBDrake"), 'unknown-mdk'],
+>>>>>>> 1.130
]
],
if_($::isWiz,
@@ -543,8 +551,7 @@ sub sig_usr2 {
}
sub compute_exec_string {
- my ($arg) = @_;
- my ($log_exp, $exec, $gtkplug, $alternate) = @$arg;
+ my ($log_exp, $exec, $gtkplug, $alternate) = @$_;
if ($embedded) {
if ($gtkplug != -1) {
$notebook_global->hide;