Resolves: rhbz#782108 --- share/ppc.tmpl | 4 ++-- share/sparc.tmpl | 4 ++-- share/x86.tmpl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/share/ppc.tmpl b/share/ppc.tmpl index 66b10bc..5c27d36 100644 --- a/share/ppc.tmpl +++ b/share/ppc.tmpl @@ -2,7 +2,7 @@ <% configdir="tmp/config_files/ppc" BOOTDIR="ppc" -LIVEDIR="LiveOS" +LIVEDIR="images/anaconda" MACDIR=BOOTDIR+"/mac" NETBOOTDIR="images/netboot" @@ -18,7 +18,7 @@ prepboot = "" ## with '_', which means we won't need any udev escapes. isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel) -rootarg = "root=live:CDLABEL=%s" % isolabel +rootarg = "root=live:CDLABEL=%s rd.live.dir=%s" % (isolabel, LIVEDIR) %> mkdir ${LIVEDIR} diff --git a/share/sparc.tmpl b/share/sparc.tmpl index 89ea823..d470058 100644 --- a/share/sparc.tmpl +++ b/share/sparc.tmpl @@ -2,7 +2,7 @@ <% configdir="tmp/config_files/sparc" BOOTDIR="boot" -LIVEDIR="LiveOS" +LIVEDIR="images/anaconda" %> mkdir ${LIVEDIR} @@ -17,7 +17,7 @@ install ${configdir}/boot.msg ${BOOTDIR} ## configure bootloader replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @PRODUCT@ ${product.name} ${BOOTDIR}/boot.msg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf +replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} rd.live.dir=${LIVEDIR}' ${BOOTDIR}/silo.conf ## install kernels ## FIXME: this will overwrite if there are multiple sparc kernels diff --git a/share/x86.tmpl b/share/x86.tmpl index 4c0a371..a1aa51c 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -5,7 +5,7 @@ SYSLINUXDIR="usr/share/syslinux" PXEBOOTDIR="images/pxeboot" BOOTDIR="isolinux" KERNELDIR=PXEBOOTDIR -LIVEDIR="LiveOS" +LIVEDIR="images/anaconda" %> mkdir ${LIVEDIR} @@ -24,7 +24,7 @@ install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png ## configure bootloader replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg replace @PRODUCT@ ${product.name} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg +replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} rd.live.dir=${LIVEDIR}' ${BOOTDIR}/isolinux.cfg ## install kernels mkdir ${KERNELDIR} -- 1.7.5.4 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list