From 4cc1c0b680f7b4bad646323465d08e4e339a63a6 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 13 Aug 2009 10:18:59 +0000
Subject: but still allow removing install lines

---
 perl-install/modules/modprobe_conf.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm
index e0169ecf4..c97e2c045 100644
--- a/perl-install/modules/modprobe_conf.pm
+++ b/perl-install/modules/modprobe_conf.pm
@@ -25,9 +25,8 @@ sub get_above {
 }
 sub set_above {
     my ($conf, $module, $o_modules) = @_;
-    return unless $o_modules;
     $module = $conf->mapping($module);
-    my @modules = $conf->mapping(split(' ', $o_modules));
+    my @modules = $conf->mapping(split(' ', $o_modules || ''));
 
     { #- first add to "install" command
 	my ($before, $after) = parse_non_virtual($module, $conf->{$module}{install});
@@ -103,7 +102,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; }" : '');    
 }
 
-- 
cgit v1.2.1