summaryrefslogtreecommitdiff
path: root/scripts/boot
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-02-09 08:13:42 +0100
committerDaniel Baumann <daniel@debian.org>2013-02-09 08:13:42 +0100
commit5d5053ed5b0d1f5cfcb006bfdfdc881e03de1e75 (patch)
tree3df20dd19c2bfda7ef1dbca71733407136c84135 /scripts/boot
parent19ee123659d0df348287019a15cef64bac2af295 (diff)
downloadlive-boot-5d5053ed5b0d1f5cfcb006bfdfdc881e03de1e75.tar.gz
live-boot-5d5053ed5b0d1f5cfcb006bfdfdc881e03de1e75.zip
Improving test for /etc/fstab.d support by testing for its existence instead of /run's one.
Diffstat (limited to 'scripts/boot')
-rwxr-xr-xscripts/boot/3020-swapon2
-rwxr-xr-xscripts/boot/9990-fstab.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
index 7541c26..e7aed6c 100755
--- 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
--- 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"