tools/livecd-iso-to-disk.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a2fd2b101d5a5cc8b785e32af549c1da78dc6fb4
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon May 5 11:42:21 2014 -0700
Use inst.repo and inst.stage2
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
commit 5a50f0e186423cb3c509ea4af67b52c4bcc373f9
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon May 5 11:21:52 2014 -0700
Use rd.live.overlay instead of overlay
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 696407c..28b5a36 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1291,7 +1291,7 @@ if [ "$overlaysizemb" -gt 0 ]; then
dd if=/dev/null of=$TGTMNT/$LIVEOS/$OVERFILE count=1 bs=1M
seek=$overlaysizemb
fi
fi
- sed -i -e "s/r*d*.*live.*ima*ge*/& overlay=${TGTLABEL}/"\
+ sed -i -e "s/r*d*.*live.*ima*ge*/& rd.live.overlay=${TGTLABEL}/"\
$BOOTCONFIG $BOOTCONFIG_EFI
sed -i -e "s/\ ro\ /\ rw\ /" $BOOTCONFIG $BOOTCONFIG_EFI
fi
Show replies by date