Drop debian/patches/03_fix_cow_tmpfs_mount.dpatch

diff --git a/debian/changelog b/debian/changelog
index a742efe..74fc844 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ live-initramfs (1.139.1-2~grml.01) unstable; urgency=low
 
   * Resync with Debian's 1.139.1-1 version.
     [Closes: issue497]
+  * Drop debian/patches/03_fix_cow_tmpfs_mount.dpatch.
 
- -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 14:28:10 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 14:32:19 +0200
 
 live-initramfs (1.136.3-2~grml.04) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index b99df49..7af8eb4 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,4 @@
 01_add_rsync.dpatch
 02_more_verbose_toram.diff
-03_fix_cow_tmpfs_mount.dpatch
 04_get_rid_of_utillinux-mountbinary.dpatch
 05_boot_failure_message_grml.dpatch

diff --git a/debian/patches/03_fix_cow_tmpfs_mount.dpatch b/debian/patches/03_fix_cow_tmpfs_mount.dpatch
deleted file mode 100755 (executable)
index f9bdc59..0000000
--- a/debian/patches/03_fix_cow_tmpfs_mount.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_cow_tmpfs_mount.dpatch by  <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix cow tmpfs mount option handling
-
-@DPATCH@
-
-From afccb65c91dcf8a04f2c8a4969d3e7799087bfc6 Mon Sep 17 00:00:00 2001
-From: Michael Prokop <mika@grml.org>
-Date: Thu, 17 Jul 2008 11:28:30 +0200
-Subject: [PATCH 1/1] Make sure mounting /cow-tmpfs provides mount options
-
-
-Signed-off-by: Michael Prokop <mika@grml.org>
-
-diff --git a/scripts/live b/scripts/live
-index 15710c2..22d2210 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -1118,6 +1118,8 @@ setup_unionfs ()
-               nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
-                       panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
-       else
-+              # make sure cow_mountopt is set:
-+              [ -n "$cow_mountopt" ] || cow_mountopt="rw,noatime,mode=755"
-               mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
-                       panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
-       fi
--- 
-1.5.5.4
-