1 From 4f8f45737d2dd451eafc8fb6cf8d1ce1917015ee Mon Sep 17 00:00:00 2001
2 From: Evgeni Golov <evgeni@grml.org>
3 Date: Wed, 29 Oct 2014 18:03:06 +0100
4 Subject: [PATCH] stop using /etc/fstab.d
6 /etc/fstab.d support was removed from util-linux in 2.25-4:
7 https://bugs.debian.org/666163
9 Stop using it, and revert back to good old /etc/fstab.
11 components/3020-swap | 4 ++--
12 components/9990-fstab.sh | 8 ++++----
13 2 files changed, 6 insertions(+), 6 deletions(-)
15 diff --git a/components/3020-swap b/components/3020-swap
16 index a1bcdbe..f977d0f 100755
17 --- a/components/3020-swap
18 +++ b/components/3020-swap
19 @@ -50,8 +50,8 @@ Swap ()
20 # Remove all auto swap entries
21 if grep -qs "swap swap" /root/etc/fstab.d/swap
23 - grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp
24 - mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap
25 + grep -v "swap swap" /root/etc/fstab > /root/etc/fstab.tmp
26 + mv /root/etc/fstab.tmp /root/etc/fstab
29 # Add new swap entries
30 diff --git a/components/9990-fstab.sh b/components/9990-fstab.sh
31 index 5ae9546..a8d9123 100755
32 --- a/components/9990-fstab.sh
33 +++ b/components/9990-fstab.sh
34 @@ -15,14 +15,14 @@ Fstab ()
36 log_begin_msg "Configuring fstab"
38 - if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab.d/live
39 + if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab
41 - echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
42 + echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab
45 - if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
46 + if ! grep -qs "^tmpfs /tmp" /root/etc/fstab
48 - echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
49 + echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab