drop stop-using-etc-fstab.d.patch, applied upstream

diff --git a/debian/patches/series b/debian/patches/series
index cb8aa99..dce736d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,4 +17,3 @@ grml-specific/package_rename.patch
 reverts/drop_nameserver_from_ip_option.patch
 reverts/restore_support_for_old_persistence.patch
 41_vlan_support.patch
 reverts/drop_nameserver_from_ip_option.patch
 reverts/restore_support_for_old_persistence.patch
 41_vlan_support.patch

-stop-using-etc-fstab.d.patch

diff --git a/debian/patches/stop-using-etc-fstab.d.patch b/debian/patches/stop-using-etc-fstab.d.patch
deleted file mode 100644 (file)
index ea7f4fc..0000000
--- a/debian/patches/stop-using-etc-fstab.d.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f587cb900b3100f31d379f3f9e1b60521c5ebc69 Mon Sep 17 00:00:00 2001
-From: Daniel Baumann <mail@daniel-baumann.ch>
-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 <evgeni+git@golov.de> for reporting it.
-
----
- components/3020-swap     | 8 ++++----
- components/9990-fstab.sh | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/components/3020-swap b/components/3020-swap
-index a1bcdbe..345b9a0 100755
---- a/components/3020-swap
-+++ b/components/3020-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
-       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
-+              grep -v "swap swap" /root/etc/fstab > /root/etc/fstab.tmp
-+              mv /root/etc/fstab.tmp /root/etc/fstab
-       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
-+++ b/components/9990-fstab.sh
-@@ -15,14 +15,14 @@ Fstab ()
- 
-       log_begin_msg "Configuring fstab"
- 
--      if ! grep -qs  "^${UNIONTYPE}" /root/etc/fstab.d/live
-+      if ! grep -qs  "^${UNIONTYPE}" /root/etc/fstab
-       then
--              echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
-+              echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab
-       fi
- 
--      if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
-+      if ! grep -qs "^tmpfs /tmp" /root/etc/fstab
-       then
--              echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
-+              echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab
-       fi
- 
-       log_end_msg
--- 
-2.1.3
-