From: Ian Kelling <iank@fsf.org>
Date: Wed, 27 Apr 2022 02:42:29 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=commitdiff_plain;h=051fc89e27bd812a1a45292f6d2a18803ce6f394;hp=-c

Merge branch 'upstream'
---

051fc89e27bd812a1a45292f6d2a18803ce6f394
diff --combined fai/config/class/FAIBASE.var
index dc507c7,72d38f2..dabfb06
--- a/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@@ -1,5 -1,3 +1,5 @@@
 +#### from upstream example config, except where noted
 +
  # default values for installation. You can override them in your *.var files
  
  # allow installation of packages from unsigned repositories
@@@ -7,11 -5,21 +7,18 @@@ FAI_ALLOW_UNSIGNED=
  
  # Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not.
  UTC=yes
 -TIMEZONE=Europe/Berlin
 -
 -# the hash of the root password for the new installed linux system
 -# pw is "fai"
 -ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 +## changed from upstream. found in /usr/share/zoneinfo/, via fai-guide
 +TIMEZONE=US/Eastern
  
  # errors in tasks greater than this value will cause the installation to stop
  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'
++#username=demo
++#USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+ 
+ # set a default
+ FAI_DEBOOTSTRAP="bullseye http://deb.debian.org/debian"
diff --combined fai/config/scripts/LAST/50-misc
index 16e697e,2a7271b..831f15d
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@@ -15,15 -15,13 +15,15 @@@ els
      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
@@@ -47,7 -45,7 +47,7 @@@ if [ $do_init_tasks -eq 1 ] ; the
  fi
  
  # Make sure everything is configured properly
 -if ifclass DEBIAN ; then
 +if ifclass DEBIAN || ifclass UBUNTU; then
          $ROOTCMD apt-get -f install -y
  fi
  
@@@ -74,7 -72,7 +74,7 @@@ setrel() 
  	return
      fi
  
 -    dists="jessie stretch buster bullseye bookworm trixie focal bionic xenial trusty"
 +    dists="jessie stretch buster bullseye bookworm trixie jammy focal bionic xenial trusty aramo nabia etiona"
      for d in $dists; do
  	if grep -iq $d $target/etc/os-release; then
  	    release=$d
@@@ -92,7 -90,7 +92,7 @@@ deb $security_cdn/debian-security ${sec
  #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