Skip to content

Commit d33dee1

Browse files
committed
Setup sshfs in fuse.conf before setup dns iptables
So that sshfs still works (unblocking the probe), even if there is some issue with iptables and nftables configuration. Signed-off-by: Anders F Björklund <[email protected]>
1 parent f8de2f8 commit d33dee1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkg/cidata/cidata.TEMPLATE.d/boot/35-setup-packages.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ update_fuse_conf() {
1414
fi
1515
}
1616

17+
# update_fuse_conf has to be called after installing all the packages,
18+
# otherwise apt-get fails with conflict
19+
if [ "${LIMA_CIDATA_MOUNTTYPE}" = "reverse-sshfs" ]; then
20+
update_fuse_conf
21+
fi
22+
1723
SETUP_DNS=0
1824
if [ -n "${LIMA_CIDATA_UDP_DNS_LOCAL_PORT}" ] && [ "${LIMA_CIDATA_UDP_DNS_LOCAL_PORT}" -ne 0 ]; then
1925
SETUP_DNS=1
@@ -25,9 +31,3 @@ if [ "${SETUP_DNS}" = 1 ]; then
2531
# Try to setup iptables rule again, in case we just installed iptables
2632
"${LIMA_CIDATA_MNT}/boot/09-host-dns-setup.sh"
2733
fi
28-
29-
# update_fuse_conf has to be called after installing all the packages,
30-
# otherwise apt-get fails with conflict
31-
if [ "${LIMA_CIDATA_MOUNTTYPE}" = "reverse-sshfs" ]; then
32-
update_fuse_conf
33-
fi

0 commit comments

Comments
 (0)