From: Ian Kelling <iank@fsf.org>
Date: Thu, 4 Jul 2019 04:38:36 +0000 (-0400)
Subject: start of etiona (trisquel 9) support
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=7a4577880f3d646ec68d60b1cd3a38f110f784bb;p=automated-distro-installer

start of etiona (trisquel 9) support

currently debootstrap has a troubling warning:
W: Failure while configuring base packages.  This will be re-attempted up to five times.
W: See /tmp/basefiles.Erlvo4HI/debootstrap/debootstrap.log for details (possibly the package isc-dhcp-client is at fault)

I looked to find the debootstrap package in etiona, but it doesn't exist
yet. Ruben said he thought all the packages were being built, but
clearly they aren't.
---

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 6dcd986..f739142 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -36,6 +36,7 @@ EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
 EXCLUDE_XENIAL=udhcpc,dibbler-client,info
 EXCLUDE_FLIDAS=udhcpc,dibbler-client,info
 EXCLUDE_BIONIC=udhcpc,dibbler-client,info
+EXCLUDE_ETIONA=udhcpc,dibbler-client,info
 
 # here you can add packages, that are needed very early
 INCLUDE_DEBIAN=
@@ -219,7 +220,9 @@ prtdists() {
                  SLC7_64
     TRUSTY32     TRUSTY64
     XENIAL32     XENIAL64
+                 FLIDAS64
                  BIONIC64
+                 ETIONA64
     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
@@ -301,7 +304,7 @@ case "$target" in
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
     SLC7_64) slc amd64 7 ;;
-    BELENOS*|FLIDAS*)
+    BELENOS*|FLIDAS*|ETIONA*)
         debgeneric $target $MIRROR_TRISQUEL ;;
     TRUSTY*|XENIAL*|BIONIC*)
         debgeneric $target $MIRROR_UBUNTU ;;
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 3767bd3..e93bef5 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -23,16 +23,16 @@
 # Debian stable basefile gets built by faisetup and gets used otherwise.
 # With X suffix, means it has gone through the dirinstall process and has eXtra
 # things installed, to speed up installation.
-# STRETCH64, BUSTER64, XENIAL64, FLIDAS64, FLIDAS64BIG
+# STRETCH64, BUSTER64, XENIAL64, FLIDAS64, FLIDAS64BIG, ETIONA64
 #
 # The distro subvol name, we can add as many of these as we want:
 # VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_XENIAL, VOL_FLIDAS,
-# VOL_STRETCH_BOOTSTRAP.  Using VOL_STRETCH_BOOTSTRAP sets up the
-# install to act like a pxe rom if grub sets a specific var.
+# VOL_ETIONA VOL_STRETCH_BOOTSTRAP.  Using VOL_STRETCH_BOOTSTRAP sets up
+# the install to act like a pxe rom if grub sets a specific var.
 #
 # The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE,
 # BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, FLIDAS, STRETCH_LINODE.
+# XENIAL_FREE, FLIDAS, ETIONA, STRETCH_LINODE.
 #
 # It's all a little redundant in some cases, but it keeps things
 # simpler.
@@ -78,6 +78,8 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
         _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;;
         # flidas
         _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
+        # etiona
+        _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;;
         # stretch
         _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_FREE ;;
         # buster
diff --git a/fai/config/files/etc/apt/preferences.d/flidas/ETIONA b/fai/config/files/etc/apt/preferences.d/flidas/ETIONA
new file mode 100644
index 0000000..223a9f4
--- /dev/null
+++ b/fai/config/files/etc/apt/preferences.d/flidas/ETIONA
@@ -0,0 +1,3 @@
+Package: *
+Pin: release a=etiona-backports
+Pin-Priority: 500
diff --git a/fai/config/files/etc/apt/sources.list.d/flidas.list/ETIONA b/fai/config/files/etc/apt/sources.list.d/flidas.list/ETIONA
new file mode 100644
index 0000000..0539b9b
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/flidas.list/ETIONA
@@ -0,0 +1,12 @@
+deb http://mirror.fsf.org/trisquel/ etiona main
+deb-src http://mirror.fsf.org/trisquel/ etiona main
+
+deb http://mirror.fsf.org/trisquel/ etiona-updates main
+deb-src http://mirror.fsf.org/trisquel/ etiona-updates main
+
+deb http://archive.trisquel.info/trisquel/ etiona-security main
+deb-src http://archive.trisquel.info/trisquel/ etiona-security main
+
+# Uncomment this lines to enable the backports optional repository
+deb http://mirror.fsf.org/trisquel/ etiona-backports main
+deb-src http://mirror.fsf.org/trisquel/ etiona-backports main
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index a09b779..c637a9b 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -262,6 +262,8 @@ if [[ ! $DISTRO ]]; then
     DISTRO=trisquelbelenos
   elif ifclass VOL_FLIDAS; then
     DISTRO=trisquelflidas
+  elif ifclass VOL_ETIONA; then
+    DISTRO=trisqueletiona
   else
     echo "PARTITIONER ERROR: no distro class/var set" >&2
     exit 1
diff --git a/mymk-basefile b/mymk-basefile
index 4136bb8..e70f97b 100755
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -48,6 +48,10 @@ for d in belenos flidas; do
     $s ln -sf gutsy $d;
   fi
 done
+d=etiona
+if [[ ! -L $d && ! -e $d ]]; then
+  $s ln -sf trisquel etiona;
+fi
 
 if [[ $BASEFILE_DIR ]]; then
   cd $BASEFILE_DIR