From: Ian Kelling <iank@fsf.org>
Date: Sun, 8 Oct 2017 17:16:17 +0000 (-0700)
Subject: Merge branch 'upstream', fai 5.4
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=e6c8a36522847eca91819ab3eb656dd824bc3e3c;p=automated-distro-installer

Merge branch 'upstream', fai 5.4
---

e6c8a36522847eca91819ab3eb656dd824bc3e3c
diff --cc fai/config/basefiles/mk-basefile
index d9823cf,b93831c..b688a86
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@@ -17,20 -20,20 +20,23 @@@
  
  # Define your local mirros here
  # For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf
- MIRROR_DEBIAN=http://http.us.debian.org/debian
+ MIRROR_DEBIAN=http://deb.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_JESSIE=info,tasksel,tasksel-data
+ EXCLUDE_STRETCH=info,tasksel,tasksel-data
+ EXCLUDE_BUSTER=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
++EXCLUDE_FLIDAS=udhcpc,dibbler-client,info,tasksel,tasksel-data
+ EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data
  
+ # we need aptitude in the base file, since users may want to use it for installing packages
  INCLUDE_DEBIAN=aptitude
  
  
@@@ -263,12 -279,10 +282,12 @@@ 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*)
-         debgeneric $target $MIRROR_DEBIAN ;;
+     SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*)
+         debgeneric $target $MIRROR_DEBIAN $ARCH;;
      *) echo "Unknown distribution. Aborting."
         prtdists
         exit 99 ;;
diff --cc fai/config/class/DEBIAN.var
index ae445fa,8f00bb9..3823152
--- a/fai/config/class/DEBIAN.var
+++ b/fai/config/class/DEBIAN.var
@@@ -10,9 -9,9 +10,11 @@@ MODULESLIST="usbhid psmouse
  
  # if you have enough RAM (>2GB) you may want to enable this line. It
  # also puts /var/cache into a ramdisk.
 -#FAI_RAMDISKS="$target/var/lib/dpkg $target/var/cache"
 +# ian: uncommented
 +FAI_RAMDISKS="$target/var/lib/dpkg $target/var/cache"
  
  # if you want to use the faiserver as APT proxy
 -#APTPROXY=http://faiserver:3142
 +# ian: uncommented
 +APTPROXY=http://faiserver:3142
+ 
+ apt_cdn=http://deb.debian.org
diff --cc fai/config/package_config/FAIBASE
index 9888175,5b1f9b8..f2d0b29
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@@ -1,4 -1,5 +1,5 @@@
 -PACKAGES install-norec DEBIAN
 +PACKAGES install-norec DEBIAN UBUNTU
+ apt-transport-https
  fai-client
  debconf-utils
  file
diff --cc fai/config/scripts/GRUB_PC/10-setup
index 160dfa2,c19d4fa..47b3ba4
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@@ -46,16 -42,12 +43,15 @@@ elif [[ $GROOT =~ 'hostdisk' ]]; the
      if [ $? -eq 0 ]; then
          echo "Grub installed on hostdisk $BOOT_DEVICE"
      fi
-     rm $target/boot/grub/device.map
  
  else
 -    $ROOTCMD grub-install --no-floppy "$GROOT"
 -    if [ $? -eq 0 ]; then
 -        echo "Grub installed on $BOOT_DEVICE = $GROOT"
 -    fi
 +    for dev in $BOOT_DEVICE; do
 +        GROOT=$($ROOTCMD grub-probe -tdrive -d $dev)
 +        $ROOTCMD grub-install --no-floppy "$GROOT"
 +        if [ $? -eq 0 ]; then
 +            echo "Grub installed on $dev = $GROOT"
 +        fi
 +    done
  fi
  $ROOTCMD update-grub