[SCM] wiki-content branch, master, updated. 695d007a456c7b1b8e55d46ae2339e78cde78d2e

[Michal Suchanek]

The following commit has been merged in the master branch:
commit 695d007a456c7b1b8e55d46ae2339e78cde78d2e
Author: Michal Suchanek <hramrach at centrum.cz>
Date:   Tue Feb 15 12:59:59 2011 +0100

    Update Unionount guide to use initramfs-tools conf.d

diff --git a/devel/rfc/live-um.sh b/devel/rfc/live-um.sh
new file mode 100644
index 0000000..6e7d64b
--- /dev/null
+++ b/devel/rfc/live-um.sh
@@ -0,0 +1,4 @@
+um_conf=/usr/share/initramfs-tools/conf-hooks.d/unionmount
+mkdir -p "$(dirname "${um_conf}")"
+echo "LIVE_UNIONMOUNT=true
+export LIVE_UNIONMOUNT" > "${um_conf}"
diff --git a/devel/rfc/unionmount.mdwn b/devel/rfc/unionmount.mdwn
index 25fb489..8592de5 100644
--- a/devel/rfc/unionmount.mdwn
+++ b/devel/rfc/unionmount.mdwn
@@ -12,7 +12,7 @@
   * Mount command with unionmount support
     - here is a [patch](../util-linux-union.patch) which you can apply to Squeeze util-linux and rebuild. It may break some other options, I am not sure how those defines are supposed to work. You only need the mount package.
   * Put your mount command into your initramfs
-    - a [patch](../unionmount_initramfs_mount.patch) you can apply to live-initramfs either directly or put it in chroot_local-patches
+    - using a [hook](../live-um.sh) (put in chroot_local-hooks). With recent live-boot-initramfs-tools you should see unionmount among the included options printed during update-initramfs.
   * Tell live-initramfs to use unionmount instead of aufs
      - Use some arguments like these with lb config
 
diff --git a/devel/rfc/unionmount_initramfs_mount.patch b/devel/rfc/unionmount_initramfs_mount.patch
deleted file mode 100644
index 0903ace..0000000
--- a/devel/rfc/unionmount_initramfs_mount.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /usr/share/initramfs-tools/hooks/live~	2010-07-11 01:19:32.000000000 +0200
-+++ /usr/share/initramfs-tools/hooks/live	2010-07-12 17:58:54.000000000 +0200
-@@ -223,3 +223,7 @@
-     manual_add_modules iscsi_tcp
-     manual_add_modules crc32c
- fi
-+
-+# UnionMount
-+    # only mount from patched util-linux can do this currently
-+    copy_exec /bin/mount /bin/mount_full

-- 
wiki-content