From: Frederic Crozat <fcrozat@suse.com>
Date: Fri, 20 Apr 2012 12:36:53 +0000 (+0200)
Subject: shutdown fixes for openSUSE container
X-Git-Tag: lxc-0.9.0.rc1~2^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d696d21c2a7d5d15b3a456edd8ba742a5970d40a;p=thirdparty%2Flxc.git

shutdown fixes for openSUSE container

- mount /run on tmpfs outside container
- replace /var/run bind mount on /run by a symlink

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index f69eae1c0..56e93d726 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -188,6 +188,10 @@ EOF
 #   create mtab symlink
     rm -f $cache/partial-$arch/etc/mtab
     ln -sf /proc/self/mounts $cache/partial-$arch/etc/mtab
+
+# ensure /var/run and /run are symlinked
+    rm -fr $cache/partial-$arch/var/run
+    ln -s -f ../run $cache/partial-$arch/var/run
     if [ $? -ne 0 ]; then
         echo "Failed to download the rootfs, aborting."
         return 1
@@ -290,6 +294,7 @@ EOF
     cat <<EOF > $path/fstab
 proc            proc         proc	nodev,noexec,nosuid 0 0
 sysfs           sys          sysfs	defaults  0 0
+tmpfs           run          tmpfs	mode=0755,nodev,nosuid 0 0
 EOF
 
     if [ $? -ne 0 ]; then