From 622e15c85a10fac4482b38059465fc14e6a9f38a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 20 Feb 2020 10:00:53 -0800 Subject: [PATCH] lorax: Add eject back into the boot.iso The eject utility moved into util-linux and the package was dropped, but since the runtime-cleanup template is using `removefrom util-linux --allbut` it was never added to the boot.iso after the move. This removes the package request for eject and adds it to the list of binaries to keep from util-linux. --- share/templates.d/99-generic/runtime-cleanup.tmpl | 2 +- share/templates.d/99-generic/runtime-install.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl index 9784667f..02b7f31a 100644 --- a/share/templates.d/99-generic/runtime-cleanup.tmpl +++ b/share/templates.d/99-generic/runtime-cleanup.tmpl @@ -311,7 +311,7 @@ removefrom sysvinit-tools /usr/bin/* removefrom tar /usr/share/locale/* removefrom usbutils /usr/bin/* removefrom util-linux --allbut \ - /usr/bin/{dmesg,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ + /usr/bin/{dmesg,eject,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ /etc/mtab /etc/pam.d/login /etc/pam.d/remote \ /usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup,zramctl} \ /usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \ diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl index ae9fad87..792cf700 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -174,7 +174,7 @@ installpkg fpaste installpkg python3-pyatspi ## extra tools not required by anaconda -installpkg vim-minimal strace lsof dump xz less eject +installpkg vim-minimal strace lsof dump xz less installpkg wget rsync bind-utils ftp mtr vconfig installpkg icfg spice-vdagent installpkg gdisk hexedit sg3_utils