PR#210: f26: pull forward some patches net device naming for atomic - fedora-kickstarts

		`@@ -10,7 +10,7 @@`
		`part /boot/fw --size=30 --fstype vfat --asprimary`
		`part /boot --size=512 --fstype ext4 --asprimary`
		`part swap --size=512 --fstype swap --asprimary`
		`- part / --size=3584 --fstype ext4 --asprimary`
		`+ part / --size=2800 --fstype ext4 --asprimary`

		`# make sure that initial-setup runs and lets us do all the configuration bits`
		`firstboot --reconfig`
		`@@ -23,10 +23,11 @@`
		`@core`
		`@standard`
		`@hardware-support`
		`- @dial-up`

		`kernel`
		`+ # remove this in %post`
		`dracut-config-generic`
		`+ -dracut-config-rescue`
		`# install tools needed to manage and boot arm systems`
		`@arm-tools`
		`rng-tools`
		`@@ -35,12 +36,12 @@`
		`bcm283x-firmware`
		`initial-setup`
		`initial-setup-gui`
		`+ -iwl*`
		`+ -ipw*`
		`+ -trousers-lib`
		`#lets resize / on first boot`
		`# dracut-modules-growroot`

		`- # remove this in %post`
		`- dracut-config-generic`
		`-`
		`# make sure all the locales are available for inital0-setup and anaconda to work`
		`glibc-all-langpacks`

fedora-arm-kde.ks

file modified

-3

		`@@ -5,8 +5,5 @@`
		`part / --size=5690 --fstype ext4`

		`%post`
		`- echo -n "Enabling initial-setup gui mode on startup"`
		`- ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service`
		`- echo .`

		`%end`

fedora-arm-lxde.ks

file modified

-3

		`@@ -3,8 +3,5 @@`
		`%include fedora-lxde-common.ks`

		`%post`
		`- echo -n "Enabling initial-setup gui mode on startup"`
		`- ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service`
		`- echo .`

		`%end`

fedora-arm-mate.ks

file modified

-3

		`@@ -5,8 +5,5 @@`
		`part / --size=5500 --fstype ext4`

		`%post`
		`- echo -n "Enabling initial-setup gui mode on startup"`
		`- ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service`
		`- echo .`

		`%end`

fedora-arm-minimal.ks

file modified

+2 -23

		`@@ -1,27 +1,6 @@`
		`%include fedora-arm-base.ks`
		`+ %include fedora-minimal-common.ks`

		`part /boot --size=512 --fstype ext4`
		`part swap --size=256 --fstype swap`
		`- part / --size=1279 --fstype ext4`
		`-`
		`- %packages`
		`- -@standard`
		`- -@dial-up`
		`- -initial-setup-gui`
		`- -generic-release*`
		`- -glibc-all-langpacks`
		`- glibc-langpack-en`
		`- iw`
		`- NetworkManager-wifi`
		`- %end`
		`-`
		`- %post`
		`-`
		`- # setup systemd to boot to the right runlevel`
		`- echo -n "Setting default runlevel to multiuser text mode"`
		`- rm -f /etc/systemd/system/default.target`
		`- ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target`
		`- echo .`
		`-`
		`- %end`
		`-`
		`+ part / --size=1200 --fstype ext4`

fedora-arm-server.ks

file modified

+1 -2

		`@@ -1,10 +1,9 @@`
		`%include fedora-arm-base.ks`

		`# server defaults to xfs for / so lets do so on arm also`
		`- part / --size=3000 --fstype xfs`
		`+ part / --size=2500 --fstype xfs`

		`%packages`
		`- -@dial-up`
		`# install the default groups for the server evironment since installing the environment is not working`
		`@server-product`
		`@standard`

fedora-arm-soas.ks

file modified

-3

		`@@ -3,8 +3,5 @@`
		`%include fedora-soas-common.ks`

		`%post`
		`- echo -n "Enabling initial-setup gui mode on startup"`
		`- ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service`
		`- echo .`

		`%end`

fedora-arm-xbase.ks

file modified

		`@@ -10,4 +10,7 @@`
		`# Most of the ARM X accelerated drivers need some level of CMA allocation`
		`sed -i 's/$append .*$/\1 cma=192MB/' /boot/extlinux/extlinux.conf`

		`+ # Explicitly set graphical.target as default as this is how initial-setup detects which version to run`
		`+ ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target`
		`+`
		`%end`

fedora-arm-xfce.ks

file modified

-3

		`@@ -5,8 +5,5 @@`
		`part / --size=4000 --fstype ext4`

		`%post`
		`- echo -n "Enabling initial-setup gui mode on startup"`
		`- ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service`
		`- echo .`

		`%end`

fedora-atomic.ks

file modified

+16 -4

		`@@ -18,7 +18,7 @@`

		`firewall --disabled`

		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`
		`+ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"`

		`network --bootproto=dhcp --device=link --activate --onboot=on`
		`services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final`
		`@@ -32,14 +32,17 @@`
		`logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos`

		`# Equivalent of %include fedora-repo.ks`
		`- ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host`
		`+ ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/26/ --ref=fedora/26/x86_64/atomic-host`

		`reboot`

		`%post --erroronfail`
		`# See https://github.com/projectatomic/rpm-ostree/issues/42`
		`+ # we only need this for before f26 release where we are using a`
		`+ # temporary "dev" repo url above. We want to change the remote`
		`+ # we use to match where the repo will live for the entirety of f26.`
		`ostree remote delete fedora-atomic`
		`- ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'`
		`+ ostree remote add --set=gpg-verify=false fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/26/'`

		`# older versions of livecd-tools do not follow "rootpw --lock" line above`
		`# https://bugzilla.redhat.com/show_bug.cgi?id=964299`
		`@@ -52,7 +55,7 @@`

		`# Configure docker-storage-setup to resize the partition table on boot`
		`# https://github.com/projectatomic/docker-storage-setup/pull/25`
		`- echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup`
		`+ echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup`

		`echo -n "Getty fixes"`
		`# although we want console output going to the serial console, we don't`
		`@@ -124,6 +127,9 @@`
		`rm -f /var/tmp/zeros`
		`echo "(Don't worry -- that out-of-space error was expected.)"`

		`+ # For trac ticket https://pagure.io/atomic-wg/issue/128`
		`+ rm -f /etc/sysconfig/network-scripts/ifcfg-ens3`
		`+`
		`echo "Adding Developer Mode GRUB2 menu item."`
		`/usr/libexec/atomic-devmode/bootentry add`

		`@@ -131,4 +137,10 @@`
		`# fails due to RHBZ #1369794`
		`/sbin/chkconfig network off`

		`+ # Anaconda is writing an /etc/resolv.conf from the install environment.`
		`+ # The system should start out with an empty file, otherwise cloud-init`
		`+ # will try to use this information and may error:`
		`+ # https://bugs.launchpad.net/cloud-init/+bug/1670052`
		`+ truncate -s 0 /etc/resolv.conf`
		`+`
		`%end`

fedora-cinnamon-common.ks

file modified

+1 -4

		`@@ -23,12 +23,9 @@`

		`# make sure we have a graphical installer`
		`gnome-software # for update-notification`
		`- dnfdragora # for graphical (GTK and ncurses) package-management`
		`- libyui-mga-gtk # GTK3-frontend for dnfdragora (graphical use)`
		`- libyui-mga-ncurses # Ncurses-frontend for dnfdragora (text-mode use)`

		`# extra backgrounds`
		`desktop-backgrounds-basic`
		`- f25-backgrounds-extras-gnome`
		`+ f26-backgrounds-extras-gnome`

		`%end`

fedora-cloud-base-arm.ks

file removed

-12

		`@@ -1,12 +0,0 @@`
		`- %include fedora-cloud-base.ks`
		`-`
		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"`
		`-`
		`- part /boot --fstype="ext4" --size=500`
		`- part /boot/efi --fstype="vfat" --size=100`
		`-`
		`- %packages`
		`- efibootmgr`
		`- grub2-efi`
		`- shim`
		`- %end`

fedora-cloud-base-ppc.ks

file removed

-10

		`@@ -1,10 +0,0 @@`
		`- %include fedora-cloud-base.ks`
		`-`
		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`
		`-`
		`- part prepboot --fstype="prepboot" --size=4`
		`- part /boot --fstype="ext4" --size=500`
		`-`
		`- %packages`
		`- grub2`
		`- %end`

fedora-cloud-base-vagrant.ks

file modified

+1 -1

		`@@ -19,7 +19,7 @@`
		`# even on VirtualBox virt, we get a primary network device with "eth0" as the name`
		`# This simplifies things and allows a single disk image for both supported Vagrant`
		`# platforms (virtualbox and kvm)`
		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux`
		`+ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"`

		`%packages`
		`# The default koji Vagrantfile configuration uses rsync to sync files between`

fedora-cloud-base.ks

file modified

+13 -25

		`@@ -1,10 +1,10 @@`
		`- # This is a basic Fedora 21 spin designed to work in OpenStack and other`
		`+ # This is a basic Fedora cloud spin designed to work in OpenStack and other`
		`# private cloud environments. It's configured with cloud-init so it will`
		`# take advantage of ec2-compatible metadata services for provisioning ssh`
		`# keys. Cloud-init creates a user account named "fedora" with passwordless`
		`# sudo access. The root password is empty and locked by default.`
		`#`
		`- # Note that unlike the standard F20 install, this image has /tmp on disk`
		`+ # Note that unlike the standard Fedora install, this image has /tmp on disk`
		`# rather than in tmpfs, since memory is usually at a premium.`
		`#`
		`# This kickstart file is designed to be used with ImageFactory (in Koji).`
		`@@ -36,20 +36,17 @@`

		`firewall --disabled`

		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux`
		`+ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`

		`network --bootproto=dhcp --device=link --activate --onboot=on`
		`services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final`

		`+ # boot partitions are irrelevant as none of that content is taken into the final docker image`
		`+ # We will be able to move to autopart when new pykickstart lands which adds option for noswap/noboot (fixed upstream)`
		`zerombr`
		`clearpart --all`
		`- #`
		`- # We need to disable 64bit options here or extlinux won't work.`
		`- # See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4`
		`- # and`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1369934`
		`- #`
		`- part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"`
		`+ part /boot/efi --fstype="vfat" --size=50`
		`+ part / --fstype ext4 --grow`

		`%include fedora-repo.ks`

		`@@ -88,7 +85,6 @@`
		`#-kbd`
		`-uboot-tools`
		`-kernel`
		`- -grub2`

		`%end`

		`@@ -125,10 +121,6 @@`
		`# remove the user anaconda forces us to make`
		`userdel -r none`

		`- # Kickstart specifies timeout in seconds; syslinux uses 10ths.`
		`- # 0 means wait forever, so instead we'll go with 1.`
		`- sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf`
		`-`
		`# setup systemd to boot to the right runlevel`
		`echo -n "Setting default runlevel to multiuser text mode"`
		`rm -f /etc/systemd/system/default.target`
		`@@ -242,21 +234,11 @@`
		`# Note that running rpm recreates the rpm db files which aren't needed/wanted`
		`rm -f /var/lib/rpm/__db*`

		`-`
		`- # This is a temporary workaround for`
		`- # <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>`
		`- # where sfdisk seems to be messing up the mbr.`
		`- # Long-term fix is to address this in anaconda directly and remove this.`
		`- # <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>`
		`- dd if=/usr/share/syslinux/mbr.bin of=/dev/vda`
		`-`
		`# FIXME: is this still needed?`
		`echo "Fixing SELinux contexts."`
		`touch /var/log/cron`
		`touch /var/log/boot.log`
		`- chattr -i /boot/extlinux/ldlinux.sys`
		`/usr/sbin/fixfiles -R -a restore`
		`- chattr +i /boot/extlinux/ldlinux.sys`

		`echo "Zeroing out empty space."`
		`# This forces the filesystem to reclaim space from deleted files`
		`@@ -275,5 +257,11 @@`
		`rm -f /etc/machine-id`
		`touch /etc/machine-id`

		`+ # Anaconda is writing an /etc/resolv.conf from the install environment.`
		`+ # The system should start out with an empty file, otherwise cloud-init`
		`+ # will try to use this information and may error:`
		`+ # https://bugs.launchpad.net/cloud-init/+bug/1670052`
		`+ truncate -s 0 /etc/resolv.conf`
		`+`
		`%end`

fedora-cloud-bigdata.ks

file modified

+1 -7

		`@@ -23,7 +23,7 @@`

		`firewall --disabled`

		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux`
		`+ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`

		`network --bootproto=dhcp --device=eth0 --activate --onboot=on`
		`services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final`
		`@@ -97,10 +97,6 @@`
		`# remove the user anaconda forces us to make`
		`userdel -r none`

		`- # Kickstart specifies timeout in seconds; syslinux uses 10ths.`
		`- # 0 means wait forever, so instead we'll go with 1.`
		`- sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf`
		`-`
		`# setup systemd to boot to the right runlevel`
		`echo -n "Setting default runlevel to multiuser text mode"`
		`rm -f /etc/systemd/system/default.target`
		`@@ -209,9 +205,7 @@`
		`touch /var/log/cron`
		`touch /var/log/boot.log`
		`mkdir -p /var/cache/yum`
		`- chattr -i /boot/extlinux/ldlinux.sys`
		`/usr/sbin/fixfiles -R -a restore`
		`- chattr +i /boot/extlinux/ldlinux.sys`

		`echo "Zeroing out empty space."`
		`# This forces the filesystem to reclaim space from deleted files`

fedora-cloud-experimental.ks

file modified

+1 -5

		`@@ -14,7 +14,7 @@`

		`firewall --disabled`

		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux`
		`+ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`

		`network --bootproto=dhcp --device=eth0 --activate --onboot=on`
		`services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final`
		`@@ -88,10 +88,6 @@`
		`# remove the user anaconda forces us to make`
		`userdel -r none`

		`- # Kickstart specifies timeout in seconds; syslinux uses 10ths.`
		`- # 0 means wait forever, so instead we'll go with 1.`
		`- sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf`
		`-`
		`# setup systemd to boot to the right runlevel`
		`echo -n "Setting default runlevel to multiuser text mode"`
		`rm -f /etc/systemd/system/default.target`

fedora-disk-base.ks

file added

+92

		`@@ -0,0 +1,92 @@`
		`+ # 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,initial-setup`
		`+ network --bootproto=dhcp --device=link --activate`
		`+ rootpw --lock --iscrypted locked`
		`+ shutdown`
		`+`
		`+ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`
		`+`
		`+ 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`
		`+`
		`+ kernel`
		`+ # remove this in %post`
		`+ dracut-config-generic`
		`+ -dracut-config-rescue`
		`+ # install tools needed to manage and boot arm systems`
		`+ @arm-tools`
		`+ rng-tools`
		`+ chrony`
		`+ bcm283x-firmware`
		`+ uboot-images-armv8`
		`+ -uboot-images-armv7`
		`+ initial-setup`
		`+ -iwl*`
		`+ -ipw*`
		`+ -trousers-lib`
		`+ -generic-release*`
		`+`
		`+ # make sure all the locales are available for inital0-setup and anaconda to work`
		`+ glibc-all-langpacks`
		`+`
		`+ # workaround for consequence of RHBZ #1324623: without this, with`
		`+ # yum-based creation tools, compose fails due to conflict between`
		`+ # libcrypt and libcrypt-nss. dnf does not seem to have the same`
		`+ # issue, so this may be dropped when appliance-creator is ported`
		`+ # to dnf.`
		`+ libcrypt-nss`
		`+ -libcrypt`
		`+ %end`
		`+`
		`+ %post`
		`+`
		`+ # Setup Raspberry Pi firmware`
		`+ cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/`
		`+ 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`
		`+`
		`+ 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`

fedora-disk-minimal.ks

file added

		`@@ -0,0 +1,4 @@`
		`+ %include fedora-disk-base.ks`
		`+ %include fedora-minimal-common.ks`
		`+`
		`+ autopart --type=plain`

fedora-disk-server.ks

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ %include fedora-disk-base.ks`
		`+`
		`+ autopart`
		`+`
		`+ %packages`
		`+ # install the default groups for the server evironment since installing the environment is not working`
		`+ @server-product`
		`+ @standard`
		`+ @headless-management`
		`+ @container-management`
		`+ @domain-client`
		`+ -initial-setup-gui`
		`+ -generic-release*`
		`+ %end`
		`+`
		`+ %post`
		`+`
		`+ # setup systemd to boot to the right runlevel`
		`+ echo -n "Setting default runlevel to multiuser text mode"`
		`+ rm -f /etc/systemd/system/default.target`
		`+ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target`
		`+ echo .`
		`+`
		`+ %end`
		`+`

fedora-disk-workstation.ks

file added

+17

		`@@ -0,0 +1,17 @@`
		`+ %include fedora-disk-base.ks`
		`+ %include fedora-disk-xbase.ks`
		`+ %include fedora-workstation-common.ks`
		`+`
		`+ bootloader --append="cma=256MB"`
		`+`
		`+ autopart --type=plain`
		`+`
		`+ %packages`
		`+ -initial-setup`
		`+ -initial-setup-gui`
		`+`
		`+ %end`
		`+`
		`+ %post`
		`+`
		`+ %end`

fedora-disk-xbase.ks

file added

+21

		`@@ -0,0 +1,21 @@`
		`+ %packages`
		`+ @base-x`
		`+ @fonts`
		`+ @input-methods`
		`+ @multimedia`
		`+ @printing`
		`+ -@guest-desktop-agents`
		`+`
		`+ # Need aajohan-comfortaa-fonts for the SVG rnotes images`
		`+ aajohan-comfortaa-fonts`
		`+`
		`+ # anaconda needs the locales available to run for different locales`
		`+ glibc-all-langpacks`
		`+`
		`+ %end`
		`+`
		`+ %post`
		`+ # Explicitly set graphical.target as default as this is how initial-setup detects which version to run`
		`+ ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target`
		`+`
		`+ %end`

fedora-docker-base-arm.ks

file removed

-6

		`@@ -1,6 +0,0 @@`
		`- %include fedora-docker-base.ks`
		`-`
		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`
		`-`
		`- part /boot --fstype="ext4" --size=500`
		`- part /boot/efi --fstype="vfat" --size=100`

fedora-docker-base-minimal.ks

file modified

+6 -55

		`@@ -1,64 +1,15 @@`
		`- # This is a minimal Fedora install designed to serve as a Docker base image.`
		`- #`
		`- # To keep this image minimal it only installs English language. You need to change`
		`- # dnf configuration in order to enable other languages.`
		`- #`
		`- ### Hacking on this image ###`
		`- # This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),`
		`- # but you can run imagefactory locally too.`
		`- #`
		`- # To do so, testing local changes, first you'll need a TDL file. I store one here:`
		`- # https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl`
		`- #`
		`- # Then, once you have imagefactory and imagefactory-plugins installed, run:`
		`- #`
		`- # imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker`
		`- #`
		`-`
		`- text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931`
		`- bootloader --disabled`
		`- timezone --isUtc --nontp Etc/UTC`
		`- rootpw --lock --iscrypted locked`
		`-`
		`- keyboard us`
		`- zerombr`
		`- clearpart --all`
		`- part / --fstype ext4 --grow`
		`- network --bootproto=dhcp --device=link --activate --onboot=on`
		`- reboot`
		`+ # See docker-base-common.ks for details on how to hack on docker image kickstarts`
		`+ # This base is a stripped back Fedora image without python3/dnf.`
		`+ # If you need that use the standard base image.`
		`+`
		`+ %include fedora-docker-common.ks`

		`%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps`
		`- bash`
		`- fedora-release`
		`microdnf`
		`- -kernel`
		`- -e2fsprogs`
		`- -libss # used by e2fsprogs`
		`- -fuse-libs`
		`-`

		`%end`

		`%post --erroronfail --log=/root/anaconda-post.log`
		`- set -eux`
		`-`
		`- # Set install langs macro so that new rpms that get installed will`
		`- # only install langs that we limit it to.`
		`- LANG="en_US"`
		`- echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf`
		`-`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1400682`
		`- echo "Import RPM GPG key"`
		`- releasever=$(rpm -q --qf '%{version}\n' fedora-release)`
		`- basearch=$(uname -i)`
		`- rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch`
		`-`
		`- echo "# fstab intentionally empty for containers" > /etc/fstab`
		`-`
		`- # Remove machine-id on pre generated images`
		`- rm -fv /etc/machine-id`
		`- touch /etc/machine-id`
		`-`
		`# remove some random help txt files`
		`rm -fv usr/share/gnupg/help*.txt`

		`@@ -88,7 +39,7 @@`
		`rm -rfv /usr/share/zoneinfo`

		`# Final pruning`
		`- rm -rfv var/cache/* var/log/* tmp/*`
		`+ rm -rfv /var/cache/* /var/log/* /tmp/*`

		`%end`

fedora-docker-base-ppc.ks

file removed

-5

		`@@ -1,5 +0,0 @@`
		`- %include fedora-docker-base.ks`
		`-`
		`- bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"`
		`-`
		`- part prepboot --fstype="prepboot" --size=4`

fedora-docker-base.ks

file modified

+4 -51

		`@@ -1,62 +1,19 @@`
		`- # This is a minimal Fedora install designed to serve as a Docker base image.`
		`- #`
		`- # To keep this image minimal it only installs English language. You need to change`
		`- # dnf configuration in order to enable other languages.`
		`- #`
		`- ### Hacking on this image ###`
		`- # This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),`
		`- # but you can run imagefactory locally too.`
		`- #`
		`- # To do so, testing local changes, first you'll need a TDL file. I store one here:`
		`- # https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl`
		`- #`
		`- # Then, once you have imagefactory and imagefactory-plugins installed, run:`
		`- #`
		`- # imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker`
		`- #`
		`+ # See docker-base-common.ks for details on how to hack on docker image kickstarts`
		`+ # This base is a standard Fedora image with python3 and dnf`

		`- text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931`
		`- bootloader --disabled`
		`- timezone --isUtc --nontp Etc/UTC`
		`- rootpw --lock --iscrypted locked`
		`-`
		`- keyboard us`
		`- zerombr`
		`- clearpart --all`
		`- part / --fstype ext4 --grow`
		`- network --bootproto=dhcp --device=link --activate --onboot=on`
		`- reboot`
		`+ %include fedora-docker-common.ks`

		`%packages --excludedocs --instLangs=en --nocore`
		`- bash`
		`- tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920`
		`- fedora-release`
		`rootfiles`
		`+ tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920`
		`vim-minimal`
		`dnf`
		`dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29`
		`sssd-client`
		`- #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740`
		`- -kernel`
		`-`

		`%end`

		`%post --erroronfail --log=/root/anaconda-post.log`
		`- set -eux`
		`-`
		`- # Set install langs macro so that new rpms that get installed will`
		`- # only install langs that we limit it to.`
		`- LANG="en_US"`
		`- echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf`
		`-`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1400682`
		`- echo "Import RPM GPG key"`
		`- releasever=$(rpm -q --qf '%{version}\n' fedora-release)`
		`- basearch=$(uname -i)`
		`- rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch`
		`-`
		`- echo "# fstab intentionally empty for containers" > /etc/fstab`

		`# remove some extraneous files`
		`rm -rf /var/cache/dnf/*`
		`@@ -72,8 +29,4 @@`
		`umount /run`
		`systemd-tmpfiles --create --boot`

		`- # Remove machine-id on pre generated images`
		`- rm -f /etc/machine-id`
		`- touch /etc/machine-id`
		`-`
		`%end`

fedora-docker-common.ks

file added

+70

		`@@ -0,0 +1,70 @@`
		`+ # This is the common bits between Fedora Docker base image.`
		`+ #`
		`+ # To keep this image minimal it only installs English language. You need to change`
		`+ # dnf configuration in order to enable other languages.`
		`+ #`
		`+ # ## Hacking on this image ###`
		`+ # This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),`
		`+ # but you can run imagefactory locally too.`
		`+ #`
		`+ # To do so, testing local changes, first you'll need a TDL file. I store one here:`
		`+ # https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl`
		`+ #`
		`+ # Then, once you have imagefactory and imagefactory-plugins installed, run:`
		`+ #`
		`+ # ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks`
		`+ # imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base-test.ks docker`
		`+ #`
		`+`
		`+ text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931`
		`+ bootloader --disabled`
		`+ timezone --isUtc --nontp Etc/UTC`
		`+ rootpw --lock --iscrypted locked`
		`+ keyboard us`
		`+ network --bootproto=dhcp --device=link --activate --onboot=on`
		`+ reboot`
		`+`
		`+ # boot partitions are irrelevant as none of that content is taken into the final docker image`
		`+ # We will be able to move to autopart when new pykickstart lands which adds option for noswap/noboot (fixed upstream)`
		`+ zerombr`
		`+ clearpart --all`
		`+ part /boot/efi --fstype="vfat" --size=100`
		`+ part / --fstype ext4 --grow`
		`+`
		`+ %packages --excludedocs --instLangs=en --nocore`
		`+ fedora-release`
		`+ bash`
		`+ -kernel`
		`+ -dosfstools`
		`+ -e2fsprogs`
		`+ -fuse-libs`
		`+ -gnupg2-smime`
		`+ -libss # used by e2fsprogs`
		`+ -libusbx`
		`+ -pinentry`
		`+ -shared-mime-info`
		`+ -trousers`
		`+ -xkeyboard-config`
		`+`
		`+ %end`
		`+`
		`+ %post --erroronfail --log=/root/anaconda-post.log`
		`+ set -eux`
		`+`
		`+ # Set install langs macro so that new rpms that get installed will`
		`+ # only install langs that we limit it to.`
		`+ LANG="en_US"`
		`+ echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf`
		`+`
		`+ # https://bugzilla.redhat.com/show_bug.cgi?id=1400682`
		`+ echo "Import RPM GPG key"`
		`+ releasever=$(rpm -q --qf '%{version}\n' fedora-release)`
		`+ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary`
		`+`
		`+ echo "# fstab intentionally empty for containers" > /etc/fstab`
		`+`
		`+ # Remove machine-id on pre generated images`
		`+ rm -f /etc/machine-id`
		`+ touch /etc/machine-id`
		`+`
		`+ %end`

fedora-live-design_suite.ks

file modified

+2 -2

		`@@ -49,8 +49,8 @@`
		`gnome-photos`

		`# Extra wallpapers`
		`- f25-backgrounds-extras-base`
		`- f25-backgrounds-extras-gnome`
		`+ f26-backgrounds-extras-base`
		`+ f26-backgrounds-extras-gnome`


		`# removal of unneeded applications`

fedora-live-workstation.ks

file modified

+5 -1

		`@@ -4,7 +4,11 @@`

		`%include fedora-live-base.ks`
		`%include fedora-workstation-common.ks`
		`- %include snippets/packagekit-cached-metadata.ks`
		`+ #`
		`+ # Disable this for now as packagekit is causing compose failures`
		`+ # by leaving a gpg-agent around holding /dev/null open.`
		`+ #`
		`+ #include snippets/packagekit-cached-metadata.ks`

		`part / --size 6656`

fedora-lxqt-common.ks

file modified

+5 -4

		`@@ -26,7 +26,7 @@`
		`-qupzilla-kwallet`

		`# Pull in some useful applications, use KDE ones if necessary`
		`- dnfdragora`
		`+ dnfdragora-gui`
		`dragon`
		`kcalc`
		`kwrite`
		`@@ -51,9 +51,6 @@`
		`# MP3`
		`gstreamer1-plugin-mpg123`

		`- # We want Qt GUI for libyui used by dnfdragora`
		`- libyui-mga-qt`
		`-`
		`# remove unneeded stuff to get a lightweight system`
		`# fonts (we make no bones about admitting we're english-only)`
		`wqy-microhei-fonts # a compact CJK font, to replace:`
		`@@ -72,5 +69,9 @@`
		`-ibus*`
		`-iok`

		`+ # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132`
		`+ # Why is this not pulled in by anaconda???`
		`+ storaged`
		`+`
		`%end`

fedora-mate-common.ks

file modified

-5

		`@@ -23,11 +23,6 @@`
		`caja-actions`
		`mate-disk-usage-analyzer`

		`- # more backgrounds`
		`- f25-backgrounds-base`
		`- f25-backgrounds-mate`
		`- f25-backgrounds-extras-base`
		`-`
		`# system tools`
		`system-config-printer`
		`system-config-printer-applet`

fedora-minimal-common.ks

file added

+19

		`@@ -0,0 +1,19 @@`
		`+ %packages`
		`+ -@standard`
		`+ -initial-setup-gui`
		`+ -generic-release*`
		`+ -glibc-all-langpacks`
		`+ glibc-langpack-en`
		`+ iw`
		`+ NetworkManager-wifi`
		`+ %end`
		`+`
		`+ %post`
		`+`
		`+ # setup systemd to boot to the right runlevel`
		`+ echo -n "Setting default runlevel to multiuser text mode"`
		`+ rm -f /etc/systemd/system/default.target`
		`+ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target`
		`+ echo .`
		`+`
		`+ %end`

fedora-python-classroom-common.ks

file modified

		`@@ -6,6 +6,11 @@`

		`%packages`
		`@python-classroom`
		`+ @python-science`
		`+ nano`
		`+ openssh-clients`
		`+ vim-enhanced`
		`+ wget`

		`# Remove Pythons possibly recommended by tox`
		`-python26`

fedora-python-classroom-gnome-common.ks

file modified

+5 -1

		`@@ -7,6 +7,11 @@`
		`%include fedora-python-classroom-common.ks`

		`%packages`
		`+ ninja-ide`
		`+ emacs`
		`+ python3-matplotlib-tk`
		`+ python3-pillow-tk`
		`+`
		`# Remove extra gnome-y things`
		`-@graphical-internet`
		`-@games`
		`@@ -51,7 +56,6 @@`

		`# Dictionaries are big`
		`-aspell-*`
		`- -hunspell-*`
		`-words`

		`# Help and art can be big, too`

fedora-repo.ks

file modified

+2 -2

		`@@ -3,7 +3,7 @@`
		`# Exactly one of the following should be uncommented`

		`# For the master branch the following should be uncommented`
		`- %include fedora-repo-rawhide.ks`
		`+ # %include fedora-repo-rawhide.ks`

		`# For non-master branches the following should be uncommented`
		`- # %include fedora-repo-not-rawhide.ks`
		`+ %include fedora-repo-not-rawhide.ks`

l10n/fedora-livecd-cinnamon-de_DE.ks

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # fedora-livecd-cinnamon-de_DE.ks`
		`+ #`
		`+ # Description:`
		`+ # - German Fedora Live Spin with the Cinnamon Desktop Environment`
		`+ #`
		`+ # Maintainer(s):`
		`+ # - Björn Esser <besser82@fedoraproject.org>`
		`+`
		`+ %include ../fedora-live-cinnamon.ks`
		`+`
		`+ lang de_DE.UTF-8`
		`+ keyboard de-latin1-nodeadkeys`
		`+ timezone Europe/Berlin`
		`+`
		`+ %packages`
		`+ @german-support`
		`+ # exclude input methods`
		`+ -m17n*`
		`+ -scim*`
		`+ %end`

dustymabe commented 8 years ago

same patches that were just merged to master

Metadata

Assignee

None

Tags

No Tags

Changes Summary 36

fedora-arm-minimal.ks

fedora-cinnamon-common.ks

-12

file removed

fedora-cloud-base-arm.ks

-10

file removed

fedora-cloud-base-ppc.ks

+1 -1

file changed

fedora-cloud-base-vagrant.ks

fedora-cloud-bigdata.ks

+1 -5

file changed

fedora-cloud-experimental.ks

+92

file added

fedora-disk-base.ks

file added

fedora-disk-minimal.ks

+25

file added

fedora-disk-server.ks

+17

file added

fedora-disk-workstation.ks

+21

file added

fedora-disk-xbase.ks

-6

file removed

fedora-docker-base-arm.ks

+6 -55

file changed

fedora-docker-base-minimal.ks

-5

file removed

fedora-docker-base-ppc.ks

+4 -51

file changed

fedora-docker-base.ks

+70

file added

fedora-docker-common.ks

+2 -2

file changed

fedora-live-design_suite.ks

+5 -1

file changed

fedora-live-workstation.ks

+5 -4

file changed

fedora-lxqt-common.ks

+0 -5

file changed

fedora-mate-common.ks

+19

file added

fedora-minimal-common.ks

+5 -0

file changed

fedora-python-classroom-common.ks

+5 -1

file changed

fedora-python-classroom-gnome-common.ks

file added

l10n/fedora-livecd-cinnamon-de_DE.ks

		`@@ -10,4 +10,7 @@`
		`# Most of the ARM X accelerated drivers need some level of CMA allocation`
		`sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf`

		`+ # Explicitly set graphical.target as default as this is how initial-setup detects which version to run`
		`+ ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target`
		`+`
		`%end`

fedora-kickstarts

Source Code

#210 f26: pull forward some patches net device naming for atomic Closed 8 years ago by dustymabe. Opened 8 years ago by dustymabe. dustymabe/fedora-kickstarts dusty-fix-net-f26 into master

Metadata

Changes Summary 36

#210 f26: pull forward some patches net device naming for atomic

Closed 8 years ago by dustymabe. Opened 8 years ago by dustymabe.

dustymabe/fedora-kickstarts dusty-fix-net-f26 into master