diff options
| author | Adam Williamson <awilliam@redhat.com> | 2012-05-08 12:37:27 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2012-05-08 12:38:11 -0700 |
| commit | 3ac66a0add9f028b9b9d1084a20616a074d3b8f9 (patch) | |
| tree | 657404528993e2aa4689ced9606c8bc47459fd06 /fedora-live-base.ks | |
| parent | 99cd6d592ed887858d52d9cbf5958ac9562d178c (diff) | |
| download | spin-kickstarts-3ac66a0add9f028b9b9d1084a20616a074d3b8f9.tar.gz spin-kickstarts-3ac66a0add9f028b9b9d1084a20616a074d3b8f9.tar.xz spin-kickstarts-3ac66a0add9f028b9b9d1084a20616a074d3b8f9.zip | |
put back escaping, revert other unjustified syntax changes from fgrose
Diffstat (limited to 'fedora-live-base.ks')
| -rw-r--r-- | 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 |