Skip to content

Commit c518769

Browse files
committed
Add support for netplan to firewall scripts.
1 parent 0f1e338 commit c518769

File tree

2 files changed

+40
-12
lines changed

2 files changed

+40
-12
lines changed

bin/v-stop-firewall

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,26 @@ if [ -d "/etc/sysconfig" ]; then
6363
fi
6464
else
6565
/sbin/iptables-save > /etc/iptables.rules
66-
preup="/etc/network/if-pre-up.d/iptables"
67-
if [ ! -e "$preup" ]; then
68-
echo '#!/bin/sh' > $preup
69-
echo "/sbin/iptables-restore < /etc/iptables.rules" >> $preup
70-
echo "exit 0" >> $preup
71-
chmod +x $preup
66+
if [ -d "/etc/netplan" ]; then
67+
preup="/usr/lib/networkd-dispatcher/routable.d/50-ifup-hooks"
68+
if [ ! -e "$preup" ]; then
69+
IFS='%'
70+
echo '#!/bin/bash' > $preup
71+
echo '' >> $preup
72+
echo 'if [ "$IFACE" == "'$(/bin/ip token | awk -F 'dev ' '{print $2}')'" ]; then' >> $preup
73+
echo ' /sbin/iptables-restore < /etc/iptables.rules' >> $preup
74+
echo 'fi' >> $preup
75+
echo "exit 0" >> $preup
76+
chmod +x $preup
77+
fi
78+
else
79+
preup="/etc/network/if-pre-up.d/iptables"
80+
if [ ! -e "$preup" ]; then
81+
echo '#!/bin/sh' > $preup
82+
echo "/sbin/iptables-restore < /etc/iptables.rules" >> $preup
83+
echo "exit 0" >> $preup
84+
chmod +x $preup
85+
fi
7286
fi
7387
fi
7488

bin/v-update-firewall

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,26 @@ if [ -d "/etc/sysconfig" ]; then
164164
fi
165165
else
166166
/sbin/iptables-save > /etc/iptables.rules
167-
preup="/etc/network/if-pre-up.d/iptables"
168-
if [ ! -e "$preup" ]; then
169-
echo '#!/bin/sh' > $preup
170-
echo "/sbin/iptables-restore < /etc/iptables.rules" >> $preup
171-
echo "exit 0" >> $preup
172-
chmod +x $preup
167+
if [ -d "/etc/netplan" ]; then
168+
preup="/usr/lib/networkd-dispatcher/routable.d/50-ifup-hooks"
169+
if [ ! -e "$preup" ]; then
170+
IFS='%'
171+
echo '#!/bin/bash' > $preup
172+
echo '' >> $preup
173+
echo 'if [ "$IFACE" == "'$(/bin/ip token | awk -F 'dev ' '{print $2}')'" ]; then' >> $preup
174+
echo ' /sbin/iptables-restore < /etc/iptables.rules' >> $preup
175+
echo 'fi' >> $preup
176+
echo "exit 0" >> $preup
177+
chmod +x $preup
178+
fi
179+
else
180+
preup="/etc/network/if-pre-up.d/iptables"
181+
if [ ! -e "$preup" ]; then
182+
echo '#!/bin/sh' > $preup
183+
echo "/sbin/iptables-restore < /etc/iptables.rules" >> $preup
184+
echo "exit 0" >> $preup
185+
chmod +x $preup
186+
fi
173187
fi
174188
fi
175189

0 commit comments

Comments
 (0)