From d4f7a9349a08f60957ca544f3d68a9b97015f6b9 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 11 Nov 2019 14:14:12 -0500 Subject: [PATCH] etiona fixes make etiona sources be higher priority than bionic. add varioius packages preferences that etiona hasn't yet built. --- .../files/etc/apt/preferences.d/etiona-bionic/ETIONA | 2 +- .../files/etc/apt/preferences.d/etiona-flidas/ETIONA | 4 ---- .../{etiona.list => aaa-etiona.list}/ETIONA | 0 .../files/etc/apt/sources.list.d/bionic.list/ETIONA | 12 ++++++------ .../files/etc/apt/sources.list.d/flidas.list/ETIONA | 12 ------------ fai/config/hooks/partition.DEFAULT | 2 +- fai/config/scripts/DEBIAN/30-interface | 4 ++-- 7 files changed, 10 insertions(+), 26 deletions(-) rename fai/config/files/etc/apt/sources.list.d/{etiona.list => aaa-etiona.list}/ETIONA (100%) delete mode 100644 fai/config/files/etc/apt/sources.list.d/flidas.list/ETIONA 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 2d50197..e4161f6 100644 --- 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 123cc39..67e2f8c 100644 --- 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 d8cf987..bc32744 100644 --- 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 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 ccaca6e..c2628e2 100755 --- 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 <> /tmp/fai/fstab <= 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, -- 2.30.2