From: Ian Kelling <iank@fsf.org>
Date: Sat, 7 Oct 2017 23:10:13 +0000 (-0700)
Subject: Merge branch 'upstream'
X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=commitdiff_plain;h=da61a304a10de72288782a9d872769fe44576f50;hp=-c

Merge branch 'upstream'
---

da61a304a10de72288782a9d872769fe44576f50
diff --combined fai/config/basefiles/mk-basefile
index dd21c53,ebbe3d9..d9823cf
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@@ -2,7 -2,7 +2,7 @@@
  
  # mk-basefile, create basefiles for some distributions
  #
- # Thomas Lange, Uni Koeln, 2011-2016
+ # Thomas Lange, Uni Koeln, 2011-2017
  # based on the Makefile implementation of Michael Goetze
  
  # Supported distributions (each i386/amd64):
@@@ -17,18 -17,16 +17,18 @@@
  
  # Define your local mirros here
  # For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf
 -MIRROR_DEBIAN=http://httpredir.debian.org/debian/
 +MIRROR_DEBIAN=http://http.us.debian.org/debian
  MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
 +MIRROR_TRISQUEL=http://mirror.fsf.org/trisquel/
  MIRROR_CENTOS=http://mirror.netcologne.de/
  
  EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
  EXCLUDE_WHEEZY=info,tasksel,tasksel-data
  EXCLUDE_JESSIE=tasksel,tasksel-data
  EXCLUDE_STRETCH=tasksel,tasksel-data
 -
 +EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
  EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
 +EXCLUDE_FLIDAS=tasksel,tasksel-data
  EXCLUDE_XENIAL=tasksel,tasksel-data
  
  INCLUDE_DEBIAN=aptitude
@@@ -263,8 -261,6 +263,8 @@@ case "$target" i
      SLC6_32) slc i386 6 ;;
      SLC6_64) slc amd64 6 ;;
      SLC7_64) slc amd64 7 ;;
 +    BELENOS*|FLIDAS*)
 +        debgeneric $target $MIRROR_TRISQUEL ;;
      TRUSTY*|XENIAL*)
          debgeneric $target $MIRROR_UBUNTU ;;
      SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*)
diff --combined fai/config/scripts/LAST/50-misc
index 2a8f2f1,aa4c198..4627697
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@@ -15,14 -15,13 +15,13 @@@ els
      fi
    fi
  
-   # # commented because it does false possitive
-   # usedm=$(dmsetup ls | 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
+   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
@@@ -46,7 -45,7 +45,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
          echo "Running \"apt-get -f install\" for the last time."
          $ROOTCMD apt-get -f install
  fi
@@@ -71,7 -70,7 +70,7 @@@ setrel() 
  	return
      fi
  
-     dists="jessie stretch xenial trusty"
+     dists="jessie stretch buster xenial trusty"
      for d in $dists; do
  	if grep -iq $d $target/etc/os-release; then
  	    release=$d