Merge branch 'upstream'

diff --cc fai/config/class/FAIBASE.var
index dc507c77faa2b23e133ab46443036ffd11a6bddc,72d38f2006aa34f388621e6880c2ba051aad06b3..dabfb068d5c79cc44cd2656516e961c8453dc51e
--- 1/fai/config/class/FAIBASE.var
--- 2/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@@ -15,3 -16,10 +15,10 @@@ STOP_ON_ERROR=70
  
  # set parameter for install_packages(8)
  MAXPACKAGES=800
 -username=demo
 -USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+ 
+ # 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 --cc fai/config/scripts/LAST/50-misc
Simple merge