Skip to content

Commit 97ca3ae

Browse files
authored
Merge pull request #241 from rancher-sandbox/chown
Use numeric uid/gid with chown
2 parents e482531 + 68b770f commit 97ca3ae

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
2+
23
set -eux
34

45
# Create mount points
@@ -7,7 +8,8 @@ for f in $(seq 0 $((LIMA_CIDATA_MOUNTS - 1))); do
78
mountpointvar="LIMA_CIDATA_MOUNTS_${f}_MOUNTPOINT"
89
mountpoint="$(eval echo \$"$mountpointvar")"
910
mkdir -p "${mountpoint}"
10-
chown "${LIMA_CIDATA_USER}" "${mountpoint}"
11+
gid=$(id -g "${LIMA_CIDATA_USER}")
12+
chown "${LIMA_CIDATA_UID}:${gid}" "${mountpoint}"
1113
done
1214

1315
# Install or update the guestagent binary
@@ -17,7 +19,8 @@ install -m 755 "${LIMA_CIDATA_MNT}"/lima-guestagent /usr/local/bin/lima-guestage
1719
if [ -f /etc/alpine-release ]; then
1820
# Create directory for the lima-guestagent socket (normally done by systemd)
1921
mkdir -p /run/user/"${LIMA_CIDATA_UID}"
20-
chown "${LIMA_CIDATA_USER}" /run/user/"${LIMA_CIDATA_UID}"
22+
gid=$(id -g "${LIMA_CIDATA_USER}")
23+
chown "${LIMA_CIDATA_UID}:${gid}" /run/user/"${LIMA_CIDATA_UID}"
2124
chmod 700 /run/user/"${LIMA_CIDATA_UID}"
2225
# Install the openrc lima-guestagent service script
2326
cat >/etc/init.d/lima-guestagent <<'EOF'

0 commit comments

Comments
 (0)