Improving test for /etc/fstab.d support by testing for its existence instead of ...

diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
index 7541c26..e7aed6c 100755 (executable)
--- a/scripts/boot/3020-swapon
+++ b/scripts/boot/3020-swapon
@@ -29,7 +29,7 @@ Swap ()
 
        LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}"
 
-       if [ -e /run ]
+       if [ -e /root/etc/fstab.d ]
        then
                # wheezy
                _FSTAB="/root/etc/fstab.d/swap"

diff --git a/scripts/boot/9990-fstab.sh b/scripts/boot/9990-fstab.sh
index dc3f07b..abc7b23 100755 (executable)
--- a/scripts/boot/9990-fstab.sh
+++ b/scripts/boot/9990-fstab.sh
@@ -13,7 +13,7 @@ Fstab ()
                return
        fi
 
-       if [ -e /run ]
+       if [ -e /root/etc/fstab.d ]
        then
                # wheezy
                _FSTAB="/root/etc/fstab.d/live"