From: Ian Kelling <iank@fsf.org>
Date: Sat, 7 Oct 2017 23:06:39 +0000 (-0700)
Subject: update to upstream 5.4.6
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=7024f2155d8d5e4754d5c1ce0ccf8352149f81cd;p=automated-distro-installer

update to upstream 5.4.6
---

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 6d6cfca..ebbe3d9 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -2,7 +2,7 @@
 
 # mk-basefile, create basefiles for some distributions
 #
-# Thomas Lange, Uni Koeln, 2011-2016
+# Thomas Lange, Uni Koeln, 2011-2017
 # based on the Makefile implementation of Michael Goetze
 
 # Supported distributions (each i386/amd64):
@@ -245,6 +245,7 @@ if [ $? -eq 1 ]; then
     echo "mktemp failed. Aborting."
     exit 2
 fi
+chmod 755 $xtmp
 
 target=$1 # also the name of the output file
 
diff --git a/fai/config/class/40-parse-profiles.sh b/fai/config/class/40-parse-profiles.sh
index 7ed3055..2e58bc3 100755
--- a/fai/config/class/40-parse-profiles.sh
+++ b/fai/config/class/40-parse-profiles.sh
@@ -9,7 +9,7 @@
 if [ X$FAI_ACTION = Xinstall -o X$FAI_ACTION = Xdirinstall -o X$FAI_ACTION = X ]; then
     :
 else
-    return
+    return 0
 fi
 
 [ "$flag_menu" ] || return 0
diff --git a/fai/config/class/41-warning.sh b/fai/config/class/41-warning.sh
index b3da9fe..4f6e6f2 100755
--- a/fai/config/class/41-warning.sh
+++ b/fai/config/class/41-warning.sh
@@ -3,10 +3,10 @@
 if [ X$FAI_ACTION = Xinstall -o X$FAI_ACTION = X ]; then
     :
 else
-    return
+    return 0
 fi
 if [ X$action = Xdirinstall ]; then
-    return
+    return 0
 fi
 
 grep -q INSTALL $LOGDIR/FAI_CLASSES || return 0
diff --git a/fai/config/class/GCE.var b/fai/config/class/GCE.var
index 223f758..805bb3d 100644
--- a/fai/config/class/GCE.var
+++ b/fai/config/class/GCE.var
@@ -1,4 +1,4 @@
-release=jessie
+release=stretch
 TIMEZONE=UTC
 NTPSRVS='metadata.google.internal'
 NIC1=eth0
diff --git a/fai/config/files/etc/apt/sources.list/GNOME b/fai/config/files/etc/apt/sources.list/GNOME
index 84b7172..3f8c4da 100644
--- a/fai/config/files/etc/apt/sources.list/GNOME
+++ b/fai/config/files/etc/apt/sources.list/GNOME
@@ -1,2 +1,2 @@
-deb http://httpredir.debian.org/debian jessie main contrib non-free
-deb http://httpredir.debian.org/debian-security jessie/updates main contrib non-free
+deb http://httpredir.debian.org/debian stretch main contrib non-free
+deb http://httpredir.debian.org/debian-security stretch/updates main contrib non-free
diff --git a/fai/config/files/etc/fai/apt/sources.list/FAISERVER b/fai/config/files/etc/fai/apt/sources.list/FAISERVER
index d5d463d..b9be0aa 100644
--- a/fai/config/files/etc/fai/apt/sources.list/FAISERVER
+++ b/fai/config/files/etc/fai/apt/sources.list/FAISERVER
@@ -1,5 +1,5 @@
-deb http://httpredir.debian.org/debian jessie main contrib non-free
-deb http://security.debian.org/debian-security jessie/updates main contrib non-free
+deb http://httpredir.debian.org/debian stretch main contrib non-free
+deb http://security.debian.org/debian-security stretch/updates main contrib non-free
 
-# repository that may contain newer fai packages for jessie
-deb [trusted=yes] http://fai-project.org/download jessie koeln
+# repository that may contain newer fai packages for stretch
+deb [trusted=yes] http://fai-project.org/download stretch koeln
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
index 4cff8cd..5d93749 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
+++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
@@ -1,7 +1,7 @@
 # For a detailed description see nfsroot.conf(5)
 
 # "<suite> <mirror>" for debootstrap
-FAI_DEBOOTSTRAP="jessie http://httpredir.debian.org/debian"
+FAI_DEBOOTSTRAP="stretch http://httpredir.debian.org/debian"
 FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 NFSROOT=/srv/fai/nfsroot
diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index dffa360..8bbfd29 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -10,7 +10,8 @@ GREEN='\E[32m'
 set -o pipefail
 
 # setup network
-ifup eth0
+nic=$(grep iface /etc/network/interfaces| awk '{print $2}'|egrep -v ^lo)
+ifup $nic
 # regenerate ssh_host keys
 ls /etc/ssh/ssh_host_* > /dev/null
 if [ $? -ne 0 ]; then
@@ -19,10 +20,10 @@ fi
 sleep 8
 [ -x /etc/init.d/nscd ] && /etc/init.d/nscd restart
 
-echo "=================================" >/dev/console
-echo "Setting up the FAI install server" >/dev/console
-echo "This will take a few minutes" >/dev/console
-echo "=================================" >/dev/console
+echo "================================="
+echo "Setting up the FAI install server"
+echo "This will take a few minutes"
+echo "================================="
 
 . /etc/fai/fai.conf
 . /etc/fai/nfsroot.conf
@@ -39,30 +40,30 @@ fi
 ainsl /etc/fai/fai.conf "^LOGUSER=fai"
 
 # make index, then import the packages from the CD mirror
-apt-get update
+apt-get update >/dev/null
 curl -fs 'http://127.0.0.1:3142/acng-report.html?doImport=Start+Import&calcSize=cs&asNeeded=an#bottom' >/dev/null
 
 # setup the FAI server, including creating the nfsroot, use my own proxy
 export APTPROXY="http://127.0.0.1:3142"
 if [ -f /var/tmp/base.tar.xz ]; then
-    fai-setup -fvB /var/tmp/base.tar.xz 2>&1
+    fai-setup -fvB /var/tmp/base.tar.xz > /var/log/fai/fai-setup.log 2>&1
 else
-    fai-setup -fv 2>&1
+    fai-setup -fv > /var/log/fai/fai-setup.log 2>&1
 fi
 if [ $? -eq 0 ]; then
     rm /var/tmp/base.tar.xz
     echo ""
-    echo "================================================" >/dev/console
-    echo -e "Setting up the FAI server was ${GREEN}successful${NORMAL}" >/dev/console
-    echo "================================================" >/dev/console
+    echo "================================================"
+    echo -e "Setting up the FAI server was ${GREEN}successful${NORMAL}"
+    echo "================================================"
     echo ""
     sleep 10
 else
     echo ""
-    echo "==================================================" >/dev/console
-    echo -e "${RED}ERROR${NORMAL}: Setting up the FAI install server ${RED}FAILED${NORMAL}!" >/dev/console
-    echo "Read /var/log/fai/fai-setup.log for more debugging" >/dev/console
-    echo "==================================================" >/dev/console
+    echo "=================================================="
+    echo -e "${RED}ERROR${NORMAL}: Setting up the FAI install server ${RED}FAILED${NORMAL}!"
+    echo "Read /var/log/fai/fai-setup.log for more debugging"
+    echo "=================================================="
     echo ""
     sleep 10
     exit 99
diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index a1cf1d1..aa4c198 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -15,7 +15,7 @@ else
     fi
   fi
 
-  usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
+  usedm=$(dmsetup ls 2>/dev/null | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
   if [ $usedm -ne 0 ]; then
     if [ ! -d $target/etc/lvm ]; then
 	echo ERROR: Found lvm devices, but the lvm2 package was not installed
@@ -70,7 +70,7 @@ setrel() {
 	return
     fi
 
-    dists="jessie stretch xenial trusty"
+    dists="jessie stretch buster xenial trusty"
     for d in $dists; do
 	if grep -iq $d $target/etc/os-release; then
 	    release=$d