summaryrefslogtreecommitdiffstats
path: root/make_boot_img
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-03-12 12:00:11 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-03-12 12:00:11 +0000
commita712a822389cb932fbe562e86eddbbecc797fb2f (patch)
treef7f6ce8bbb7b94d88af4c5557c473e8d3ef60611 /make_boot_img
parentc4168c7269848944cc47d9c9cb736445b90d5209 (diff)
downloaddrakx-a712a822389cb932fbe562e86eddbbecc797fb2f.tar
drakx-a712a822389cb932fbe562e86eddbbecc797fb2f.tar.gz
drakx-a712a822389cb932fbe562e86eddbbecc797fb2f.tar.bz2
drakx-a712a822389cb932fbe562e86eddbbecc797fb2f.tar.xz
drakx-a712a822389cb932fbe562e86eddbbecc797fb2f.zip
do not use graphical-syslinux for network.img
Diffstat (limited to 'make_boot_img')
-rwxr-xr-xmake_boot_img8
1 files changed, 5 insertions, 3 deletions
diff --git a/make_boot_img b/make_boot_img
index 1d9daecd0..52a432e19 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -86,15 +86,17 @@ sub boot_img_i386 {
__ "$sudo umount $mnt 2>/dev/null";
my $automatic = "";
- if ($type eq "hd") {
+ if ($type eq "hd" || $type eq "network") {
_ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img";
- $automatic = "automatic=method:disk";
} elsif ($type eq "all") {
_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img";
} else {
_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo.img.bz2 > $img";
- $automatic = "automatic=method:cdrom" if ($type eq "cdrom");
}
+
+ $automatic = "automatic=method:cdrom" if ($type eq "cdrom");
+ $automatic = "automatic=method:disk" if ($type eq "hd");
+
_ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop";
_ "cat vmlinuz > $mnt/vmlinuz" if $type !~ /blank/;
-f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz");