Merge branch 'tardis' of https://git.fsmpi.rwth-aachen.de/osak/lipstick into tardis

grub/grub.cfg

@@ -102,3 +102,8 @@ kde_menu
 set xfce_release="Xubuntu 18.04"
 set xfce_isoname="xubuntu.iso"
 xfce_menu
+
+menuentry "Show bootflags" {
+    cat "/bootflags.txt"
+    read
+}
\ No newline at end of file

preseed/lip-success.sh

@@ -2,10 +2,18 @@
 
 mkdir -p /target/isodevice
 mount --bind /isodevice /target/isodevice
+mount --bind /dev /target/dev
+mount --bind /proc /target/proc
+mount --bind /sys /target/sys
 
 # Make sure X11 is accessible from chroot
 mount --bind /tmp /target/tmp
 xhost + local:
 
-MPOINT=/isodevice chroot /target /isodevice/scripts/linuxparty.sh
+MPOINT=/isodevice ASKTOSKIP=yes x-terminal-emulator -e chroot /target /isodevice/scripts/linuxparty.sh
+
+umount /target/tmp
+umount /target/dev
+umount /target/proc
+umount /target/sys
 umount /target/isodevice && rmdir /target/isodevice

preseed/lip.seed

@@ -2,3 +2,5 @@ d-i preseed/early_command string sh /root/isodevice/preseed/lip-early.sh
 d-i ubiquity/success_command string sh /isodevice/preseed/lip-success.sh
 d-i clock-setup/utc boolean false
 d-i time/zone string Europe/Berlin
+ubiquity ubiquity/use_nonfree boolean true
+ubiquity ubiquity/partman-skip-unmount boolean true

scripts/linuxparty.sh

@@ -175,19 +175,19 @@ case "$GUI" in
   ;;
   zenity)
     askyesno() {
-	    zenity --question --text "$@" 2> /dev/null
+	    zenity --width 300 --question --text "$@" 2> /dev/null
     }
 
     err() {
-	    zenity --error --text "$@" 2> /dev/null
+	    zenity --width 300 --error --text "$@" 2> /dev/null
     }
 
     pressenter() {
-	    zenity --info --text "$@" 2> /dev/null
+	    zenity --width 300 --info --text "$@" 2> /dev/null
     }
     install_pkgs() {
 	    local pkglist=$3[@]
-	    INSTALL=$(zenity --list --title "$1" --text "$2" --checklist --separator=" " --width=786 --height=400 --column "Installieren?" --column "Paket" --column "Beschreibung" "${!pkglist}" 2> /dev/null || true)
+	    INSTALL=$(zenity --list --hide-column=2 --title "$1" --text "$2" --checklist --separator=" " --width=786 --height=400 --column "Installieren?" --column "Paket" --column "Beschreibung" "${!pkglist}" 2> /dev/null || true)
 
 	    if [ -n "$INSTALL" ]; then
                     INSTALLED_PKGS="$INSTALLED_PKGS $4" #register pseudo package
@@ -248,7 +248,7 @@ case "$GUI" in
                   text="$e"
                   kdlist[$i]="$tag"
                   i=$((i+1))
-                  kdlist[$i]="$tag: $text"
+                  kdlist[$i]="$text"
                   i=$((i+1))
                   kdlist[$i]="$use"
                   i=$((i+1))
@@ -459,11 +459,16 @@ else
    apt-get update
 fi
 
+if [ -n "$ASKTOSKIP" ]; then
+  askyesno "Möchtest du an dieser Stelle Aktualisierungen und spezielle Software für dein Studium installieren (empfohlen)?" || exit 0
+fi
+
+pressenter "Im folgenden werden Aktualisierungen installiert. Dies wird einige Minuten dauern."
 echo "Installiere updates (hoffentlich vom USB-Repo)"
-apt-get upgrade
+apt-get upgrade --quiet -y --force-yes
 
 echo "Installiere Standard-Programme"
-apt-get -y install $(grep '^[^|#]*P[^|]*|' "$MY_DIR/../packages" | cut -d'|' -f 2)
+apt-get install --quiet -y --force-yes $(grep '^[^|#]*D[^|]*|' "$MY_DIR/../packages" | cut -d'|' -f 2)
 
 # System absichern
 if askyesno "Netzwerk: Soll die Ubuntu Firewall (ufw/gufw) aktiviert werden ?"
@@ -471,13 +476,6 @@ then
   $DEBUG ufw enable
 fi
 
-# set hw clock to non-utc (because of windows)
-if askyesno "System: Soll die Harware-Uhr lokale Zeit statt UTC verwenden ?"
-then
-  $DEBUG timedatectl set-local-rtc 1
-fi
-
-
 echo "Installation:"
 echo "Programme, die für alle Fachrichtungen interressant sind (7zip, gimp, git, ... )"
 if [ -z "$NOGUI" ] || (askyesno "Sollen diese Programme installiert werden ?"); then

scripts/update_stick.sh

 #!/bin/bash
-BRANCH="ss15"
+BRANCH="tardis"
 
 if [ ! -d ".git" ]; then
     >&2 echo "Fatal error: expected .git directory in the working directory."