Skip to content

Commit 7c9d5ea

Browse files
committed
Check for /sbin/openrc-run instead of /sbin/openrc-init
Alpine doesn't use openrc-init (it uses busybox init), and has deleted it from the package in 3.16: https://gitlab.alpinelinux.org/alpine/aports/-/commit/7a4d6d22cdb4696e93b3a0fce91e851c4db5366e Signed-off-by: Jan Dubois <[email protected]>
1 parent 8af004c commit 7c9d5ea

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pkg/cidata/cidata.TEMPLATE.d/boot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fi
5454

5555
USER_SCRIPT="/home/${LIMA_CIDATA_USER}.linux/.lima-user-script"
5656
if [ -d "${LIMA_CIDATA_MNT}"/provision.user ]; then
57-
if [ ! -f /sbin/openrc-init ]; then
57+
if [ ! -f /sbin/openrc-run ]; then
5858
until [ -e "/run/user/${LIMA_CIDATA_UID}/systemd/private" ]; do sleep 3; done
5959
fi
6060
for f in "${LIMA_CIDATA_MNT}"/provision.user/*; do

pkg/cidata/cidata.TEMPLATE.d/boot/11-colorterm-environment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fi
77

88
# accept any incoming COLORTERM environment variable
99
sed -i 's/^AcceptEnv LANG LC_\*$/AcceptEnv COLORTERM LANG LC_*/' /etc/ssh/sshd_config
10-
if [ -f /sbin/openrc-init ]; then
10+
if [ -f /sbin/openrc-run ]; then
1111
rc-service --ifstarted sshd reload
1212
elif command -v systemctl >/dev/null 2>&1; then
1313
if systemctl -q is-active ssh; then

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818
install -m 755 "${LIMA_CIDATA_MNT}"/lima-guestagent /usr/local/bin/lima-guestagent
1919

2020
# Launch the guestagent service
21-
if [ -f /sbin/openrc-init ]; then
21+
if [ -f /sbin/openrc-run ]; then
2222
# Install the openrc lima-guestagent service script
2323
cat >/etc/init.d/lima-guestagent <<'EOF'
2424
#!/sbin/openrc-run

0 commit comments

Comments
 (0)