255b48f233
These are aiming to leave some weak dependencies out of minimal images, it seems. From @core, gnutls recommends trousers which requires trousers-lib, and iproute recommends iproute-tc. However, both are *hard* dependencies of things that include fedora-disk-base.ks. fedora-disk-workstation.ks includes fedora-disk.base.ks and fedora-workstation-common.ks, so it installs the Workstation package set, from which gnome-boxes ultimately requires iproute-tc and NetworkManager-openconnect ultimately requires trousers-lib. Prior to the change I recently got merged into DNF, DNF would silently drop gnome-boxes and NetworkManager-openconnect from the Workstation disk image because of this. With the change, it errors out on creation of the image. To make the image compose again and actually include the right packages, let's move the exclusions to fedora-minimal-common.ks, where they make more sense anyway. This does mean the packages will be pulled into other non-minimal images even if they're not strictly required there, but that doesn't seem like a big problem. Signed-off-by: Adam Williamson <awilliam@redhat.com>
89 lines
2.1 KiB
Plaintext
89 lines
2.1 KiB
Plaintext
# fedora-disk-base.ks
|
|
#
|
|
# Defines the basics for all kickstarts in the fedora-live branch
|
|
# Does not include package selection (other then mandatory)
|
|
# Does not include localization packages or configuration
|
|
#
|
|
# Does includes "default" language configuration (kickstarts including
|
|
# this template can override these settings)
|
|
|
|
text
|
|
lang en_US.UTF-8
|
|
keyboard us
|
|
timezone US/Eastern
|
|
auth --useshadow --passalgo=sha512
|
|
selinux --enforcing
|
|
firewall --enabled --service=mdns
|
|
services --enabled=sshd,NetworkManager,chronyd,zram-swap
|
|
network --bootproto=dhcp --device=link --activate
|
|
rootpw --lock --iscrypted locked
|
|
shutdown
|
|
|
|
bootloader --timeout=1
|
|
|
|
zerombr
|
|
clearpart --all --initlabel --disklabel=msdos
|
|
|
|
# make sure that initial-setup runs and lets us do all the configuration bits
|
|
firstboot --reconfig
|
|
|
|
%include fedora-repo.ks
|
|
|
|
%packages
|
|
@core
|
|
@standard
|
|
@hardware-support
|
|
zram
|
|
|
|
kernel
|
|
# remove this in %post
|
|
dracut-config-generic
|
|
-dracut-config-rescue
|
|
# install tools needed to manage and boot arm systems
|
|
@arm-tools
|
|
-uboot-images-armv7
|
|
rng-tools
|
|
chrony
|
|
bcm283x-firmware
|
|
initial-setup
|
|
# Intel wireless firmware assumed never of use for disk images
|
|
-iwl*
|
|
-ipw*
|
|
-usb_modeswitch
|
|
-generic-release*
|
|
|
|
# make sure all the locales are available for inital0-setup and anaconda to work
|
|
glibc-all-langpacks
|
|
|
|
%end
|
|
|
|
%post
|
|
|
|
# Setup Raspberry Pi firmware
|
|
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
|
|
|
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
|
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
|
echo "Packages within this disk image"
|
|
rpm -qa
|
|
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
|
rm -f /var/lib/rpm/__db*
|
|
|
|
# remove random seed, the newly installed instance should make it's own
|
|
rm -f /var/lib/systemd/random-seed
|
|
|
|
# The enp1s0 interface is a left over from the imagefactory install, clean this up
|
|
rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
|
|
|
|
dnf -y remove dracut-config-generic
|
|
|
|
# Disable network service here, as doing it in the services line
|
|
# fails due to RHBZ #1369794
|
|
/sbin/chkconfig network off
|
|
|
|
# Remove machine-id on pre generated images
|
|
rm -f /etc/machine-id
|
|
touch /etc/machine-id
|
|
|
|
%end
|