[systemd-commits] 3 commits - configure.ac Makefile.am src/.gitignore src/nspawn.c

[Lennart Poettering]

 Makefile.am    |    2 +-
 configure.ac   |    2 +-
 src/.gitignore |    1 +
 src/nspawn.c   |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2030694fecef41b9c0bfa917df79b92afd5cb380
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 29 03:26:10 2011 +0200

    git: hide org.freedesktop.systemd1.policy.in

diff --git a/src/.gitignore b/src/.gitignore
index 6c4ccaa..778ae53 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+org.freedesktop.systemd1.policy.in
 99-systemd.rules
 org.freedesktop.hostname1.policy
 org.freedesktop.locale1.policy

commit 6b2bf923534c20eb92ac0e9ad0c5897a9257ccef
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 29 03:25:05 2011 +0200

    nspawn: properly bind mount /sys/fs/selinux into container, since /selinux moved there

diff --git a/src/nspawn.c b/src/nspawn.c
index 8d7e0d0..a1ed425 100644
--- a/src/nspawn.c
+++ b/src/nspawn.c
@@ -133,8 +133,8 @@ static int mount_all(const char *dest) {
                 { "/dev/pts",  "/dev/pts",  "bind",  NULL,       MS_BIND,                      true  },
                 { "tmpfs",     "/run",      "tmpfs", "mode=755", MS_NOSUID|MS_NODEV,           true  },
 #ifdef HAVE_SELINUX
-                { "/selinux",  "/selinux",  "bind",  NULL,       MS_BIND,                      false },  /* Bind mount first */
-                { "/selinux",  "/selinux",  "bind",  NULL,       MS_BIND|MS_RDONLY|MS_REMOUNT, false },  /* Then, make it r/o */
+                { "/sys/fs/selinux", "/sys/fs/selinux", "bind", NULL, MS_BIND,                      false },  /* Bind mount first */
+                { "/sys/fs/selinux", "/sys/fs/selinux", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false },  /* Then, make it r/o */
 #endif
         };
 

commit fd42f6e020de94d11b3cc6bcff6bfc6af23c8aa9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 29 03:15:20 2011 +0200

    build-sys: prepare new release

diff --git a/Makefile.am b/Makefile.am
index 15349a1..b526183 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
diff --git a/configure.ac b/configure.ac
index a551d23..2641de6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[31],[systemd-devel at lists.freedesktop.org])
+AC_INIT([systemd],[32],[systemd-devel at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])