diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-06 01:01:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-06 01:01:18 +0000 |
| commit | f18434c76326cf6c58d24dc67ef4707ec72f400d (patch) | |
| tree | 3cc12fe883d6bd33ae17a601e8c9666567d346b5 | |
| parent | c75193289b79d4c0687aa6a597b51436568f8360 (diff) | |
| download | drakx-backup-do-not-use-f18434c76326cf6c58d24dc67ef4707ec72f400d.tar drakx-backup-do-not-use-f18434c76326cf6c58d24dc67ef4707ec72f400d.tar.gz drakx-backup-do-not-use-f18434c76326cf6c58d24dc67ef4707ec72f400d.tar.bz2 drakx-backup-do-not-use-f18434c76326cf6c58d24dc67ef4707ec72f400d.tar.xz drakx-backup-do-not-use-f18434c76326cf6c58d24dc67ef4707ec72f400d.zip | |
no_comment
| -rwxr-xr-x | make_boot_img | 1 | ||||
| -rw-r--r-- | perl-install/modules.pm | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/make_boot_img b/make_boot_img index 990aca848..2a309d8bb 100755 --- a/make_boot_img +++ b/make_boot_img @@ -127,7 +127,6 @@ label auto kernel vmlinuz append ramdisk_size=32000 initrd=$type.rdz $type auto_install=auto_inst.cfg.pl "); - _ "cp -f $instdir/installinit/ks.cfg $mnt 2>/dev/null"; _ "sync"; _ "df $mnt"; } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index cf17285e3..bb0ec41d4 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -325,12 +325,12 @@ while (my ($k, $v) = each %drivers) { sub module_of_type__4update_kernel { my ($type) = @_; my %skip; @skip{@skip_modules_on_stage1} = (); - grep { !exists $skip{$_} } grep { $drivers{$_}{type} =~ /^$type$/ } keys %drivers; + grep { !exists $skip{$_} } grep { $drivers{$_}{type} =~ /^($type)$/ } keys %drivers; } sub module_of_type { my ($type) = @_; my $alias = $type_aliases{$type}; - grep { $drivers{$_}{type} =~ /^$type|$alias$/ } keys %drivers; + grep { $drivers{$_}{type} =~ /^(($type)|$alias)$/ } keys %drivers; } sub module2text { $drivers{$_[0]}{text} } |