Merge branch 'upstream'

diff --git a/fai/config/class/85-efi-classes b/fai/config/class/85-efi-classes
index d61db7e88b29077dc59f2ad5598ae57813c493c4..711b53479e623da3355248ee4580a898a569be6c 100755 (executable)
--- a/fai/config/class/85-efi-classes
+++ b/fai/config/class/85-efi-classes
@@ -2,7 +2,7 @@
 
 # define classes for disk_config in an EFI enironment
 
-if [ ! -d /sys/firmware/efi ]; then
+if [ ! -d /sys/firmware/efi ] || ifclass GRUB_PC; then
     exit 0
 fi
 

diff --git a/fai/config/class/FAIBASE.var b/fai/config/class/FAIBASE.var
index dc507c77faa2b23e133ab46443036ffd11a6bddc..dabfb068d5c79cc44cd2656516e961c8453dc51e 100644 (file)
--- a/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@ -15,3 +15,10 @@ STOP_ON_ERROR=700
 
 # set parameter for install_packages(8)
 MAXPACKAGES=800
+
+# a user account will be created
+#username=demo
+#USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+
+# set a default
+FAI_DEBOOTSTRAP="bullseye http://deb.debian.org/debian"

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 16e697e5eb1a5da5e41bdd8e8adbb4dd1cd24693..831f15d6f288fdf380d23d30257c6101167fcec7 100755 (executable)
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -92,7 +92,7 @@ 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
+    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