fix(ic-os): only enable systemd units that are enableable.

dfinity · Jan 18, 2024 · fd19e57 · fd19e57
1 parent c1a1563
commit fd19e57
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ic-os/boundary-guestos/rootfs/Dockerfile b/ic-os/boundary-guestos/rootfs/Dockerfile
@@ -154,7 +154,7 @@ RUN if [ "${ROOT_PASSWORD}" != "" ]; then \
 # to node operation.
 
 RUN for SERVICE in /etc/systemd/system/*; do \
-        if [ -f "$SERVICE" -a ! -L "$SERVICE" ] ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
+    if [ -f "$SERVICE" -a ! -L "$SERVICE" ] && grep -q '^.Install.' "$SERVICE" ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
     done && \
     systemctl enable \
     chrony \

diff --git a/ic-os/guestos/rootfs/Dockerfile b/ic-os/guestos/rootfs/Dockerfile
@@ -97,7 +97,7 @@ RUN mkdir -p /mnt/var_old /mnt/var_new
 
 RUN \
     for SERVICE in /etc/systemd/system/*; do \
-        if [ -f "$SERVICE" -a ! -L "$SERVICE" ] ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
+    if [ -f "$SERVICE" -a ! -L "$SERVICE" ] && grep -q '^.Install.' "$SERVICE" ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
     done
 
 RUN systemctl enable \

diff --git a/ic-os/hostos/rootfs/Dockerfile b/ic-os/hostos/rootfs/Dockerfile
@@ -79,7 +79,7 @@ RUN sed -e "s/.*PermitRootLogin.*/PermitRootLogin prohibit-password/" -i /etc/ss
 
 RUN \
     for SERVICE in /etc/systemd/system/*; do \
-        if [ -f "$SERVICE" -a ! -L "$SERVICE" ]; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
+    if [ -f "$SERVICE" -a ! -L "$SERVICE" ] && grep -q '^.Install.' "$SERVICE" ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
     done
 
 RUN systemctl enable \

diff --git a/ic-os/setupos/rootfs/Dockerfile b/ic-os/setupos/rootfs/Dockerfile
@@ -61,7 +61,7 @@ RUN cd /prep && ./prep.sh && cd / && rm -rf /prep
 
 RUN \
     for SERVICE in /etc/systemd/system/*; do \
-        if [ -f "$SERVICE" -a ! -L "$SERVICE" ] ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
+    if [ -f "$SERVICE" -a ! -L "$SERVICE" ] && grep -q '^.Install.' "$SERVICE" ; then systemctl enable "${SERVICE#/etc/systemd/system/}" ; fi ; \
     done
 
 RUN systemctl enable \