diff options
| -rwxr-xr-x | scripts/boot/0110-cmdline | 9 | ||||
| -rwxr-xr-x | scripts/boot/3020-swapon | 22 | ||||
| -rwxr-xr-x | scripts/boot/9990-main.sh | 6 |
3 files changed, 19 insertions, 18 deletions
diff --git a/scripts/boot/0110-cmdline b/scripts/boot/0110-cmdline index aa12286..a959c73 100755 --- a/scripts/boot/0110-cmdline +++ b/scripts/boot/0110-cmdline @@ -11,15 +11,6 @@ Cmdline () LIVE_READ_ONLY="true" ;; - live-boot.swapon=*|swapon=*) - LIVE_SWAPON="true" - LIVE_SWAPON_DEVICES="${_PARAMETER#*swapon=}" - ;; - - live-boot.swapon|swapon) - LIVE_SWAPON="true" - ;; - live-boot.verify-checksums|verify-checksums) LIVE_VERIFY_CHECKSUMS="true" ;; diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon index 281fd04..82e998a 100755 --- a/scripts/boot/3020-swapon +++ b/scripts/boot/3020-swapon @@ -2,14 +2,28 @@ #set -e -Swapon () +Swap () { - if [ "${LIVE_SWAPON}" != "true" ] + for _PARAMETER in ${_CMDLINE} + do + case "${_PARAMETER}" in + live-boot.swap=*|swap=*) + LIVE_SWAP="true" + LIVE_SWAP_DEVICES="${_PARAMETER#*swap=}" + ;; + + live-boot.swap|swap) + LIVE_SWAP="true" + ;; + esac + done + + if [ "${LIVE_SWAP}" != "true" ] then return 0 fi - LIVE_SWAPON_DEVICES="${LIVE_SWAPON_DEVICES:-/dev/sd* /dev/vd*}" + LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}" if [ -e /run ] then @@ -20,7 +34,7 @@ Swapon () _FSTAB="/root/etc/fstab" fi - for _DEVICE in $(echo ${LIVE_SWAPON_DEVICES} | sed -e 's|,| |g') + for _DEVICE in $(echo ${LIVE_SWAP_DEVICES} | sed -e 's|,| |g') do if [ ! -b "${_DEVICE}" ] then diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index 3ad6a72..b1bdf42 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -203,11 +203,7 @@ Main () Fstab Netbase - case "${LIVE_SWAPON}" in - true) - Swapon - ;; - esac + Swap case "${UNIONFS}" in unionfs-fuse) |