Merge branch 'upstream'

[automated-distro-installer] / fai / config / scripts / LAST / 50-misc

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 8ae015c082ee24a5ded245b23a24958e6e82de39..687700a6a5c112f79b5be81459456ba6eac24bdd 100755 (executable)
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -15,13 +15,15 @@ else
     fi
   fi
 
-  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
+  # i use dm for crypt, not lvm, so this gives false positive. todo, send patch to remove this
+  # upstream.
+  # 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
@@ -45,8 +47,8 @@ if [ $do_init_tasks -eq 1 ] ; then
 fi
 
 # Make sure everything is configured properly
-if ifclass DEBIAN ; then
-        $ROOTCMD apt-get -f install
+if ifclass DEBIAN || ifclass UBUNTU; then
+        $ROOTCMD apt-get -f install -y
 fi
 
 if [ $FAI_ACTION = "install" ]; then
@@ -58,7 +60,7 @@ if [ $FAI_ACTION = "install" ]; then
 fi
 
 # copy sources.list
-fcopy -iM /etc/apt/sources.list
+fcopy -iSM /etc/apt/sources.list
 
 
 setrel() {
@@ -72,7 +74,7 @@ setrel() {
        return
     fi
 
-    dists="jessie stretch buster xenial trusty"
+    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
@@ -86,14 +88,18 @@ 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 $apt_cdn/debian-security $release/updates main contrib non-free
-deb [trusted=yes] http://fai-project.org/download $release koeln
+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 [ -f $target/var/lib/dpkg/info/fai-server.list ]; 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* $LOGDIR
+    cp -pv $target/boot/vmlinuz* $target/boot/initrd* $FAI_RUNDIR
 fi
 
 exit $error