From ca03a162d637be11cbee3804dee75dbd1d37d0d6 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 11 Nov 2014 22:28:59 +0100 Subject: [PATCH] update stop-using-etc-fstab.d.patch to latest upstream version --- debian/patches/stop-using-etc-fstab.d.patch | 34 +++++++++++++++++------------ 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/debian/patches/stop-using-etc-fstab.d.patch b/debian/patches/stop-using-etc-fstab.d.patch index 5ba4590..ea7f4fc 100644 --- a/debian/patches/stop-using-etc-fstab.d.patch +++ b/debian/patches/stop-using-etc-fstab.d.patch @@ -1,24 +1,24 @@ -From 4f8f45737d2dd451eafc8fb6cf8d1ce1917015ee Mon Sep 17 00:00:00 2001 -From: Evgeni Golov -Date: Wed, 29 Oct 2014 18:03:06 +0100 -Subject: [PATCH] stop using /etc/fstab.d +From f587cb900b3100f31d379f3f9e1b60521c5ebc69 Mon Sep 17 00:00:00 2001 +From: Daniel Baumann +Date: Mon, 10 Nov 2014 14:18:04 +0100 +Subject: [PATCH] Dropping usage of /etc/fstab.d since util-linux removed it, + thanks to Evgeni Golov for reporting it. -/etc/fstab.d support was removed from util-linux in 2.25-4: - https://bugs.debian.org/666163 - -Stop using it, and revert back to good old /etc/fstab. --- - components/3020-swap | 4 ++-- + components/3020-swap | 8 ++++---- components/9990-fstab.sh | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/3020-swap b/components/3020-swap -index a1bcdbe..f977d0f 100755 +index a1bcdbe..345b9a0 100755 --- a/components/3020-swap +++ b/components/3020-swap -@@ -50,8 +50,8 @@ Swap () +@@ -48,15 +48,15 @@ Swap () + done + # Remove all auto swap entries - if grep -qs "swap swap" /root/etc/fstab.d/swap +- if grep -qs "swap swap" /root/etc/fstab.d/swap ++ if grep -qs "swap swap" /root/etc/fstab then - grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp - mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap @@ -27,6 +27,12 @@ index a1bcdbe..f977d0f 100755 fi # Add new swap entries + for _DEVICE in ${_SWAP_DEVICES} + do +- echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab.d/swap ++ echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab + done + } diff --git a/components/9990-fstab.sh b/components/9990-fstab.sh index 5ae9546..a8d9123 100755 --- a/components/9990-fstab.sh @@ -51,5 +57,5 @@ index 5ae9546..a8d9123 100755 log_end_msg -- -2.1.1 +2.1.3 -- 2.1.4