X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;h=2a7271b777041292a96527f85bab611d92125612;hb=94a151efd665eb0214c2c85604b81377fb346de8;hp=62c31db7b3a3ceafe726aa5ad180a387fcce75a8;hpb=3bd65f0ca635f1349626c2393a4dd8a50df64f54;p=automated-distro-installer

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 62c31db..2a7271b 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -1,23 +1,27 @@
 #! /bin/bash
 
-# copyright Thomas Lange 2001-2015, lange@debian.org
+# copyright Thomas Lange 2001-2016, lange@debian.org
 
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-# check if mdadm has been forgotten
-if grep -q active /proc/mdstat 2>/dev/null; then
+if [ "$FAI_ACTION" = "dirinstall" -o $do_init_tasks -eq 0 ] ; then
+  :
+else
+  # check if mdadm has been forgotten
+  if grep -q active /proc/mdstat 2>/dev/null; then
     if [ ! -d $target/etc/mdadm ]; then
 	echo ERROR: Found Software RAID, but the mdadm package was not installed
 	error=1
     fi
-fi
+  fi
 
-usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
-if [ $usedm -ne 0 ]; then
+  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
 	error=1
     fi
+  fi
 fi
 
 # remove backup files from cfengine, but only if cfengine is installed
@@ -42,16 +46,58 @@ fi
 
 # Make sure everything is configured properly
 if ifclass DEBIAN ; then
-        echo "Running \"apt-get -f install\" for the last time."
-        $ROOTCMD apt-get -f install
+        $ROOTCMD apt-get -f install -y
 fi
 
 if [ $FAI_ACTION = "install" ]; then
     lskernels=$(echo $target/boot/vmlinu*)
-    [ -f ${lskernels%% *} ] || echo "ERROR: No kernel was installed. Have a look at shell.log" >&2
+    if [ ! -f ${lskernels%% *} ]; then
+	echo "ERROR: No kernel was installed. Have a look at shell.log" >&2
+	error=1
+    fi
 fi
 
 # copy sources.list
-fcopy -iM /etc/apt/sources.list
+fcopy -iSM /etc/apt/sources.list
+
+
+setrel() {
+
+    # if release is not set, try to determine it
+
+    if [ -n "$release" ]; then
+	return
+    fi
+    if [ ! -f $target/etc/os-release ]; then
+	return
+    fi
+
+    dists="jessie stretch buster bullseye bookworm trixie focal bionic xenial trusty"
+    for d in $dists; do
+	if grep -iq $d $target/etc/os-release; then
+	    release=$d
+	    break
+	fi
+    done
+}
+
+# if installation was done from CD, replace useless sources.list
+setrel
+if [ -f $target/etc/apt/sources.list -a -n "$release" ]; then
+    grep -q 'file generated by fai-cd' $target/etc/apt/sources.list && cat <<EOF > $target/etc/apt/sources.list
+deb $apt_cdn/debian $release main contrib non-free
+deb $security_cdn/debian-security ${secsuite} main contrib non-free
+#deb [trusted=yes] http://fai-project.org/download $release koeln
+EOF
+    # if the package fai-server was installed, enable the project's repository
+    if dpkg-query --admindir=$target/var/lib/dpkg -W fai-server >/dev/null 2>&1; then
+	sed -i -e '/fai-project.org/s/^#//' $target/etc/apt/sources.list
+    fi
+fi
+
+# for ARM architecture, we may need the kernel and initrd to boot or flash the device
+if ifclass ARM64; then
+    cp -pv $target/boot/vmlinuz* $target/boot/initrd* $FAI_RUNDIR
+fi
 
 exit $error