File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed
pkg/cidata/cidata.TEMPLATE.d/boot Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ if command -v apt-get >/dev/null 2>&1; then
19
19
if ! command -v sshfs > /dev/null 2>&1 ; then
20
20
apt-get install -y sshfs
21
21
fi
22
- update_fuse_conf
23
22
fi
24
23
if [ " ${LIMA_CIDATA_CONTAINERD_SYSTEM} " = 1 ] || [ " ${LIMA_CIDATA_CONTAINERD_USER} " = 1 ]; then
25
24
if [ ! -e /usr/sbin/iptables ]; then
@@ -36,7 +35,6 @@ elif command -v dnf >/dev/null 2>&1; then
36
35
if ! command -v sshfs > /dev/null 2>&1 ; then
37
36
dnf install -y fuse-sshfs
38
37
fi
39
- update_fuse_conf
40
38
fi
41
39
if [ " ${LIMA_CIDATA_CONTAINERD_SYSTEM} " = 1 ] || [ " ${LIMA_CIDATA_CONTAINERD_USER} " = 1 ]; then
42
40
if [ ! -e /usr/sbin/iptables ]; then
@@ -58,7 +56,10 @@ elif command -v apk >/dev/null 2>&1; then
58
56
apk update
59
57
apk add sshfs
60
58
fi
61
- update_fuse_conf
62
59
modprobe fuse
63
60
fi
64
61
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
You can’t perform that action at this time.
0 commit comments