]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
arch template: Fix systemd-sysctl service 683/head
authorJakub Sztandera <kubuxu@gmail.com>
Fri, 30 Oct 2015 11:05:44 +0000 (12:05 +0100)
committerJakub Sztandera <kubuxu@gmail.com>
Fri, 30 Oct 2015 11:09:42 +0000 (12:09 +0100)
The systemd-sysctl service includes condition that /proc/sys/ has to be read-write.
In lxc only /proc/sys/net/ is read-write which causes the condition to fail and service not to run.
This patch changes the check to /proc/sys/net/ and makes the service apply only rules that are in net tree.

Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>
templates/lxc-archlinux.in

index fc6f714948e849b90391a8a16658d911b1af37d4..c692abf42af00d2eb79b46a8392cf7911a5b34d1 100644 (file)
@@ -103,6 +103,10 @@ sed -e 's/^ConditionPathExists=/# ConditionPathExists=/' \
     -e 's/After=dev-%i.device/After=/' \
     < /lib/systemd/system/getty\@.service \
     > /etc/systemd/system/getty\@.service
+# fix systemd-sysctl service
+sed -e 's/^ConditionPathIsReadWrite=\/proc\/sys\/$/ConditionPathIsReadWrite=\/proc\/sys\/net\//' \
+    -e 's/^ExecStart=\/usr\/lib\/systemd\/systemd-sysctl$/ExecStart=\/usr\/lib\/systemd\/systemd-sysctl --prefix net/' \
+    -i /usr/lib/systemd/system/systemd-sysctl.service
 # initialize pacman keyring
 pacman-key --init
 pacman-key --populate archlinux