From 7f13b20e332d7bb72198f460b8ab7136f98fffec Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 12 Apr 2016 15:43:09 +0100
Subject: [PATCH] Docker: Base: add arm config, use includes for ppc config

---
 fedora-docker-base-arm.ks |  6 +++
 fedora-docker-base-ppc.ks | 88 +--------------------------------------
 fedora-docker-base.ks     |  2 +-
 3 files changed, 9 insertions(+), 87 deletions(-)
 create mode 100644 fedora-docker-base-arm.ks

diff --git a/fedora-docker-base-arm.ks b/fedora-docker-base-arm.ks
new file mode 100644
index 0000000..4e8539c
--- /dev/null
+++ b/fedora-docker-base-arm.ks
@@ -0,0 +1,6 @@
+%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
diff --git a/fedora-docker-base-ppc.ks b/fedora-docker-base-ppc.ks
index 587765f..0864ded 100644
--- a/fedora-docker-base-ppc.ks
+++ b/fedora-docker-base-ppc.ks
@@ -1,89 +1,5 @@
-# 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
-# yum 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
-#
+%include fedora-docker-base.ks
 
-cmdline
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
-keyboard us
-zerombr
-clearpart --all
 part prepboot --fstype="prepboot" --size=4
-part / --size 3000 --fstype ext4
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-%packages --excludedocs --instLangs=en --nocore
-bash
-fedora-release
-rootfiles
-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 --log=/tmp/anaconda-post.log
-# Set the language rpm nodocs transaction flag persistently in the
-# image yum.conf and rpm macros
-
-# remove the user anaconda forces us to make
-userdel -r none
-
-LANG="en_US"
-echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
-
-# Carry these configs for both dnf and yum for users who are calling
-# yum-deprecated directly. This will keep the experience between both
-# consistent
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
-
-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
-
-rm -f /usr/lib/locale/locale-archive
-
-#Setup locale properly
-localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
-
-rm -rf /var/cache/yum/*
-rm -f /tmp/ks-script*
-
-#Make it easier for systemd to run in Docker container
-cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
-sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
-
-#Mask mount units and getty service so that we don't get login prompt
-systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
-
-rm -f /etc/machine-id
-
-%end
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 4990a43..6b1ea77 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -24,7 +24,7 @@ user --name=none
 keyboard us
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --fstype ext4 --grow
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot