Commit 2b24e2ff by Martin Pitt Committed by Stéphane Graber

systemd: Load AppArmor profiles if necessary/supported

On Ubuntu we need to set up the AppArmor profiles also under systemd. Add a new helper "lxc-apparmor-load" and integrate it into lxc.service. Signed-off-by: 's avatarMartin Pitt <martin.pitt@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 84b3775a
EXTRA_DIST = \
lxc-devsetup \
lxc-apparmor-load \
lxc.service.in \
lxc-net.service.in \
$(NULL)
......@@ -15,7 +16,7 @@ lxc-autostart-helper: ../sysvinit/lxc.in $(top_builddir)/config.status
mv $@-t $@
BUILT_SOURCES = lxc-autostart-helper lxc.service lxc-net.service
install-systemd: lxc.service lxc-net.service lxc-devsetup lxc-autostart-helper
install-systemd: lxc.service lxc-net.service lxc-devsetup lxc-apparmor-load lxc-autostart-helper
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) lxc.service lxc-net.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
......@@ -24,7 +25,7 @@ uninstall-systemd:
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc-net.service
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
pkglibexec_SCRIPTS = lxc-devsetup lxc-autostart-helper
pkglibexec_SCRIPTS = lxc-devsetup lxc-apparmor-load lxc-autostart-helper
install-data-local: install-systemd
uninstall-local: uninstall-systemd
......
#!/bin/sh
# lxc-apparmor-load: Load AppArmor profiles, if supported by the system
set -eu
# don't load profiles if mount mediation is not supported
SYSF=/sys/kernel/security/apparmor/features/mount/mask
if [ -f $SYSF ]; then
if [ -x /lib/init/apparmor-profile-load ]; then
/lib/init/apparmor-profile-load usr.bin.lxc-start
/lib/init/apparmor-profile-load lxc-containers
fi
fi
......@@ -7,6 +7,7 @@ Wants=lxc-net.service
Type=oneshot
RemainAfterExit=yes
ExecStartPre=@LIBEXECDIR@/lxc/lxc-devsetup
ExecStartPre=@LIBEXECDIR@/lxc/lxc-apparmor-load
ExecStart=@LIBEXECDIR@/lxc/lxc-autostart-helper start
ExecStop=@LIBEXECDIR@/lxc/lxc-autostart-helper stop
# Environment=BOOTUP=serial
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment