Merge lp:~jibel/ubuntu/raring/flash-kernel/skip_inside_lxc_container into lp:ubuntu/raring/flash-kernel

[Jean-Baptiste Lallement]

This patch skips flash-kernel when run inside an LXC container by checking the result of 'running-in-container'

[Loïc Minier (lool)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-04 17:24:49 +0000
+++ debian/changelog	2013-03-27 15:48:25 +0000
@@ -1,3 +1,9 @@
+flash-kernel (3.0~rc.4ubuntu30) raring; urgency=low
+
+  * Do not run flash-kernel inside an LXC container (LP: #1160360)
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Wed, 27 Mar 2013 16:29:20 +0100
+
 flash-kernel (3.0~rc.4ubuntu29) raring; urgency=low
 
   * determine the latest installer kernel version in the target rootfs instead
 
=== modified file 'initramfs-hook/flash-kernel'
--- initramfs-hook/flash-kernel	2012-06-22 11:20:39 +0000
+++ initramfs-hook/flash-kernel	2013-03-27 15:48:25 +0000
@@ -13,6 +13,12 @@
         exit 0
 fi
 
+# Do not run inside an LXC container
+if type running-in-container >/dev/null 2>&1 && \
+        running-in-container >/dev/null; then
+    exit 0
+fi
+
 abi="$1"
 # ignored
 _initrd="$2"
 
=== modified file 'initramfs-tools/hooks/flash_kernel_set_root'
--- initramfs-tools/hooks/flash_kernel_set_root	2012-09-13 14:02:48 +0000
+++ initramfs-tools/hooks/flash_kernel_set_root	2013-03-27 15:48:25 +0000
@@ -57,6 +57,12 @@
 	exit 0
 fi
 
+# Do not run inside an LXC container
+if type running-in-container >/dev/null 2>&1 && \
+        running-in-container >/dev/null; then
+    exit 0
+fi
+
 # Record the root filesystem device for use during boot
 rootdev=$(egrep '^[^# 	]+[ 	]+/[ 	]' /etc/fstab | awk '{print $1}') || true
 
 
=== modified file 'kernel-hook/zz-flash-kernel'
--- kernel-hook/zz-flash-kernel	2012-06-20 16:41:28 +0000
+++ kernel-hook/zz-flash-kernel	2013-03-27 15:48:25 +0000
@@ -15,6 +15,11 @@
         exit 0
 fi
 
+# Do not run inside an LXC container
+if type running-in-container >/dev/null 2>&1 && \
+        running-in-container >/dev/null; then
+    exit 0
+fi
 
 # this script is used as postinst.d and postrm.d script; this is used to
 # differentiate between the two