X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F3020-swapon;h=82e998a87db275aeb090d0e3e8526e0818f16d13;hb=e5efea97c9573d24a5cd4aa051a5f39696913bcf;hp=281fd041f38c46afd78307fd91fed375de9569ab;hpb=3b0def1c54e6cd384d1514b26fbf28b091638808;p=live-boot-grml.git 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