Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kernel/configs/vamos.config
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ CONFIG_USB_SERIAL_OPTION=y

# Networking
CONFIG_IPV6=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_TABLES=y
CONFIG_NF_TABLES_INET=y
CONFIG_NFT_CT=y

# Bluetooth
CONFIG_BT=y
Expand Down
8 changes: 1 addition & 7 deletions tools/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ RUN for svc in \
qrtr-ns rmtfs tqftpserv pd-mapper \
comma modemmanager bluetoothd magic \
ssh-param-watcher ncm-param-watcher dnsmasq \
rsyslogd iptables polkitd \
rsyslogd nftables polkitd \
agetty-ttyMSM0 agetty-ttyAMA0; do \
ln -sf /etc/sv/$svc /etc/runit/runsvdir/default/; \
done
Expand All @@ -115,9 +115,6 @@ RUN chmod +x /usr/local/sbin/poweroff && \
# NetworkManager connection permissions
RUN chmod 600 /usr/lib/NetworkManager/system-connections/*.nmconnection

# Void's iptables service expects iptables.rules
RUN ln -s /etc/iptables/rules.v4 /etc/iptables/iptables.rules

# MOTD - profile.d runs update-motd.d scripts into /run/motd, pam_motd displays it
RUN sed -i 's|motd=/etc/motd|motd=/run/motd|' /etc/pam.d/system-login

Expand Down Expand Up @@ -215,9 +212,6 @@ RUN echo '#!/bin/sh' > /etc/sv/sshd/run && \
echo 'fi' >> /etc/sv/sshd/run && \
echo 'exec /usr/bin/sshd -D' >> /etc/sv/sshd/run

# DEBUG: Fix iptables to allow SSH (insert before wwan0 DROP rule)
RUN sed -i '/-A INPUT -i wwan0 -j DROP/i -A INPUT -p tcp --dport 22 -j ACCEPT' /etc/iptables/rules.v4 || true

RUN ldconfig

# Note: /data mount is handled in runit stage 1 (/etc/runit/1)
1 change: 1 addition & 0 deletions userspace/base_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ xbps-install -y \
net-tools \
NetworkManager \
nload \
nftables \
opencl-headers \
portaudio-devel \
ppp \
Expand Down
39 changes: 0 additions & 39 deletions userspace/root/etc/iptables/rules.v4

This file was deleted.

13 changes: 13 additions & 0 deletions userspace/root/etc/nftables.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/sbin/nft -f

flush ruleset

table inet filter {
chain input {
type filter hook input priority filter;
policy accept;

ct state established,related accept
iifname "wwan0" drop
}
}
Loading