Remove FIXMEs. Change some parts of script to more efficient methods.jessie

1 files changed, 3 insertions, 84 deletions

diff --git a/install-itzks-workstation b/install-itzks-workstation
index af13ea5..29554d6 100644
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -69,18 +69,6 @@ editor /etc/default/nfs-common
 
 ###################
 
-# FIXME: remove soon; managed by puppet
-#read -p '''!   Aktivieren von jessie, jessie-updates, jessie-security 
-#Parameter wie folgt setzen:
-#    Unattended-Upgrade::MinimalSteps "true";
-#    Unattended-Upgrade::InstallOnShutdown "false";
-#    Unattended-Upgrade::Automatic-Reboot "false"; 
-#Starte nun den Editor mit [Enter]
-#'''
-#editor /etc/apt/apt.conf.d/50unattended-upgrades
-
-##################
-
 # FIXME: remove soon; is managed by normal install of itzks-systems-workstation package
 #echo '!   Java installieren...'
 #apt-get install oracle-java8-bin oracle-java8-jre oracle-java8-plugin
@@ -89,79 +77,15 @@ editor /etc/default/nfs-common
 
 ###################
 
-# FIXME: why not call apt-get remove --purge gnome-packagekit directly?
-read -p '''!   Update-Benachrichtigungen deaktivieren
-Es wird nun geprüft, ob die Update-Benachrichtigungen aktiv sind. [ENTER] 
-'''
-dpkg -l gnome-packagekit
-while true; do
-    read -p "Lies die Textausgabe des letzten Befehls. Ist das Paket aktiviert? [j/n] " yn
-    case $yn in
-        [Jj]* ) apt-get remove --purge gnome-packagekit; break;;
-        [Nn]* ) exit;;
-        * ) echo "Bitte antworte mit Ja oder Nein.";;
-    esac
-done
+# Disable update-notifications
+# FIXME: Add conflict to itzks-systems-common
+apt-get autoremove --purge gnome-packagekit
 
 ###################
 
 # switch to systemd-networkd with managed wlan0 interface
 itzks-switch-to-systemd-networkd
 
-# FIXME: remove, as handled by itzks-switch-to-systemd-networkd
-#echo '!   Umstellung auf systemd-networkd'
-#WIFIDEV=wlan0
-#export DEBIAN_FRONTEND=noninteractive
-#apt-get remove -q -y --purge resolvconf
-#systemctl disable NetworkManager
-#systemctl enable systemd-networkd.service
-#systemctl enable systemd-resolved.service
-#systemctl start systemd-resolved.service
-#rm /etc/resolv.conf
-#ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-#cat > /etc/systemd/network/20-dhcp.network << EOF
-#[Match]
-#Name=eth*
-#
-#[Network]
-#DHCP=yes
-#EOF
-#
-#cat > /etc/systemd/network/21-dhcp-wireless.network << EOF
-#[Match]
-#Name=$WIFIDEV
-#
-#[Network]
-#DHCP=yes
-#EOF
-#
-#cat > /etc/systemd/system/wpa_supplicant@.service << EOF
-#[Unit]
-#Description=WPA supplicant daemon (interface-specific version)
-#Requires=sys-subsystem-net-devices-%i.device
-#After=sys-subsystem-net-devices-%i.device
-#Before=network.target
-#Wants=network.target
-#
-## NetworkManager users will probably want the dbus version instead.
-#
-#[Service]
-#Type=simple
-#ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
-#
-#[Install]
-#Alias=multi-user.target.wants/wpa_supplicant@%i.service
-#EOF
-#
-#touch /etc/wpa_supplicant/wpa_supplicant-$WIFIDEV.conf
-#chmod go-rwx /etc/wpa_supplicant/wpa_supplicant-$WIFIDEV.conf
-#
-#systemctl enable wpa_supplicant@$WIFIDEV.service
-#systemctl disable networking
-#systemctl disable wpa_supplicant.service
-
-### REMOVE until here
-
 ####################
 
 # Add system-wide WiFi-config
@@ -180,11 +104,6 @@ muss der Hostname geändert werden. Es darf kein "lan" im
 Namen auftauchen, z.B. statt mw101-lan.intern muss
 es mw101.intern heißen. [ENTER] '''
 
-# FIXME: Remove the following three lines
-#editor /etc/hostname
-#read -p '''Der Rechner wird jetzt neu gestartet. 
-#Danach bitte install-itzks2.sh ausführen. [ENTER] '''
-
 # Set hostname
 read -p 'Wie lautet der Hostname (ohne Domain)? ' myhost
 hostnamectl set-hostname $myhost