From 1bb77a590969ebece3f87294ca133953d6cb6f89 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Dec 2012 14:28:03 -0500 Subject: [PATCH] Handle current dracut livedir argument. (#881124) --- fedora-live-base.ks | 4 ++++ fedora-live-mini.ks | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 55ae05e..0071987 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -83,6 +83,10 @@ ln -sf /dev/null /etc/systemd/system/hwclock-save.service livedir="LiveOS" for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then + livedir=\${arg##rd.live.dir=} + return + fi if [ "\${arg##live_dir=}" != "\${arg}" ]; then livedir=\${arg##live_dir=} return diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks index 7572df5..4aeafc5 100644 --- a/fedora-live-mini.ks +++ b/fedora-live-mini.ks @@ -127,6 +127,10 @@ ln -sf /dev/null /etc/systemd/system/hwclock-save.service livedir="LiveOS" for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then + livedir=\${arg##rd.live.dir=} + return + fi if [ "\${arg##live_dir=}" != "\${arg}" ]; then livedir=\${arg##live_dir=} return