summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2018-04-16 19:04:07 +0200
committerJonas Smedegaard <dr@jones.dk>2018-04-16 19:04:07 +0200
commit322dd849f7c154b2cc64efee14e4ad49c0050dfd (patch)
tree4d12483cc009b3ad6bf8d3a5c37bb24de157998c
parent3024187e4f1035cbca3768c98593656dd14fd968 (diff)
Drop support for network-manager 1.2.
-rwxr-xr-xskel/multistrap-hooks/completion_80_rootscript_net.sh20
1 files changed, 4 insertions, 16 deletions
diff --git a/skel/multistrap-hooks/completion_80_rootscript_net.sh b/skel/multistrap-hooks/completion_80_rootscript_net.sh
index 41b4fd3..be78fba 100755
--- a/skel/multistrap-hooks/completion_80_rootscript_net.sh
+++ b/skel/multistrap-hooks/completion_80_rootscript_net.sh
@@ -20,26 +20,14 @@ set -eu
set -x
# Add static-IP internal first-port ethernet connection
-# network-manager 1.2:
-nmcli connection add type ethernet con-name eth0-static ifname eth0 -- ipv4.addresses 192.168.1.1 ipv4.method manual connection.zone internal
-nmcli connection modify eth0-static connection.autoconnect on
-# network-manager 1.4:
-#nmcli connection add type ethernet con-name eth0-static ifname eth0 ip4 192.168.1.1 ipv4.method manual autoconnect on connection.zone internal
+nmcli connection add type ethernet con-name eth0-static ifname eth0 ip4 192.168.1.1 ipv4.method manual autoconnect on connection.zone internal
# Add dynamic-IP external wildcard ethernet connection
-# network-manager 1.2:
-nmcli connection add type ethernet con-name dhcp ifname '*' connection.zone external
-nmcli connection modify dhcp connection.autoconnect on
-# network-manager 1.4:
-#nmcli connection add type ethernet con-name dhcp ifname '*' autoconnect on connection.zone external
+nmcli connection add type ethernet con-name dhcp ifname '*' autoconnect on connection.zone external
# Add dynamic-IP external WWAN connection (hardcoded provider for now)
-# network-manager 1.2:
-nmcli connection add ifname '*' autoconnect yes type gsm apn data.tre.dk -- connection.id gsm-tre.dk-noauth connection.zone external gsm.password-flags 1
-#nmcli connection add ifname '*' autoconnect yes type gsm apn internet -- connection.id gsm-internet-noauth connection.zone external gsm.password-flags 1
-# network-manager 1.4:
-#nmcli connection add ifname '' autoconnect yes type gsm apn data.tre.dk connection.id gsm-tre.dk-noauth connection.zone external gsm.password-flags 1
-##nmcli connection add ifname '' autoconnect yes type gsm apn internet connection.id gsm-internet-noauth connection.zone external gsm.password-flags 1
+nmcli connection add ifname '' autoconnect yes type gsm apn data.tre.dk connection.id gsm-tre.dk-noauth connection.zone external gsm.password-flags 1
+#nmcli connection add ifname '' autoconnect yes type gsm apn internet connection.id gsm-internet-noauth connection.zone external gsm.password-flags 1
# Permit mosh from anywhere:
firewall-cmd --permanent --zone external --add-service mosh