summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xperl-install/standalone/harddrake25
-rwxr-xr-xperl-install/standalone/service_harddrake4
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index f9506bbc6..4c854211e 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -393,8 +393,9 @@ foreach (@classes) {
if ($Ident eq "AUDIO") {
require harddrake::sound;
my $alter = harddrake::sound::get_alternative($_->{driver});
- my $alternative_drivers = join(', ', @$alter) if $alter->[0] ne 'unknown';
- $_->{alternative_drivers} = $alternative_drivers if $alternative_drivers;
+ if (my $alternative_drivers = $alter->[0] ne 'unknown' && join(', ', @$alter)) {
+ $_->{alternative_drivers} = $alternative_drivers;
+ }
}
if ($Ident eq "HARDDISK") {
my $hd = $_;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index e428145d9..530059ff1 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -16,9 +16,9 @@ use modules;
use Storable qw(store retrieve);
-my $force = any { $_ eq '--force' } @ARGV;
+my $force = member('--force', @ARGV);
-my $mode = 'stop' if $ARGV[0] eq 'stop';
+my $mode = $ARGV[0] eq 'stop' && 'stop';
if ($mode eq 'stop') {
append_to_file('/etc/hotplug/blacklist', "\nsnd-usb-audio\n");