cidata: alpine: move guestagent installer from 10-alpine-pre.sh to 25-guestagent-base.sh

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

pkg/cidata/cidata.TEMPLATE.d/boot/10-alpine-prep.sh

@@ -26,28 +26,6 @@ usermod -p '*' "${LIMA_CIDATA_USER}"
 sed -i 's/AllowTcpForwarding no/AllowTcpForwarding yes/g' /etc/ssh/sshd_config
 rc-service sshd reload
 
-# Create directory for the lima-guestagent socket (normally done by systemd)
-mkdir -p /run/user/${LIMA_CIDATA_UID}
-chown "${LIMA_CIDATA_USER}" /run/user/${LIMA_CIDATA_UID}
-chmod 700 /run/user/${LIMA_CIDATA_UID}
-
-# Install the openrc lima-guestagent service script
-cat >/etc/init.d/lima-guestagent <<'EOF'
-#!/sbin/openrc-run
-supervisor=supervise-daemon
-
-name="lima-guestagent"
-description="Forward ports to the lima-hostagent"
-
-export XDG_RUNTIME_DIR="/run/user/${LIMA_CIDATA_UID}"
-command=/usr/local/bin/lima-guestagent
-command_args="daemon"
-command_background=true
-command_user="${LIMA_CIDATA_USER}:${LIMA_CIDATA_USER}"
-pidfile="${XDG_RUNTIME_DIR}/lima-guestagent.pid"
-EOF
-chmod 755 /etc/init.d/lima-guestagent
-
 # mount /sys/fs/cgroup
 rc-service cgroups start
 

pkg/cidata/cidata.TEMPLATE.d/boot/25-guestagent-base.sh

@@ -15,6 +15,27 @@ install -m 755 "${LIMA_CIDATA_MNT}"/lima-guestagent /usr/local/bin/lima-guestage
 
 # Launch the guestagent service
 if [ -f /etc/alpine-release ]; then
+  # Create directory for the lima-guestagent socket (normally done by systemd)
+  mkdir -p /run/user/${LIMA_CIDATA_UID}
+  chown "${LIMA_CIDATA_USER}" /run/user/${LIMA_CIDATA_UID}
+  chmod 700 /run/user/${LIMA_CIDATA_UID}
+  # Install the openrc lima-guestagent service script
+  cat >/etc/init.d/lima-guestagent <<'EOF'
+#!/sbin/openrc-run
+supervisor=supervise-daemon
+
+name="lima-guestagent"
+description="Forward ports to the lima-hostagent"
+
+export XDG_RUNTIME_DIR="/run/user/${LIMA_CIDATA_UID}"
+command=/usr/local/bin/lima-guestagent
+command_args="daemon"
+command_background=true
+command_user="${LIMA_CIDATA_USER}:${LIMA_CIDATA_USER}"
+pidfile="${XDG_RUNTIME_DIR}/lima-guestagent.pid"
+EOF
+  chmod 755 /etc/init.d/lima-guestagent
+
   rc-update add lima-guestagent default
   rc-service lima-guestagent start
 else