summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-09-27 17:11:12 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-09-27 17:11:12 +0000
commit40cf005bdfd60119f51508258078b9fcde9523c8 (patch)
treeab23124cc0b2262496cfbff039e93b70d399b1a0
parent7440aeec169e3122b49da452c2603eee272297bb (diff)
downloaddrakx-40cf005bdfd60119f51508258078b9fcde9523c8.tar
drakx-40cf005bdfd60119f51508258078b9fcde9523c8.tar.gz
drakx-40cf005bdfd60119f51508258078b9fcde9523c8.tar.bz2
drakx-40cf005bdfd60119f51508258078b9fcde9523c8.tar.xz
drakx-40cf005bdfd60119f51508258078b9fcde9523c8.zip
initrd: fix blank.img; minor: use "member" instead of many eq in
another place
-rwxr-xr-xmake_boot_img8
1 files changed, 5 insertions, 3 deletions
diff --git a/make_boot_img b/make_boot_img
index 269be0e5a..5e8fea011 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -105,7 +105,7 @@ sub initrd {
install_stripped("$instdir/init", "$mnt/sbin");
install_stripped("$instdir/$install", "$mnt/sbin/stage1");
- if ($type eq "network" || $type eq "usb" || $type eq "all" || $type eq "other" || $type eq "blank") {
+ if (member($type, qw(network usb all other blank))) {
install_stripped("$instdir/ppp/pppd-bin", "$mnt/sbin/pppd");
install_stripped("$instdir/rp-pppoe/pppoe-bin", "$mnt/sbin/pppoe");
_ "$sudo mknod $mnt/dev/ppp c 108 0";
@@ -121,8 +121,10 @@ sub initrd {
}
my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
$modz = "kernel/all.modules$I/$ext";
- _ "$sudo cp -f $modz/${ltype}_modules.mar $mnt/modules/modules$I.mar" if $type !~ /blank/;
- _ "$sudo cp -f $modz/modules.dep $mnt/modules/";
+ if ($type !~ /blank/) {
+ _ "$sudo cp -f $modz/${ltype}_modules.mar $mnt/modules/modules$I.mar" ;
+ _ "$sudo cp -f $modz/modules.dep $mnt/modules/";
+ }
_ "$sudo umount $mnt";