summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2017-04-21 16:00:05 +0300
committerRiku Voipio <riku.voipio@linaro.org>2017-04-21 16:00:05 +0300
commite277b368a41e76e1f15ee199343747b1c1eca881 (patch)
tree77ec0fa8a248fab9fd3ac541f3dcd42d6747c855
parent1e0dfd5b7192e90b38e49980683d81d8098fe14c (diff)
downloadubuntu-build-service-e277b368a41e76e1f15ee199343747b1c1eca881.tar.gz
disable-systemd-services: try harder
systemd will happily regenerate the missing symlinks from [install] directives on first boot, so at least on db410c the previous workaround doesn't work. Change-Id: I91bb63261442bde3c2e0d37f5271dcc5e39dfe01
-rwxr-xr-xstretch-arm64-alip/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-arm64-blend/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-arm64-developer/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-arm64-installer/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-armhf-alip/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-armhf-blend/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-armhf-developer/customization/hooks/22-disable-systemd-services.chroot2
-rwxr-xr-xstretch-armhf-installer/customization/hooks/22-disable-systemd-services.chroot2
8 files changed, 8 insertions, 8 deletions
diff --git a/stretch-arm64-alip/customization/hooks/22-disable-systemd-services.chroot b/stretch-arm64-alip/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-arm64-alip/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-arm64-alip/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-arm64-blend/customization/hooks/22-disable-systemd-services.chroot b/stretch-arm64-blend/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-arm64-blend/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-arm64-blend/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-arm64-developer/customization/hooks/22-disable-systemd-services.chroot b/stretch-arm64-developer/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-arm64-developer/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-arm64-developer/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-arm64-installer/customization/hooks/22-disable-systemd-services.chroot b/stretch-arm64-installer/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-arm64-installer/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-arm64-installer/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-armhf-alip/customization/hooks/22-disable-systemd-services.chroot b/stretch-armhf-alip/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-armhf-alip/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-armhf-alip/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-armhf-blend/customization/hooks/22-disable-systemd-services.chroot b/stretch-armhf-blend/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-armhf-blend/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-armhf-blend/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-armhf-developer/customization/hooks/22-disable-systemd-services.chroot b/stretch-armhf-developer/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-armhf-developer/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-armhf-developer/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@
diff --git a/stretch-armhf-installer/customization/hooks/22-disable-systemd-services.chroot b/stretch-armhf-installer/customization/hooks/22-disable-systemd-services.chroot
index 3c0bbdd..beced9a 100755
--- a/stretch-armhf-installer/customization/hooks/22-disable-systemd-services.chroot
+++ b/stretch-armhf-installer/customization/hooks/22-disable-systemd-services.chroot
@@ -3,7 +3,7 @@
# workaround 90s delay
services=(NetworkManager systemd-networkd)
for service in ${services[@]}; do
- systemctl disable ${service}-wait-online.service
+ systemctl mask ${service}-wait-online.service
done
systemctl mask wpa_supplicant@