bbaassssiiee
/
fedora-kickstarts
forked from srbala/fedora-kickstarts
1
0
Fork 0
Code Issues Pull Requests Releases Activity

put back escaping, revert other unjustified syntax changes from fgrose

This commit is contained in:
Adam Williamson 2012-05-08 12:37:27 -07:00
parent 99cd6d592e
commit 3ac66a0add
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fedora-live-base.ks
View File

@ -103,9 +103,8 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
action "Enabling swap partition \$s" swapon \$s action "Enabling swap partition \$s" swapon \$s
done done
fi fi
if ! strstr "$(cat /proc/cmdline)" noswap && if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
[[ -f /run/initramfs/live/${livedir}/swap.img ]] ; then action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
action "Enabling swap file" swapon /run/initramfs/live/${livedir}/swap.img
fi fi
mountPersistentHome() { mountPersistentHome() {
@ -120,7 +119,7 @@ mountPersistentHome() {
mountopts="-t jffs2" mountopts="-t jffs2"
elif [ ! -b "\$homedev" ]; then elif [ ! -b "\$homedev" ]; then
loopdev=\`losetup -f\` 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 action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
fi fi
losetup \$loopdev \$homedev losetup \$loopdev \$homedev
@ -155,8 +154,8 @@ findPersistentHome() {
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
findPersistentHome findPersistentHome
elif [[ -e /run/initramfs/live/${livedir}/home.img ]]; then elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
homedev=/run/initramfs/live/${livedir}/home.img homedev=/run/initramfs/live/\${livedir}/home.img
fi fi
# if we have a persistent /home, then we want to go ahead and mount it # if we have a persistent /home, then we want to go ahead and mount it