Updated pki.in (disabled NetworkManager boot time connection creating).

diff --git a/sources/pki.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/pki.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 6b022042492ac4f47c9f4b69985ddea0badead5c..00db1ad7564a9f7d40fa9a98c1f4ac8279db6d92 100755 (executable)
--- a/sources/pki.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/pki.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -34,6 +34,7 @@ while [ $CONNECTION_DEVICES_UP -lt 2 ]
 do
     if [ $CYCLES_WAITED -ge 10 ]
     then
+        echo
         nmcli connection show
         exit 1
     fi
@@ -56,15 +57,16 @@ then
     exit 1
 fi
 
-CONNECTION_LINE=$(nmcli --terse connection show | grep ':eth0$')
+CONNECTION_DEVICE="eth0"
+CONNECTION_ID="internal"
+CONNECTION_LINE=$(nmcli --terse connection show | grep ":${CONNECTION_DEVICE}$")
 CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':')
-CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
 nmcli connection add \
     connection.autoconnect yes \
-    connection.id internal \
+    connection.id $CONNECTION_ID \
     connection.interface-name $CONNECTION_DEVICE \
     connection.type 802-3-ethernet \
     ipv4.addresses "10.228.109.183/16" \
@@ -79,6 +81,13 @@ nmcli connection add \
     ipv6.method "manual" \
     save yes
 
+cat <<EOF >/etc/NetworkManager/conf.d/${CONNECTION_DEVICE}.conf
+[device]
+match-device=interface-name:$CONNECTION_DEVICE
+allowed-connections=id:$CONNECTION_ID
+keep-configuration=no
+EOF
+
 nmcli connection show
 
 hostnamectl hostname pki.in.useribm.hu