get rid of aptitude

faiproject · Oct 19, 2017 · 033980f · 033980f
1 parent ac13ece
commit 033980f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/bin/fai-make-nfsroot b/bin/fai-make-nfsroot
@@ -585,7 +585,9 @@ trap "bad_exit" ERR
 # remove all kernels from nfsroot
 [ -n "$kremove" ] && {
     echo "Removing all kernels from NFSROOT."
-    $ROOTCMD aptitude -y purge ~nlinux-image
+    LC_ALL=C $ROOTCMD apt-cache dumpavail > $NFSROOT/var/lib/dpkg/available
+    LC_ALL=C $ROOTCMD apt-get -qq purge linux-image\*
+    rm $NFSROOT/var/lib/dpkg/available
     exit
 }
 

diff --git a/conf/nfsroot.conf b/conf/nfsroot.conf
@@ -7,7 +7,7 @@ FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 NFSROOT=/srv/fai/nfsroot
 TFTPROOT=/srv/tftp/fai
 NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
-FAI_DEBOOTSTRAP_OPTS="--exclude=wget --include=aptitude"
+FAI_DEBOOTSTRAP_OPTS="--exclude=wget"
 
 # Configuration space
 FAI_CONFIGDIR=/srv/fai/config
diff --git a/debian/control b/debian/control
@@ -43,7 +43,7 @@ Package: fai-server
 Architecture: all
 Depends: fai-client, debootstrap, xz-utils, ${misc:Depends}
 Recommends: nfs-kernel-server, isc-dhcp-server, tftpd-hpa | atftpd, openssh-server, openssh-client, openbsd-inetd | inet-superserver, libproc-daemon-perl
-Suggests: debmirror, reprepro, xorriso, squashfs-tools, binutils, grub2, aptitude, perl-tk, qemu-utils, fai-setup-storage
+Suggests: debmirror, reprepro, xorriso, squashfs-tools, binutils, grub2, perl-tk, qemu-utils, fai-setup-storage
 Description: Fully Automatic Installation server package
  FAI is a non-interactive system to install, customize and manage
  Linux systems and software configurations on computers as well as

diff --git a/examples/simple/basefiles/mk-basefile b/examples/simple/basefiles/mk-basefile
@@ -34,8 +34,8 @@ EXCLUDE_SID=tasksel,tasksel-data
 EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
 EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data
 
-# we need aptitude in the base file, since users may want to use it for installing packages
-INCLUDE_DEBIAN=aptitude
+# here you can add packages, that are needed very early
+INCLUDE_DEBIAN=
 
 
 setarch() {

diff --git a/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER b/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER
@@ -7,7 +7,7 @@ FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 NFSROOT=/srv/fai/nfsroot
 TFTPROOT=/srv/tftp/fai
 NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
-FAI_DEBOOTSTRAP_OPTS="--exclude=info --include=aptitude"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info"
 
 # Configuration space
 FAI_CONFIGDIR=/srv/fai/config

diff --git a/man/fai-make-nfsroot.8 b/man/fai-make-nfsroot.8
@@ -61,8 +61,7 @@ Create a generic nfsroot. Remove most install server specific data from
 nfsroot. See also -a.
 .TP
 .B \-K
-Remove all kernels from NFSROOT. This is the same as calling aptitude
-purge ~nlinux-image inside the nfsroot.
+Remove all kernels from NFSROOT.
 .TP
 .B \-k
 Install additional packages defined in /etc/fai/NFSROOT into the