Add 04_fix_cow_tmpfs_mount.dpatch + 05_get_rid_of_wrong_debug_message.dpatch
authorMichael Prokop <devnull@localhost>
Thu, 17 Jul 2008 11:02:39 +0000 (13:02 +0200)
committerMichael Prokop <devnull@localhost>
Thu, 17 Jul 2008 11:02:39 +0000 (13:02 +0200)
debian/changelog
debian/patches/00list
debian/patches/04_fix_cow_tmpfs_mount.dpatch [new file with mode: 0755]
debian/patches/05_get_rid_of_wrong_debug_message.dpatch [new file with mode: 0755]

index de58416..ea05384 100644 (file)
@@ -1,8 +1,10 @@
 live-initramfs (1.136.2-2~grml.00) unstable; urgency=low
 
   * Rebase against current version of live-initramfs in Debian.
+  * Add debian/patches/04_fix_cow_tmpfs_mount.dpatch and
+    debian/patches/05_get_rid_of_wrong_debug_message.dpatch.
 
- -- Michael Prokop <mika@grml.org>  Thu, 17 Jul 2008 10:27:51 +0200
+ -- Michael Prokop <mika@grml.org>  Thu, 17 Jul 2008 13:02:10 +0200
 
 live-initramfs (1.136.2-1) unstable; urgency=medium
 
index 0cce1fd..a51c36e 100644 (file)
@@ -1,3 +1,5 @@
 01_add_rsync.dpatch
 02_more_verbose_toram.diff
 03_support_for_lzma.diff
+04_fix_cow_tmpfs_mount.dpatch
+05_get_rid_of_wrong_debug_message.dpatch
diff --git a/debian/patches/04_fix_cow_tmpfs_mount.dpatch b/debian/patches/04_fix_cow_tmpfs_mount.dpatch
new file mode 100755 (executable)
index 0000000..51669bc
--- /dev/null
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_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
+
diff --git a/debian/patches/05_get_rid_of_wrong_debug_message.dpatch b/debian/patches/05_get_rid_of_wrong_debug_message.dpatch
new file mode 100755 (executable)
index 0000000..1795e34
--- /dev/null
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_get_rid_of_wrong_debug_message.dpatch.dpatch by  <mika@grml.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Get rid of a wrong placed debug message
+
+@DPATCH@
+
+From 564f7a29349bb7d2cae214773117befce663e6dd Mon Sep 17 00:00:00 2001
+From: Michael Prokop <mika@grml.org>
+Date: Thu, 17 Jul 2008 12:57:15 +0200
+Subject: [PATCH 1/1] Get rid of wrong placed debug message
+
+
+Signed-off-by: Michael Prokop <mika@grml.org>
+
+diff --git a/scripts/live b/scripts/live
+index 15710c2..211367e 100755
+--- a/scripts/live
++++ b/scripts/live
+@@ -1030,7 +1030,7 @@ setup_unionfs ()
+                       fi
+                       mkdir -p "${croot}/${imagename}"
+-                      echo "debug: Mounting backdev \"${backdev}\" (image = ${image}) on croot/imagename \"${croot}/${imagename}\""
++                      [ -n "$DEBUG" ] && echo "debug: Mounting backdev \"${backdev}\" (image = ${image}) on croot/imagename \"${croot}/${imagename}\""
+                       mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
+               fi
+       done
+-- 
+1.5.5.4
+