diff options
Diffstat (limited to 'perl-install/modules/modprobe_conf.pm')
| -rw-r--r-- | perl-install/modules/modprobe_conf.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm index b2a57717d..7989096f8 100644 --- a/perl-install/modules/modprobe_conf.pm +++ b/perl-install/modules/modprobe_conf.pm @@ -1,7 +1,8 @@ -package modules::modprobe_conf; # $Id$ +package modules::modprobe_conf; use log; use common; +# perl_checker: require modules::any_conf our @ISA = qw(modules::any_conf); @@ -21,7 +22,7 @@ sub get_above { my (undef, $after) = parse_non_virtual($module, $conf->{$module}{install}) or return; my ($l, $_other_cmds) = partition_modprobes($after); - join(' ', @$l); + @$l; } sub set_above { my ($conf, $module, $o_modules) = @_; @@ -102,7 +103,7 @@ sub parse_non_virtual { sub unparse_non_virtual { my ($module, $mode, $before, $after) = @_; ($before ? "$before; " : '') - . "/sbin/modprobe --first-time $mode $module" + . (($before || $after) ? "/sbin/modprobe --first-time $mode $module" : '') . ($after ? " && { $after; /bin/true; }" : ''); } |
