merge patched-trusty into trusty

Makefile.in

@@ -89,7 +89,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(srcdir)/lxc.pc.in $(srcdir)/lxc.spec.in \
 	$(top_srcdir)/doc/legacy/lxc-ls.sgml.in \
 	$(top_srcdir)/doc/ja/legacy/lxc-ls.sgml.in \
-	$(top_srcdir)/src/lxc/legacy/lxc-ls.in COPYING TODO \
+	$(top_srcdir)/src/lxc/legacy/lxc-ls.in COPYING \
 	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
 	$(top_srcdir)/config/config.sub \
 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/missing

config/apparmor/Makefile.in

@@ -388,8 +388,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_APPARMOR_FALSE@install-data-local:
 @ENABLE_APPARMOR_FALSE@uninstall-local:
+@ENABLE_APPARMOR_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am

config/apparmor/abstractions/container-base

@@ -55,7 +55,7 @@
   deny /proc/sys/ker[^n]*{,/**} wklx,
   deny /proc/sys/kern[^e]*{,/**} wklx,
   deny /proc/sys/kerne[^l]*{,/**} wklx,
-  deny /proc/sys/kernel/[^shd]*{,/**} wklx,
+  deny /proc/sys/kernel/[^smhd]*{,/**} wklx,
   deny /proc/sys/kernel/d[^o]*{,/**} wklx,
   deny /proc/sys/kernel/do[^m]*{,/**} wklx,
   deny /proc/sys/kernel/dom[^a]*{,/**} wklx,
@@ -74,7 +74,12 @@
   deny /proc/sys/kernel/hostna[^m]*{,/**} wklx,
   deny /proc/sys/kernel/hostnam[^e]*{,/**} wklx,
   deny /proc/sys/kernel/hostname?*{,/**} wklx,
-  deny /proc/sys/kernel/s[^h]*{,/**} wklx,
+  deny /proc/sys/kernel/m[^s]*{,/**} wklx,
+  deny /proc/sys/kernel/ms[^g]*{,/**} wklx,
+  deny /proc/sys/kernel/msg*/** wklx,
+  deny /proc/sys/kernel/s[^he]*{,/**} wklx,
+  deny /proc/sys/kernel/se[^m]*{,/**} wklx,
+  deny /proc/sys/kernel/sem*/** wklx,
   deny /proc/sys/kernel/sh[^m]*{,/**} wklx,
   deny /proc/sys/kernel/shm*/** wklx,
   deny /proc/sys/kernel?*{,/**} wklx,

config/apparmor/container-rules

@@ -5,7 +5,7 @@
   deny /proc/sys/ker[^n]*{,/**} wklx,
   deny /proc/sys/kern[^e]*{,/**} wklx,
   deny /proc/sys/kerne[^l]*{,/**} wklx,
-  deny /proc/sys/kernel/[^shd]*{,/**} wklx,
+  deny /proc/sys/kernel/[^smhd]*{,/**} wklx,
   deny /proc/sys/kernel/d[^o]*{,/**} wklx,
   deny /proc/sys/kernel/do[^m]*{,/**} wklx,
   deny /proc/sys/kernel/dom[^a]*{,/**} wklx,
@@ -24,7 +24,12 @@
   deny /proc/sys/kernel/hostna[^m]*{,/**} wklx,
   deny /proc/sys/kernel/hostnam[^e]*{,/**} wklx,
   deny /proc/sys/kernel/hostname?*{,/**} wklx,
-  deny /proc/sys/kernel/s[^h]*{,/**} wklx,
+  deny /proc/sys/kernel/m[^s]*{,/**} wklx,
+  deny /proc/sys/kernel/ms[^g]*{,/**} wklx,
+  deny /proc/sys/kernel/msg*/** wklx,
+  deny /proc/sys/kernel/s[^he]*{,/**} wklx,
+  deny /proc/sys/kernel/se[^m]*{,/**} wklx,
+  deny /proc/sys/kernel/sem*/** wklx,
   deny /proc/sys/kernel/sh[^m]*{,/**} wklx,
   deny /proc/sys/kernel/shm*/** wklx,
   deny /proc/sys/kernel?*{,/**} wklx,

config/apparmor/container-rules.base

@@ -8,6 +8,8 @@ allow /sys/devices/virtual/net/**
 allow /sys/class/net/**
 block /proc/sys
 allow /proc/sys/kernel/shm*
+allow /proc/sys/kernel/sem*
+allow /proc/sys/kernel/msg*
 allow /proc/sys/kernel/hostname
 allow /proc/sys/kernel/domainname
 allow /proc/sys/net/**

config/init/systemd/Makefile.am

@@ -5,15 +5,25 @@ EXTRA_DIST = \
 if INIT_SCRIPT_SYSTEMD
 SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
 
-install-systemd: lxc.service lxc-devsetup
+lxc-autostart-helper: ../sysvinit/lxc.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed                                          \
+	    -e 's|[@]SYSCONFDIR[@]|$(sysconfdir)|g'             \
+	    -e 's|[@]LOCALSTATEDIR[@]|$(localstatedir)|g'       \
+	    -e 's|[@]BINDIR[@]|$(bindir)|g'                     \
+	    < $< > $@-t &&                                      \
+	    chmod a+x $@-t &&                                   \
+	    mv $@-t $@
+BUILT_SOURCES = lxc-autostart-helper
+
+install-systemd: lxc.service lxc-devsetup lxc-autostart-helper
 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
 	$(INSTALL_DATA) lxc.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
 
 uninstall-systemd:
 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc.service
 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
 
-pkglibexec_SCRIPTS = lxc-devsetup
+pkglibexec_SCRIPTS = lxc-devsetup lxc-autostart-helper
 
 install-data-local: install-systemd
 uninstall-local: uninstall-systemd

config/init/systemd/Makefile.in

@@ -79,15 +79,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = config/init/systemd
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/lxc.service.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
 	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = lxc.service
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -306,8 +307,10 @@ EXTRA_DIST = \
 	lxc.service
 
 @INIT_SCRIPT_SYSTEMD_TRUE@SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
-@INIT_SCRIPT_SYSTEMD_TRUE@pkglibexec_SCRIPTS = lxc-devsetup
-all: all-am
+@INIT_SCRIPT_SYSTEMD_TRUE@BUILT_SOURCES = lxc-autostart-helper
+@INIT_SCRIPT_SYSTEMD_TRUE@pkglibexec_SCRIPTS = lxc-devsetup lxc-autostart-helper
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -340,6 +343,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+lxc.service: $(top_builddir)/config.status $(srcdir)/lxc.service.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
@@ -413,13 +418,15 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(SCRIPTS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkglibexecdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -449,6 +456,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @INIT_SCRIPT_SYSTEMD_FALSE@install-data-local:
 @INIT_SCRIPT_SYSTEMD_FALSE@uninstall-local:
 clean: clean-am
@@ -517,7 +525,7 @@ ps-am:
 
 uninstall-am: uninstall-local uninstall-pkglibexecSCRIPTS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
 	ctags-am distclean distclean-generic distdir dvi dvi-am html \
@@ -533,7 +541,16 @@ uninstall-am: uninstall-local uninstall-pkglibexecSCRIPTS
 	uninstall-pkglibexecSCRIPTS
 
 
-@INIT_SCRIPT_SYSTEMD_TRUE@install-systemd: lxc.service lxc-devsetup
+@INIT_SCRIPT_SYSTEMD_TRUE@lxc-autostart-helper: ../sysvinit/lxc.in $(top_builddir)/config.status
+@INIT_SCRIPT_SYSTEMD_TRUE@	$(AM_V_GEN)sed                                          \
+@INIT_SCRIPT_SYSTEMD_TRUE@	    -e 's|[@]SYSCONFDIR[@]|$(sysconfdir)|g'             \
+@INIT_SCRIPT_SYSTEMD_TRUE@	    -e 's|[@]LOCALSTATEDIR[@]|$(localstatedir)|g'       \
+@INIT_SCRIPT_SYSTEMD_TRUE@	    -e 's|[@]BINDIR[@]|$(bindir)|g'                     \
+@INIT_SCRIPT_SYSTEMD_TRUE@	    < $< > $@-t &&                                      \
+@INIT_SCRIPT_SYSTEMD_TRUE@	    chmod a+x $@-t &&                                   \
+@INIT_SCRIPT_SYSTEMD_TRUE@	    mv $@-t $@
+
+@INIT_SCRIPT_SYSTEMD_TRUE@install-systemd: lxc.service lxc-devsetup lxc-autostart-helper
 @INIT_SCRIPT_SYSTEMD_TRUE@	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
 @INIT_SCRIPT_SYSTEMD_TRUE@	$(INSTALL_DATA) lxc.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
 

config/init/systemd/lxc-devsetup

@@ -2,7 +2,7 @@
 
 # lxc.devsetup - Setup host /dev for container /dev subdirectories.
 
-if [[ ! -d /dev/.lxc ]]
+if [ ! -d /dev/.lxc ]
 then
     echo "Creating /dev/.lxc"
     mkdir /dev/.lxc
@@ -17,7 +17,7 @@ else
     mount -t tmpfs tmpfs /dev/.lxc
 fi
 
-if [[ ! -d /dev/.lxc/user ]]
+if [ ! -d /dev/.lxc/user ]
 then
     echo "Creating /dev/.lxc/user"
     mkdir /dev/.lxc/user

config/init/systemd/lxc.service

@@ -1,13 +1,13 @@
 [Unit]
 Description=LXC Container Initialization and Autoboot Code
-After=syslog.target
+After=syslog.target network.target
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStartPre=/usr/libexec/lxc/lxc-devsetup
-ExecStart=/usr/libexec/lxc/lxc-startup start
-ExecStop=/usr/libexec/lxc/lxc-startup stop
+ExecStartPre=${exec_prefix}/libexec/lxc/lxc-devsetup
+ExecStart=${exec_prefix}/libexec/lxc/lxc-autostart-helper start
+ExecStop=${exec_prefix}/libexec/lxc/lxc-autostart-helper stop
 # Environment=BOOTUP=serial
 # Environment=CONSOLETYPE=serial
 StandardOutput=syslog

config/init/systemd/lxc.service.in

@@ -0,0 +1,17 @@
+[Unit]
+Description=LXC Container Initialization and Autoboot Code
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStartPre=@libexecdir@/lxc/lxc-devsetup
+ExecStart=@libexecdir@/lxc/lxc-autostart-helper start
+ExecStop=@libexecdir@/lxc/lxc-autostart-helper stop
+# Environment=BOOTUP=serial
+# Environment=CONSOLETYPE=serial
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target

config/init/sysvinit/Makefile.in

@@ -78,15 +78,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = config/init/sysvinit
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/lxc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
 	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = lxc
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -305,6 +306,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+lxc: $(top_builddir)/config.status $(srcdir)/lxc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 tags TAGS:
 
 ctags CTAGS:
@@ -376,8 +379,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@INIT_SCRIPT_SYSV_FALSE@uninstall-local:
 @INIT_SCRIPT_SYSV_FALSE@install-data-local:
+@INIT_SCRIPT_SYSV_FALSE@uninstall-local:
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am