summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-01-02 18:27:15 +0000
committerOlivier Blin <oblin@mandriva.com>2008-01-02 18:27:15 +0000
commitb55506c8fc80035af7244edcc98c52ef8ddcc2c8 (patch)
tree374346124ac44ec0eecc266c621064db568c8505
parent922306ae1d149c5a3778d85aa4ab6fabfdf935f3 (diff)
downloaddrakx-backup-do-not-use-b55506c8fc80035af7244edcc98c52ef8ddcc2c8.tar
drakx-backup-do-not-use-b55506c8fc80035af7244edcc98c52ef8ddcc2c8.tar.gz
drakx-backup-do-not-use-b55506c8fc80035af7244edcc98c52ef8ddcc2c8.tar.bz2
drakx-backup-do-not-use-b55506c8fc80035af7244edcc98c52ef8ddcc2c8.tar.xz
drakx-backup-do-not-use-b55506c8fc80035af7244edcc98c52ef8ddcc2c8.zip
make "Run config tool" available again (#34794, backport from trunk)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ef3426e94..7cfefeddb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -16,6 +16,7 @@
o mark the service as interactive, so that package requests are
displayed with parallell init
o allow to set zero values in module options (#26515)
+ o make "Run config tool" available again (#34794)
Version 10.4.239 - 5 October 2007, by Thierry Vignaud
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 3a8bdd6ba..0e4c3a069 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -40,7 +40,7 @@ sub is_auto_configurable_media { is_removable($_[0]) || member($_[0], qw(HARDDIS
sub set_removable_configurator {
my ($class, $device) = @_;
- return "/usr/sbin/diskdrake --removable=$device->{device}" if is_removable($class);
+ is_removable($class) ? "/usr/sbin/diskdrake --removable=$device->{device}" : undef;
}
sub set_media_auto_configurator {