commit c551b7dd85a39854c3c5ee10e7fe466d8d37ecea
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue May 8 12:37:27 2012 -0700
put back escaping, revert other unjustified syntax changes from fgrose
fedora-live-base.ks | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 54df915..7f3bafe 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -103,9 +103,8 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n
"\$swaps" ] ; then
action "Enabling swap partition \$s" swapon \$s
done
fi
-if ! strstr "$(cat /proc/cmdline)" noswap &&
- [[ -f /run/initramfs/live/${livedir}/swap.img ]] ; then
- action "Enabling swap file" swapon /run/initramfs/live/${livedir}/swap.img
+if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f
/run/initramfs/live/\${livedir}/swap.img ] ; then
+ action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
fi
mountPersistentHome() {
@@ -120,7 +119,7 @@ mountPersistentHome() {
mountopts="-t jffs2"
elif [ ! -b "\$homedev" ]; then
loopdev=\`losetup -f\`
- if [[ ${homedev##/run/initramfs/live} != ${homedev} ]]; then
+ if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
action "Remounting live store r/w" mount -o remount,rw
/run/initramfs/live
fi
losetup \$loopdev \$homedev
@@ -155,8 +154,8 @@ findPersistentHome() {
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
findPersistentHome
-elif [[ -e /run/initramfs/live/${livedir}/home.img ]]; then
- homedev=/run/initramfs/live/${livedir}/home.img
+elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
+ homedev=/run/initramfs/live/\${livedir}/home.img
fi
# if we have a persistent /home, then we want to go ahead and mount it
Show replies by date