X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;h=a573f5081e7a95dcf74472725342ff269676f65e;hb=490334746631a6c956eee47947f3ab8f8a451666;hp=8ae015c082ee24a5ded245b23a24958e6e82de39;hpb=2773c14668a490a1254a63541e1ef9fd3377104b;p=automated-distro-installer

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 8ae015c..a573f50 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -46,7 +46,7 @@ fi
 
 # Make sure everything is configured properly
 if ifclass DEBIAN ; then
-        $ROOTCMD apt-get -f install
+        $ROOTCMD apt-get -f install -y
 fi
 
 if [ $FAI_ACTION = "install" ]; then
@@ -58,7 +58,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 +72,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 +86,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