diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | make_boot_img | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -20,7 +20,7 @@ ifeq (ia64,$(ARCH)) BOOT_IMG = all.img endif ifeq (x86_64,$(ARCH)) - BOOT_IMG = all.img + BOOT_IMG = cdrom.img network.img usb.img blank.img endif FBOOT_IMG = $(BOOT_IMG:%=images/%) diff --git a/make_boot_img b/make_boot_img index c876fa64c..6978b6382 100755 --- a/make_boot_img +++ b/make_boot_img @@ -105,7 +105,7 @@ sub initrd { my $tar = "$instdir/stage1-data/stage1.tar.bz2"; __ "$sudo umount $tmp $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($arch =~ /x86_64/ ? 4000 : ($type eq "all" ? 4000 : 2000))); + _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($type eq "all" ? 4000 : 2000)); _ "$mke2fs $tmp"; _ "$sudo mount -t ext2 $tmp $mnt -o loop"; @@ -224,8 +224,8 @@ sub boot_img_x86_64 { __ "$sudo umount $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$img bs=1k count=4096"; - _ "/sbin/mkfs.vfat $img 4096"; + _ "dd if=/dev/zero of=$img bs=1k count=1440"; + _ "/sbin/mkfs.vfat $img"; _ "$sudo syslinux -s $img"; _ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop"; @@ -242,7 +242,7 @@ sub boot_img_x86_64 { my $timeout = 72; output "$mnt/syslinux.cfg", -"default text +"default linux prompt 1 timeout $timeout " . join('', map { |