From 979ce2014b692c27c241ae0d7e2ce8b68a253205 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 8 Feb 2013 02:30:57 +0100 Subject: [PATCH] vm/systemd: disable NetworkManager-wait-online when NM inactive --- rpm_spec/core-vm.spec | 5 ++++- vm-systemd/NetworkManager-wait-online.service | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 vm-systemd/NetworkManager-wait-online.service diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 4aaee1a..b274bbe 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -102,6 +102,7 @@ install -m 0755 vm-systemd/*.sh $RPM_BUILD_ROOT/usr/lib/qubes/init/ install -m 0644 vm-systemd/qubes-*.service $RPM_BUILD_ROOT/lib/systemd/system/ install -m 0644 vm-systemd/qubes-*.timer $RPM_BUILD_ROOT/lib/systemd/system/ install -m 0644 vm-systemd/NetworkManager.service $RPM_BUILD_ROOT/usr/lib/qubes/init/ +install -m 0644 vm-systemd/NetworkManager-wait-online.service $RPM_BUILD_ROOT/usr/lib/qubes/init/ install -m 0644 vm-systemd/cups.service $RPM_BUILD_ROOT/usr/lib/qubes/init/ install -m 0644 vm-systemd/ntpd.service $RPM_BUILD_ROOT/usr/lib/qubes/init/ @@ -560,9 +561,11 @@ The Qubes core startup configuration for SystemD init. /usr/lib/qubes/init/misc-post-stop.sh /usr/lib/qubes/init/qubes-sysinit.sh /usr/lib/qubes/init/NetworkManager.service +/usr/lib/qubes/init/NetworkManager-wait-online.service /usr/lib/qubes/init/cups.service /usr/lib/qubes/init/ntpd.service %ghost %attr(0644,root,root) /etc/systemd/system/NetworkManager.service +%ghost %attr(0644,root,root) /etc/systemd/system/NetworkManager-wait-online.service %ghost %attr(0644,root,root) /etc/systemd/system/cups.service %post systemd @@ -574,7 +577,7 @@ done /bin/systemctl enable qubes-update-check.timer 2> /dev/null # Install overriden services only when original exists -for srv in cups NetworkManager ntpd; do +for srv in cups NetworkManager NetworkManager-wait-online ntpd; do if [ -f /lib/systemd/system/$srv.service ]; then cp /usr/lib/qubes/init/$srv.service /etc/systemd/system/$srv.service fi diff --git a/vm-systemd/NetworkManager-wait-online.service b/vm-systemd/NetworkManager-wait-online.service new file mode 100644 index 0000000..00f3eb5 --- /dev/null +++ b/vm-systemd/NetworkManager-wait-online.service @@ -0,0 +1,5 @@ +.include /lib/systemd/system/NetworkManager-wait-online.service +[Unit] +ConditionPathExists=/var/run/qubes-service/network-manager +# For /rw +After=qubes-misc-post.service