add flidas support, fix typo

diff --git a/README b/README
index f939a7d795295506aa6547832f4ab3a051607fe4..5745f030bdaa9de637f58ab70c1395d30f373350 100644 (file)
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ not added a pxe rom, I use a minimal debian stable subvolume which acts
 like a pxe rom). I use this for bare metal and vms, and two scripts
 which can run post boot so I use them on vps distributed image as well.
 
-Features people may find useful: installs encrypted trisquel belanos, ,
+Features people may find useful: installs encrypted trisquel belenos, ,
 debian jessie, debian stretch, ubuntu 16.04, and arch (havne't done
 recently, probably a bit broken), in a multi-boot setup using multiple
 subvolumes of a single btrfs filesystem.  Utilizes multiple disks, with

diff --git a/fai-redep b/fai-redep
index 9a455c9c0cc6d01f30e8b0a0469e6c18a22fbc1a..fabada02ee6826da23607d48fe2f1bed5ffc98a4 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -53,7 +53,7 @@ tar -cz /p/c/machine_specific/*/filesystem/etc/ssh | \
   ssh root@$faiserver_host tar -xz -C /srv/fai/config/distro-install-common
 
 
-# built BELANOS basefile with mk-basefile -J BELENOS64. it's stored in
+# built BELENOS basefile with mk-basefile -J BELENOS64. it's stored in
 # it's own repo which is published alongside this one called
 # fai-basefiles due to being a large binary file.
 

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index b4d790c94dae2d760e258d3deae28d7e15387afa..dd21c5395d0b46168a80e06220a9e3ceff45ad52 100755 (executable)
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -28,6 +28,7 @@ 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
@@ -262,7 +263,7 @@ case "$target" in
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
     SLC7_64) slc amd64 7 ;;
-    BELANOS*)
+    BELENOS*|FLIDAS*)
         debgeneric $target $MIRROR_TRISQUEL ;;
     TRUSTY*|XENIAL*)
         debgeneric $target $MIRROR_UBUNTU ;;

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index c6ac9fcbd7c21ad5b96d344dc837a6314407de87..465a64f51668bf853d3c148cbd1c43172c2c2967 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -34,14 +34,14 @@
 #
 # Each host defines the base distro: UBUNTU or DEBIAN.
 # the disto version, also the basefile name if we aren't installing debian stable:
-# STABLE, STRETCH64, XENIAL64, BELANOS64
+# STABLE, STRETCH64, XENIAL64, BELENOS64, FLIDAS64
 # the distro subvol name, we can add as many of these as we want:
-# VOL_STABLE, VOL_STABLE_BOOTSTRAP, VOL_STRETCH, VOL_XENIAL, VOL_BELANOS
+# VOL_STABLE, VOL_STABLE_BOOTSTRAP, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS
 # Using VOL_STABLE_BOOTSTRAP sets up the install to act like a pxe rom if
 # grub sets a specific var.
 # and the class which defines the apt sources files we want,
 # STABLE_FREE, STABLE_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE (no XENIAL_NONFREE setup yet), BELANOS, STABLE_LINODE.
+# XENIAL_FREE (no XENIAL_NONFREE setup yet), BELENOS, FLIDAS, STABLE_LINODE.
 # This is a little redundant in some cases, but it keeps things
 # simpler.
 #

diff --git a/fai/config/files/etc/apt/preferences.d/belenos/BELANOS b/fai/config/files/etc/apt/preferences.d/belenos/BELENOS
similarity index 59%
rename from fai/config/files/etc/apt/preferences.d/belenos/BELANOS
rename to fai/config/files/etc/apt/preferences.d/belenos/BELENOS
index f20972ba4b20e230205d55daf4402d8a52208c97..1e59c86d897ec11c85923239f34a1e72340d614c 100644 (file)
--- a/fai/config/files/etc/apt/preferences.d/belenos/BELANOS
+++ b/fai/config/files/etc/apt/preferences.d/belenos/BELENOS
@@ -1,4 +1,3 @@
-# a bit older distro, so get all backports
 Package: *
 Pin: release a=belenos-backports
 Pin-Priority: 500

diff --git a/fai/config/files/etc/apt/preferences.d/flidas/FLIDAS b/fai/config/files/etc/apt/preferences.d/flidas/FLIDAS
new file mode 100644 (file)
index 0000000..bd19b25
--- /dev/null
+++ b/fai/config/files/etc/apt/preferences.d/flidas/FLIDAS
@@ -0,0 +1,3 @@
+Package: *
+Pin: release a=flidas-backports
+Pin-Priority: 500

diff --git a/fai/config/files/etc/apt/sources.list.d/belanos.list/BELANOS b/fai/config/files/etc/apt/sources.list.d/belenos.list/BELENOS
similarity index 100%
rename from fai/config/files/etc/apt/sources.list.d/belanos.list/BELANOS
rename to fai/config/files/etc/apt/sources.list.d/belenos.list/BELENOS

diff --git a/fai/config/files/etc/apt/sources.list.d/flidas.list/FLIDAS b/fai/config/files/etc/apt/sources.list.d/flidas.list/FLIDAS
new file mode 100644 (file)
index 0000000..faec0da
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/flidas.list/FLIDAS
@@ -0,0 +1,12 @@
+deb http://mirror.fsf.org/trisquel/ flidas main
+deb-src http://mirror.fsf.org/trisquel/ flidas main
+
+deb http://mirror.fsf.org/trisquel/ flidas-updates main
+deb-src http://mirror.fsf.org/trisquel/ flidas-updates main
+
+deb http://mirror.fsf.org/trisquel/ flidas-security main
+deb-src http://mirror.fsf.org/trisquel/ flidas-security main
+
+# Uncomment this lines to enable the backports optional repository
+deb http://mirror.fsf.org/trisquel/ flidas-backports main
+deb-src http://mirror.fsf.org/trisquel/ flidas-backports main

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index f241fd608f3c8c72524e6c1b3ab9097cd78b2e7b..1db0197f46a7cae93709e4985a19790fa99cd74e 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -205,6 +205,8 @@ if [[ ! $DISTRO ]]; then
         DISTRO=ubuntuxenial
     elif ifclass VOL_BELENOS; then
         DISTRO=trisquelbelenos
+    elif ifclass VOL_FLIDAS; then
+        DISTRO=trisquelflidas
     else
         echo "PARTITIONER ERROR: no distro class/var set" >&2
         exit 1

diff --git a/live-kexec b/live-kexec
index aef734282e63b84477110220a5a13418147135f5..5bd5833d158363576beaf82744012334dbf79615 100644 (file)
--- a/live-kexec
+++ b/live-kexec
@@ -23,7 +23,7 @@ fai kexec from upstream live cds, i.e. curl|bash
 You can copy this to a http server, then wget -O- url|sudo bash
 curl is sometimes not preinstalled on a live cd.
 
-This has been tested on trisquel belanos and ubuntu xenial.
+This has been tested on trisquel belenos and ubuntu xenial.
 
 If the screen just sits in a weird color inverted, corrupted looking state,
 it's probably nothing wrong with the computer, but a problem
@@ -50,7 +50,7 @@ kexec-tools kexec-tools/load_kexec boolean false
 EOF
     apt-get install -y pxe-kexec
 fi
-# running this piped to bash on belanos, the apt-get goes
+# running this piped to bash on belenos, the apt-get goes
 # into the background while it's still installing, and pxe-kexec
 # just exits right away. sleep calls are strangely ignored.
 # I don't know whats going on, but just running the same