diff options
| -rw-r--r-- | move/Makefile | 2 | ||||
| -rwxr-xr-x | move/hack | 5 | ||||
| -rwxr-xr-x | move/hack_boot_img | 2 | ||||
| -rwxr-xr-x | move/hack_cdrom | 5 | ||||
| -rwxr-xr-x | move/hack_network | 5 | ||||
| -rw-r--r-- | move/isolinux/isolinux.cfg | 2 |
6 files changed, 8 insertions, 13 deletions
diff --git a/move/Makefile b/move/Makefile index 312784dd3..621e36904 100644 --- a/move/Makefile +++ b/move/Makefile @@ -27,7 +27,7 @@ endif all: install build: xwait runlevel_set isolinux/boot.msg - cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make init stage1-network stage1-cdrom init-move + cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make init stage1-full init-move sudo ./collect-directories-to-create.pl $(DEST_LIVETREE) > data/directories-to-create sudo find $(DEST_LIVETREE)/etc -type f | perl -pe 's|$(DEST_LIVETREE)||' > data/all-etcfiles $(MAKE) -C ../perl-install mo_files diff --git a/move/hack b/move/hack new file mode 100755 index 000000000..a62d20dac --- /dev/null +++ b/move/hack @@ -0,0 +1,5 @@ +#!/bin/sh + +make DEST_LIVETREE=/opt/live_tree || exit 1 +./hack_boot_img all.rdz all +cp -f all.rdz /tftpboot/gc/network.rdz diff --git a/move/hack_boot_img b/move/hack_boot_img index 3d564616b..1f95cce8e 100755 --- a/move/hack_boot_img +++ b/move/hack_boot_img @@ -67,7 +67,7 @@ sub initrd { my $tar = "$instdir/stage1-data/stage1-with-busybox.tar.bz2"; __ "$sudo umount $tmp $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$tmp bs=1k count=4000"; + _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? 16386 : ($type eq "all" ? 6000 : 4000)); _ "$mke2fs $tmp"; _ "$sudo mount -t ext2 $tmp $mnt -o loop"; diff --git a/move/hack_cdrom b/move/hack_cdrom deleted file mode 100755 index 1779c6ee6..000000000 --- a/move/hack_cdrom +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -make || exit 1 -./hack_boot_img cdrom.rdz cdrom -cp -f cdrom.rdz /tftpboot/gc/network.rdz diff --git a/move/hack_network b/move/hack_network deleted file mode 100755 index 6334b50b2..000000000 --- a/move/hack_network +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -make || exit 1 -./hack_boot_img network.rdz network -cp -f network.rdz /tftpboot/gc/network.rdz diff --git a/move/isolinux/isolinux.cfg b/move/isolinux/isolinux.cfg index 4a692eb41..0d7c3b769 100644 --- a/move/isolinux/isolinux.cfg +++ b/move/isolinux/isolinux.cfg @@ -6,4 +6,4 @@ F1 help.msg F2 boot.msg label linux kernel vmlinuz - append initrd=cdrom.rdz acpi=ht quiet automatic=method:cdrom + append initrd=all.rdz acpi=ht quiet automatic=method:cdrom |