summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-02-19 20:37:46 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-02-19 20:37:46 +0000
commit643f9eecba4da8f65f2434b468f3e8a24b53a1ef (patch)
tree7dbe9d4f9ea94887c0626dc76c30193c04641f61
parent9f213c7e5f55d28207d27fa132ea539d0c267fe0 (diff)
downloaddrakx-643f9eecba4da8f65f2434b468f3e8a24b53a1ef.tar
drakx-643f9eecba4da8f65f2434b468f3e8a24b53a1ef.tar.gz
drakx-643f9eecba4da8f65f2434b468f3e8a24b53a1ef.tar.bz2
drakx-643f9eecba4da8f65f2434b468f3e8a24b53a1ef.tar.xz
drakx-643f9eecba4da8f65f2434b468f3e8a24b53a1ef.zip
x86-64 now has only the following images for now: cdrom, network, usb, blank.
Make sure we don't default to a text install. network.img fits on a floppy. ;-)
-rw-r--r--Makefile2
-rwxr-xr-xmake_boot_img8
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 13c551f8c..1381219d5 100644
--- a/Makefile
+++ b/Makefile
@@ -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 {