[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Improving test for /etc/fstab.d support by testing for its existence instead of /run's one.



From: Tails developers <amnesia@boum.org>

E.g. when running Squeeze + initramfs-tools from sid, one has /run in the
initramfs but no /etc/fstab.d, so testing for the (not necessarily correlated)
presence of /run makes live-boot think it's running on Wheezy, and mistakenly
try to use /etc/fstab.d.
---
 scripts/boot/3020-swapon   |    2 +-
 scripts/boot/9990-fstab.sh |    2 +-
 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"
-- 
1.7.10.4


Reply to: