etiona fixes

make etiona sources be higher priority than bionic. add varioius
packages preferences that etiona hasn't yet built.

diff --git a/fai/config/files/etc/apt/preferences.d/etiona-bionic/ETIONA b/fai/config/files/etc/apt/preferences.d/etiona-bionic/ETIONA
index 2d5019742e7787e183a2305958c56e9552ff777a..e4161f6f155451d19e76fe8bfe6aebd7bd1e1e69 100644 (file)
--- a/fai/config/files/etc/apt/preferences.d/etiona-bionic/ETIONA
+++ b/fai/config/files/etc/apt/preferences.d/etiona-bionic/ETIONA
@@ -10,6 +10,6 @@ Package: *
 Pin: release a=bionic-security
 Pin-Priority: -100
 
-Package: iproute2 cron thermald openssh-client openssh-server unattended-upgrades openssh-sftp-server
+Package: openssh-client openssh-server unattended-upgrades openssh-sftp-server aptitude aptitude-common redshift redshift-gtk gtk-redshift apache2 apache2-bin apache2-data apache2-utils firefox aptitude-doc-en apache2-doc gnome-screenshot nginx-doc p7zip p7zip-full gnome-icon-theme libnautilus-extension1a pidgin pidgin-data libpurple0 pidgin-libnotify unrar-free
 Pin: release n=bionic
 Pin-Priority: 500

diff --git a/fai/config/files/etc/apt/preferences.d/etiona-flidas/ETIONA b/fai/config/files/etc/apt/preferences.d/etiona-flidas/ETIONA
index 123cc3946df968f95c92bb6f4a3199e521c60dda..67e2f8c211f18bd24ca67d610577c7ebd72c4ecd 100644 (file)
--- a/fai/config/files/etc/apt/preferences.d/etiona-flidas/ETIONA
+++ b/fai/config/files/etc/apt/preferences.d/etiona-flidas/ETIONA
@@ -9,7 +9,3 @@ Pin-Priority: -100
 Package: *
 Pin: release a=flidas-security
 Pin-Priority: -100
-
-Package: firmware-linux-free
-Pin: release o=Trisquel
-Pin-Priority: 500

diff --git a/fai/config/files/etc/apt/sources.list.d/etiona.list/ETIONA b/fai/config/files/etc/apt/sources.list.d/aaa-etiona.list/ETIONA
similarity index 100%
rename from fai/config/files/etc/apt/sources.list.d/etiona.list/ETIONA
rename to fai/config/files/etc/apt/sources.list.d/aaa-etiona.list/ETIONA

diff --git a/fai/config/files/etc/apt/sources.list.d/bionic.list/ETIONA b/fai/config/files/etc/apt/sources.list.d/bionic.list/ETIONA
index d8cf987137637b40ea3fdd06c090440fcfa3b88f..bc3274461345ae388112b4c3f488f8766d40408c 100644 (file)
--- a/fai/config/files/etc/apt/sources.list.d/bionic.list/ETIONA
+++ b/fai/config/files/etc/apt/sources.list.d/bionic.list/ETIONA
@@ -1,6 +1,6 @@
-deb http://us.archive.ubuntu.com/ubuntu/ bionic main
-deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main
-deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main
-deb-src http://us.archive.ubuntu.com/ubuntu/ bionic main
-deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-updates main
-deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-security main
+deb http://us.archive.ubuntu.com/ubuntu/ bionic main universe
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main universe
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main universe
+deb-src http://us.archive.ubuntu.com/ubuntu/ bionic main universe
+deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-updates main universe
+deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-security main universe

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
deleted file mode 100644 (file)
index 8d1d105..0000000
--- a/fai/config/files/etc/apt/sources.list.d/flidas.list/ETIONA
+++ /dev/null
@@ -1,12 +0,0 @@
-#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 ccaca6efe02ad34a5eb94a79ce68e1602969aedc..c2628e26def254be12ff62759eabe8e98af69d7e 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -568,7 +568,7 @@ EOF
   for dev in ${devs[@]}; do
     swaps+=($(swap-cryptname))
     cat >>/tmp/fai/crypttab <<EOF
-$(root-cryptname)  $(rootdev)  none  keyscript=decrypt_keyctl,discard,luks,initramfs
+$(root-cryptname)  $(rootdev)  none  keyscript=/root/keyscript,discard,luks,initramfs
 $(swap-cryptname) $(swapdev)  /dev/urandom  swap,cipher=aes-xts-plain64,size=256,hash=ripemd160
 EOF
     cat >> /tmp/fai/fstab <<EOF

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index db84395f9d404afb022c378d54d4e4d6d84515b2..f23d1eaf62a5d0e6ccd317fc8df9ed6290bd04a6 100755 (executable)
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -93,7 +93,7 @@ case "$FAI_ACTION" in
     elif [ -d $target/etc/network/interfaces.d ]; then
         # ifupdown >= 0.7.41 (Debian >= 8, Ubuntu >= 14.04)
 
-      if ifclass VM || ifclass LINODE; then
+      if ifclass VM; then
         # note, this condition would apply to the elif below too,
         # but I don't specify a static ip in fai, so not bothering
         cat > $target/etc/network/interfaces <<-EOF
@@ -104,7 +104,7 @@ iface $NIC1 inet dhcp
 iface $NIC1 inet6 auto
 EOF
 
-      elif ifclass LINODE
+      elif ifclass LINODE; then
            # NIC1 is wrong, probably because the installer distro
            # is stretch and the installed one is buster.
            # todo: after upgrading installer to buster,