Skip to content

Commit c6730b4

Browse files
committed
cidata: optimize 30-install-packages.sh
Signed-off-by: Akihiro Suda <[email protected]>
1 parent aa2d6a7 commit c6730b4

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

pkg/cidata/cidata.TEMPLATE.d/boot/30-install-packages.sh

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,38 @@ if command -v apt-get >/dev/null 2>&1; then
1616
export DEBIAN_FRONTEND
1717
apt-get update
1818
if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
19-
apt-get install -y sshfs
19+
if ! command -v sshfs >/dev/null 2>&1; then
20+
apt-get install -y sshfs
21+
fi
2022
update_fuse_conf
2123
fi
2224
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
23-
apt-get install -y iptables
25+
if [ ! -e /usr/sbin/iptables ]; then
26+
apt-get install -y iptables
27+
fi
2428
fi
2529
if [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
26-
apt-get install -y uidmap fuse3 dbus-user-session
30+
if ! command -v newuidmap >/dev/null 2>&1; then
31+
apt-get install -y uidmap fuse3 dbus-user-session
32+
fi
2733
fi
2834
elif command -v dnf >/dev/null 2>&1; then
2935
if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
30-
dnf install -y fuse-sshfs
36+
if ! command -v sshfs >/dev/null 2>&1; then
37+
dnf install -y fuse-sshfs
38+
fi
3139
update_fuse_conf
3240
fi
3341
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
34-
dnf install -y iptables
42+
if [ ! -e /usr/sbin/iptables ]; then
43+
dnf install -y iptables
44+
fi
3545
fi
3646
if [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
37-
dnf install -y shadow-utils fuse3
38-
if [ ! -f /usr/bin/fusermount ]; then
47+
if ! command -v newuidmap >/dev/null 2>&1; then
48+
dnf install -y shadow-utils fuse3
49+
fi
50+
if [ ! -e /usr/bin/fusermount ]; then
3951
# Workaround for https://github.com/containerd/stargz-snapshotter/issues/340
4052
ln -s fusermount3 /usr/bin/fusermount
4153
fi

0 commit comments

Comments
 (0)