From a2fd2b101d5a5cc8b785e32af549c1da78dc6fb4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 5 May 2014 11:42:21 -0700 Subject: [PATCH] Use inst.repo and inst.stage2 --- tools/livecd-iso-to-disk.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 28b5a36..bca3286 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1196,9 +1196,9 @@ if [ -n "$packages" -a -z "$skipcopy" ]; then copyFile "$SRC" "$TGTMNT/" # Setup a repo= to point to the .iso - sed -i -e "s;initrd.img;initrd.img repo=hd:$TGTLABEL:/;g" $BOOTCONFIG + sed -i -e "s;initrd.img;initrd.img inst.repo=hd:$TGTLABEL:/;g" $BOOTCONFIG if [ -n "$efi" ]; then - sed -i -e "s;vmlinuz;vmlinuz repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI + sed -i -e "s;vmlinuz;vmlinuz inst.repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI fi else echo "Copying package data from $SRC to device" @@ -1262,13 +1262,13 @@ fi # DVD Installer for netinst if [ "$srctype" != "live" ]; then if [ "$imgtype" = "install" ]; then - sed -i -e "s;initrd.img;initrd.img stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG + sed -i -e "s;initrd.img;initrd.img inst.stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG if [ -n "$efi" ]; then - sed -i -e "s;vmlinuz;vmlinuz stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG_EFI + sed -i -e "s;vmlinuz;vmlinuz inst.stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG_EFI fi else # The initrd has everything, so no stage2 - sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI + sed -i -e "s;\S*stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI fi fi -- 2.11.4.GIT