Skip to content

Commit 08046f3

Browse files
committed
Revert "cidata: update /etc/fuse.conf earlier"
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 198ded6 commit 08046f3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ if command -v apt-get >/dev/null 2>&1; then
1919
if ! command -v sshfs >/dev/null 2>&1; then
2020
apt-get install -y sshfs
2121
fi
22-
update_fuse_conf
2322
fi
2423
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
2524
if [ ! -e /usr/sbin/iptables ]; then
@@ -36,7 +35,6 @@ elif command -v dnf >/dev/null 2>&1; then
3635
if ! command -v sshfs >/dev/null 2>&1; then
3736
dnf install -y fuse-sshfs
3837
fi
39-
update_fuse_conf
4038
fi
4139
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
4240
if [ ! -e /usr/sbin/iptables ]; then
@@ -58,7 +56,10 @@ elif command -v apk >/dev/null 2>&1; then
5856
apk update
5957
apk add sshfs
6058
fi
61-
update_fuse_conf
6259
modprobe fuse
6360
fi
6461
fi
62+
63+
# update_fuse_conf has to be called after installing all the packages,
64+
# otherwise apt-get fails with conflict
65+
update_fuse_conf

0 commit comments

Comments
 (0)