Bug#685375: Breaks booting with nfsroot

[Reinhard Tartler <siretart@tauware.de>]

Package: live-boot
Version: 3.0~b1-1
Followup-For: Bug #685375
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch


*** /tmp/tmpEQf01u/bug_body
In Ubuntu, the attached patch was applied to achieve the following:

  *  ensure that a potentially stray tmpfs gets removed
     otherways, initramfs-tools is unable to remove /live
     and fails to boot. Closes: #685375, LP: #1043834

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise-proposed'), (500, 'precise')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-30-generic (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru live-boot-3.0~b1/debian/changelog live-boot-3.0~b1/debian/changelog
--- live-boot-3.0~b1/debian/changelog	2012-08-16 12:27:22.000000000 +0200
+++ live-boot-3.0~b1/debian/changelog	2012-09-20 09:43:51.000000000 +0200
@@ -1,3 +1,11 @@
+live-boot (3.0~b1-1ubuntu1) quantal; urgency=low
+
+  *  ensure that a potentially stray tmpfs gets removed
+     otherways, initramfs-tools is unable to remove /live
+     and fails to boot. LP: #1043834
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 20 Sep 2012 09:37:53 +0200
+
 live-boot (3.0~b1-1) unstable; urgency=low
 
   [ chals ]
diff -Nru live-boot-3.0~b1/debian/patches/series live-boot-3.0~b1/debian/patches/series
--- live-boot-3.0~b1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ live-boot-3.0~b1/debian/patches/series	2012-09-20 09:40:23.000000000 +0200
@@ -0,0 +1 @@
+unbreak-booting
diff -Nru live-boot-3.0~b1/debian/patches/unbreak-booting live-boot-3.0~b1/debian/patches/unbreak-booting
--- live-boot-3.0~b1/debian/patches/unbreak-booting	1970-01-01 01:00:00.000000000 +0100
+++ live-boot-3.0~b1/debian/patches/unbreak-booting	2012-09-20 09:43:25.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Ensure that stray /live/overlay gets unmounted
+  ensure that a potentially stray tmpfs gets removed
+  otherways, initramfs-tools is unable to remove /live
+  and fails to boot. LP: #1043834
+Author: Reinhard Tartler <siretart@tauware.de>
+
+---
+Origin: Ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1043834
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685375
+
+--- live-boot-3.0~b1.orig/scripts/boot/9990-overlay.sh
++++ live-boot-3.0~b1/scripts/boot/9990-overlay.sh
+@@ -412,4 +412,8 @@ setup_unionfs ()
+ 	mkdir -p "${rootmnt}/live/overlay"
+ 	mount -o move /live/overlay "${rootmnt}/live/overlay" >/dev/null 2>&1 || mount -o bind /overlay "${rootmnt}/live/overlay" || log_warning_msg "Unable to move or bind /overlay to ${rootmnt}/live/overlay"
+ 
++        # ensure that a potentially stray tmpfs gets removed
++        # otherways, initramfs-tools is unable to remove /live
++        # and fails to boot
++        umount /live/overlay || :
+ }