From a74a6940a3c2a2643a71ba0e7d12cf4874b47378 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 13 Feb 2018 21:02:47 +0100
Subject: NetworkManager/WiFI: Check if system-wide connection exists, if yes,
 assume already configured.

---
 install-itzks-workstation | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'install-itzks-workstation')

diff --git a/install-itzks-workstation b/install-itzks-workstation
index 95b1ac8..2614509 100755
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -122,11 +122,15 @@ sed -e 's/^XKBOPTIONS=""/XKBOPTIONS="compose:rctrl"/' -i /etc/default/keyboard
 # Restart keyboard-service to apply new settings
 service keyboard-setup restart
 
+
 ####################
 # WiFi-config for NetworkManager
 
-# Write standard config
-cat <<EOT > /etc/NetworkManager/system-connections/SSID.in
+# only if no system-wide connections exists, so far...
+if ! grep -q -E '^permissions=$' /etc/NetworkManager/system-connections/*
+
+	# Write standard config
+	cat <<EOT > /etc/NetworkManager/system-connections/SSID.in
 [connection]
 id=@SSID@
 uuid=@UUID@
@@ -155,29 +159,30 @@ never-default=false
 method=ignore
 EOT
 
-# Set permissions on generated file
-chmod go-rwx /etc/NetworkManager/system-connections/SSID.in
+	# Set permissions on generated file
+	chmod go-rwx /etc/NetworkManager/system-connections/SSID.in
 
-# Generate uuid and timestamp and overwrite in file
+	# Generate uuid and timestamp and overwrite in file
 
-UUID=$(uuidgen -t)
-sed -i 's/@UUID@/'"$UUID"'/' /etc/NetworkManager/system-connections/SSID.in
+	UUID=$(uuidgen -t)
+	sed -i 's/@UUID@/'"$UUID"'/' /etc/NetworkManager/system-connections/SSID.in
 
-TIMESTAMP=$(date +%s )
-sed -i 's/@TIMESTAMP@/'"$TIMESTAMP"'/' /etc/NetworkManager/system-connections/SSID.in
+	TIMESTAMP=$(date +%s )
+	sed -i 's/@TIMESTAMP@/'"$TIMESTAMP"'/' /etc/NetworkManager/system-connections/SSID.in
 
-# Ask user for SSID and password
-echo '!   WIFI-Netzwerk hinzufügen'
-read -p 'Wie lautet die SSID? ' ssid
-sed -i 's/@SSID@/'"$ssid"'/' /etc/NetworkManager/system-connections/SSID.in
-read -p 'Wie lautet das zugehörige Passwort? ' passw
-sed -i 's/@password@/'"$passw"'/' /etc/NetworkManager/system-connections/SSID.in
-unset passw
+	# Ask user for SSID and password
+	echo '!   WIFI-Netzwerk hinzufügen'
+	read -p 'Wie lautet die SSID? ' ssid
+	sed -i 's/@SSID@/'"$ssid"'/' /etc/NetworkManager/system-connections/SSID.in
+	read -p 'Wie lautet das zugehörige Passwort? ' passw
+	sed -i 's/@password@/'"$passw"'/' /etc/NetworkManager/system-connections/SSID.in
+	unset passw
 
-# move tweaked template to real configuration file
-mv /etc/NetworkManager/system-connections/SSID.in /etc/NetworkManager/system-connections/"$ssid"
+	# move tweaked template to real configuration file
+	mv /etc/NetworkManager/system-connections/SSID.in /etc/NetworkManager/system-connections/"$ssid"
 
-unset ssid
+	unset ssid
+fi
 
 # Write new content for /usr/share/debian-edu-config/tools/wpad-extract. 
 # Workaround for Debian bug #888829. Probably fixed with debian-edu-config 1.929+deb9u1.
-- 
cgit v1.2.3