From 121b3484e6301de73a1c5f3cc89ba4997de9ba08 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Nov 2016 22:23:38 +0100
Subject: [PATCH] Switch from aptitude to apt-get as package manager in package
 list

So far we used "PACKAGES aptitude" to use aptitude as package
manager. FAI's install_packages supports different commands
(package managers) though, see `install_packages -H`:

  % install_packages -H | grep -e '^\s*aptitude ' -e '^\s*install '
         aptitude    aptitude -R -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew install
          install    apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew --fix-missing install

FAI versions until 5.3** support ignoring packages via:

| PACKAGES install
|
| packagename-

We can use that feature in the IGNORE class to avoid e.g. the
installation of the partimage package which is currently
unavailable in Debian/testing and therefore would fail the build
(because of aptitude's #835372 behavior change).

** NOTE: FAI v5.3 is broken regarding this behavior, so we've to
use FAI 4.3.1+deb8u1 from jessie to use that feature (at least
until it's restored/fixed again).
---
 db/db-to-fai                                      | 2 +-
 docs/grml-live.txt                                | 2 +-
 etc/grml/fai/config/package_config/DEBIAN_SQUEEZE | 2 +-
 etc/grml/fai/config/package_config/DEBIAN_WHEEZY  | 2 +-
 etc/grml/fai/config/package_config/GRMLBASE       | 2 +-
 etc/grml/fai/config/package_config/GRML_FULL      | 6 +++---
 etc/grml/fai/config/package_config/GRML_SMALL     | 6 +++---
 etc/grml/fai/config/package_config/IGNORE         | 2 +-
 etc/grml/fai/config/package_config/LATEX          | 2 +-
 etc/grml/fai/config/package_config/XORG           | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/db/db-to-fai b/db/db-to-fai
index 074cca3..3cbddb9 100755
--- a/db/db-to-fai
+++ b/db/db-to-fai
@@ -39,7 +39,7 @@ else
 
    # write fai header and package information to stdout:
    echo "# package list of build $BUILD_ID from database $DB:"
-   echo "PACKAGES aptitude"
+   echo "PACKAGES install"
    awk -F\| '{print $1"="$2}' "$TMPFILE"
 fi
 
diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 28aaa22..ad6b8fb 100644
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -635,7 +635,7 @@ How do I add additional Debian package(s) to my CD/ISO?
 Just create a new class (using the package_config directory):
 
   # cat > /etc/grml/fai/config/package_config/MIKA << EOF
-  PACKAGES aptitude
+  PACKAGES install
 
   vim
   another_name_of_a_debian_package
diff --git a/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE b/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE
index b3acf2e..bf18dac 100644
--- a/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE
+++ b/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 # needed for linux-image-amd64-grml
 linux-base/squeeze-backports
diff --git a/etc/grml/fai/config/package_config/DEBIAN_WHEEZY b/etc/grml/fai/config/package_config/DEBIAN_WHEEZY
index 7147ba6..19d7235 100644
--- a/etc/grml/fai/config/package_config/DEBIAN_WHEEZY
+++ b/etc/grml/fai/config/package_config/DEBIAN_WHEEZY
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 zd1211-firmware
 ifenslave-2.6
diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index a8886ee..c3a5db9 100644
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 apt-transport-https
 busybox
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 6c93a49..3737544 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 grml-live
 grml-paste
@@ -335,8 +335,8 @@ usbview
 bats
 stress
 
-PACKAGES aptitude I386
+PACKAGES install I386
 linux-image-i386-grml
 
-PACKAGES aptitude AMD64
+PACKAGES install AMD64
 linux-image-amd64-grml
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 4db5f8e..5dbcfbe 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 apt
 atftp
@@ -93,8 +93,8 @@ xfsprogs
 zip
 zsh
 
-PACKAGES aptitude I386
+PACKAGES install I386
 linux-image-i386-grml
 
-PACKAGES aptitude AMD64
+PACKAGES install AMD64
 linux-image-amd64-grml
diff --git a/etc/grml/fai/config/package_config/IGNORE b/etc/grml/fai/config/package_config/IGNORE
index 553796a..06c7e8c 100644
--- a/etc/grml/fai/config/package_config/IGNORE
+++ b/etc/grml/fai/config/package_config/IGNORE
@@ -1,2 +1,2 @@
-PACKAGES aptitude
+PACKAGES install
 
diff --git a/etc/grml/fai/config/package_config/LATEX b/etc/grml/fai/config/package_config/LATEX
index 7eca0b6..1ec86d1 100644
--- a/etc/grml/fai/config/package_config/LATEX
+++ b/etc/grml/fai/config/package_config/LATEX
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 auctex
 bibcursed
diff --git a/etc/grml/fai/config/package_config/XORG b/etc/grml/fai/config/package_config/XORG
index 852697d..6efbeb1 100644
--- a/etc/grml/fai/config/package_config/XORG
+++ b/etc/grml/fai/config/package_config/XORG
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES install
 
 xfonts-100dpi
 xfonts-75dpi
-- 
2.1.4