[spin-kickstarts/f24] design-suite: add geeqie
by Luya Tshimbalanga
commit 1016065d6b175ba2bb5579747759ba0cf007f49c
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Thu Apr 21 01:40:27 2016 -0700
design-suite: add geeqie
fedora-live-design_suite.ks | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index f29bbba..b95495f 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -19,6 +19,9 @@ part / --size 14336
# Preview Gnome Photos
gnome-photos
+# Add Geeqie for renaming group files
+geeqie
+
# Extra wallpapers
f23-backgrounds-extras-base
f23-backgrounds-extras-gnome
8 years
[spin-kickstarts] design-suite: add geeqie
by Luya Tshimbalanga
commit e91cf35a69476f8c3e7d87b4874dc6609caaa24d
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Thu Apr 21 01:40:27 2016 -0700
design-suite: add geeqie
fedora-live-design_suite.ks | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index f29bbba..b95495f 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -19,6 +19,9 @@ part / --size 14336
# Preview Gnome Photos
gnome-photos
+# Add Geeqie for renaming group files
+geeqie
+
# Extra wallpapers
f23-backgrounds-extras-base
f23-backgrounds-extras-gnome
8 years
[spin-kickstarts/f24] Pulls in the systemd-udev subpackage
by Kushal Das
commit 8c2a31f3789d8dc398d1fb3948657f2556dbe2e3
Author: Kushal Das <mail(a)kushaldas.in>
Date: Wed Apr 13 15:24:01 2016 +0530
Pulls in the systemd-udev subpackage
fedora-cloud-base.ks | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index c53fd8c..27a9106 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -61,6 +61,8 @@ reboot
kernel-core
@^cloud-server-environment
+# Need to pull in the udev subpackage
+systemd-udev
# rescue mode generally isn't useful in the cloud context
-dracut-config-rescue
8 years
[spin-kickstarts] Pulls in the systemd-udev subpackage
by Kushal Das
commit a5ad80cbc1bfc9d4f0753cae1d052ad8df5fe1af
Author: Kushal Das <mail(a)kushaldas.in>
Date: Wed Apr 13 15:24:01 2016 +0530
Pulls in the systemd-udev subpackage
fedora-cloud-base.ks | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index c53fd8c..27a9106 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -61,6 +61,8 @@ reboot
kernel-core
@^cloud-server-environment
+# Need to pull in the udev subpackage
+systemd-udev
# rescue mode generally isn't useful in the cloud context
-dracut-config-rescue
8 years
[spin-kickstarts/f24] update the atomic cloud images for f24
by Dennis Gilmore
commit e1206f4b9bad694c75726c0ff05ac9853fb75b10
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Apr 12 10:07:07 2016 -0500
update the atomic cloud images for f24
Signed-off-by: Dennis Gilmore <dennis(a)ausil.us>
...d-atomic-vagrant.ks => fedora-atomic-vagrant.ks | 2 +-
fedora-cloud-atomic.ks => fedora-atomic.ks | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/fedora-cloud-atomic-vagrant.ks b/fedora-atomic-vagrant.ks
similarity index 98%
rename from fedora-cloud-atomic-vagrant.ks
rename to fedora-atomic-vagrant.ks
index 0ad0586..822311a 100644
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/fedora-atomic-vagrant.ks
@@ -1,7 +1,7 @@
# Like the Atomic cloud image, but tuned for vagrant. Enable
# the vagrant user, disable cloud-init.
-%include fedora-cloud-atomic.ks
+%include fedora-atomic.ks
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
diff --git a/fedora-cloud-atomic.ks b/fedora-atomic.ks
similarity index 96%
rename from fedora-cloud-atomic.ks
rename to fedora-atomic.ks
index 2caa8ce..adadbeb 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-atomic.ks
@@ -33,14 +33,14 @@ volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/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/24/ --ref=fedora-atomic/24/x86_64/docker-host
reboot
%post --erroronfail
# See https://github.com/projectatomic/rpm-ostree/issues/42
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://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
8 years
[spin-kickstarts/f24] Docker: Base: add arm config, use includes for ppc config
by Peter Robinson
commit 7f13b20e332d7bb72198f460b8ab7136f98fffec
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Apr 12 15:43:09 2016 +0100
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(-)
---
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-ra...
-#
-# 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
8 years
[spin-kickstarts] Docker: Base: add arm config, use includes for ppc config
by Peter Robinson
commit b2eb0a44eac83e65229404d126afe08907afc254
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Apr 12 15:43:09 2016 +0100
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(-)
---
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-ra...
-#
-# 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
8 years
[spin-kickstarts/f24] Cloud: Base: add arm config, use includes for ppc config
by Peter Robinson
commit 6226c24d434ba2ccb786cdcbbb72943ff5dce485
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Apr 12 14:22:03 2016 +0100
Cloud: Base: add arm config, use includes for ppc config
fedora-cloud-base-arm.ks | 6 +
fedora-cloud-base-ppc.ks | 262 +---------------------------------------------
fedora-cloud-base.ks | 2 +-
3 files changed, 8 insertions(+), 262 deletions(-)
---
diff --git a/fedora-cloud-base-arm.ks b/fedora-cloud-base-arm.ks
new file mode 100644
index 0000000..03be955
--- /dev/null
+++ b/fedora-cloud-base-arm.ks
@@ -0,0 +1,6 @@
+%include fedora-cloud-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-cloud-base-ppc.ks b/fedora-cloud-base-ppc.ks
index 16cf560..62c2c7d 100644
--- a/fedora-cloud-base-ppc.ks
+++ b/fedora-cloud-base-ppc.ks
@@ -1,265 +1,5 @@
-# This is a basic Fedora 21 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
-# rather than in tmpfs, since memory is usually at a premium.
-#
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To do a local build, you'll need to install ImageFactory. See
-# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
-#
-# For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-ra...
-# (Koji generates one internally...what we really want is Koji to publish it statically)
-#
-# Once you have imagefactory and imagefactory-plugins installed, run:
-#
-# curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-r...
-# tempfile=$(mktemp --suffix=.ks)
-# ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
-# imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
-#
-
-cmdline
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
+%include fedora-cloud-base.ks
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
part prepboot --fstype="prepboot" --size=4
-part / --size 3000 --fstype ext4 --grow
-
-%include fedora-repo.ks
-
-reboot
-
-# Package list.
-# FIXME: instLangs does not work, so there's a hack below
-# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-# FIXME: instLangs bug has been fixed but now having instLangs
-# with an arg causes no langs to get installed because of BZ1262040
-# which yields the errors in BZ1261249. For now fix by not using
-# --instLangs at all
-#%packages --instLangs=en
-%packages
-
-kernel-core
-@^cloud-server-environment
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Some things from @core we can do without in a minimal install
--biosdevname
-# Need to also add back plymouth in order to mask failure of
-# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
-#-plymouth
--NetworkManager
--iprutils
-# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
-# systemd-vconsole-setup.service on boot. Comment out for now
-#-kbd
--uboot-tools
--syslinux-extlinux
--kernel
-
-%end
-
-
-
-%post --erroronfail
-
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do
- echo "title Fedora ($kv)" >> /boot/grub/grub.conf
- echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
- echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
- echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
- echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# 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
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
-
-# Remove firewalld; was supposed to be optional in F18+, but is pulled in
-# in install/image building.
-echo "Removing firewalld."
-# FIXME! clean_requirements_on_remove is the default with DNF, but may
-# not work when package was installed by Anaconda instead of command line.
-# Also -- check if this is still even needed with new anaconda -- disabled
-# firewall should _not_ pull in this package.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-dnf -C -y erase "firewalld*"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-dnf -C -y erase authconfig
-
-# instlang hack. (Note! See bug referenced above package list)
-find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
-localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
-# this will kill a live system (since it's memory mapped) but should be safe offline
-mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
-awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
- < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
-
-echo -n "Getty fixes"
-# although we want console output going to the serial console, we don't
-# actually have the opportunity to login there. FIX.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-DEVTIMEOUT=10
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-echo "Cleaning old dnf repodata."
-# FIXME: clear history?
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
-truncate -c -s 0 /var/log/dnf.rpm.log
-
-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 "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# 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
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-# For trac ticket https://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
-%end
-
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 907c4ac..c53fd8c 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -43,7 +43,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
zerombr
clearpart --all
-part / --size 3000 --fstype ext4 --grow
+part / --fstype ext4 --grow
%include fedora-repo.ks
8 years
[spin-kickstarts] Cloud: Base: add arm config, use includes for ppc config
by Peter Robinson
commit 42de2111461b10e9a65bafdf5e7530bc76abcb4f
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Apr 12 14:22:03 2016 +0100
Cloud: Base: add arm config, use includes for ppc config
fedora-cloud-base-arm.ks | 6 +
fedora-cloud-base-ppc.ks | 262 +---------------------------------------------
fedora-cloud-base.ks | 2 +-
3 files changed, 8 insertions(+), 262 deletions(-)
---
diff --git a/fedora-cloud-base-arm.ks b/fedora-cloud-base-arm.ks
new file mode 100644
index 0000000..03be955
--- /dev/null
+++ b/fedora-cloud-base-arm.ks
@@ -0,0 +1,6 @@
+%include fedora-cloud-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-cloud-base-ppc.ks b/fedora-cloud-base-ppc.ks
index 16cf560..62c2c7d 100644
--- a/fedora-cloud-base-ppc.ks
+++ b/fedora-cloud-base-ppc.ks
@@ -1,265 +1,5 @@
-# This is a basic Fedora 21 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
-# rather than in tmpfs, since memory is usually at a premium.
-#
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To do a local build, you'll need to install ImageFactory. See
-# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
-#
-# For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-ra...
-# (Koji generates one internally...what we really want is Koji to publish it statically)
-#
-# Once you have imagefactory and imagefactory-plugins installed, run:
-#
-# curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-r...
-# tempfile=$(mktemp --suffix=.ks)
-# ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
-# imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
-#
-
-cmdline
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
+%include fedora-cloud-base.ks
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
part prepboot --fstype="prepboot" --size=4
-part / --size 3000 --fstype ext4 --grow
-
-%include fedora-repo.ks
-
-reboot
-
-# Package list.
-# FIXME: instLangs does not work, so there's a hack below
-# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-# FIXME: instLangs bug has been fixed but now having instLangs
-# with an arg causes no langs to get installed because of BZ1262040
-# which yields the errors in BZ1261249. For now fix by not using
-# --instLangs at all
-#%packages --instLangs=en
-%packages
-
-kernel-core
-@^cloud-server-environment
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Some things from @core we can do without in a minimal install
--biosdevname
-# Need to also add back plymouth in order to mask failure of
-# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
-#-plymouth
--NetworkManager
--iprutils
-# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
-# systemd-vconsole-setup.service on boot. Comment out for now
-#-kbd
--uboot-tools
--syslinux-extlinux
--kernel
-
-%end
-
-
-
-%post --erroronfail
-
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do
- echo "title Fedora ($kv)" >> /boot/grub/grub.conf
- echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
- echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
- echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
- echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# 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
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
-
-# Remove firewalld; was supposed to be optional in F18+, but is pulled in
-# in install/image building.
-echo "Removing firewalld."
-# FIXME! clean_requirements_on_remove is the default with DNF, but may
-# not work when package was installed by Anaconda instead of command line.
-# Also -- check if this is still even needed with new anaconda -- disabled
-# firewall should _not_ pull in this package.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-dnf -C -y erase "firewalld*"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-dnf -C -y erase authconfig
-
-# instlang hack. (Note! See bug referenced above package list)
-find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
-localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
-# this will kill a live system (since it's memory mapped) but should be safe offline
-mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
-awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
- < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
-
-echo -n "Getty fixes"
-# although we want console output going to the serial console, we don't
-# actually have the opportunity to login there. FIX.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-DEVTIMEOUT=10
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-echo "Cleaning old dnf repodata."
-# FIXME: clear history?
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
-truncate -c -s 0 /var/log/dnf.rpm.log
-
-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 "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# 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
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-# For trac ticket https://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
-%end
-
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 907c4ac..c53fd8c 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -43,7 +43,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
zerombr
clearpart --all
-part / --size 3000 --fstype ext4 --grow
+part / --fstype ext4 --grow
%include fedora-repo.ks
8 years
[spin-kickstarts] remove cloud from atomic kickstarts and point at new repo location
by Dennis Gilmore
commit 27a0af11ddf8d95f6723d55f2f24a1b5d750b5d9
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Apr 11 14:09:19 2016 -0500
remove cloud from atomic kickstarts and point at new repo location
Signed-off-by: Dennis Gilmore <dennis(a)ausil.us>
...d-atomic-vagrant.ks => fedora-atomic-vagrant.ks | 2 +-
fedora-cloud-atomic.ks => fedora-atomic.ks | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/fedora-cloud-atomic-vagrant.ks b/fedora-atomic-vagrant.ks
similarity index 98%
rename from fedora-cloud-atomic-vagrant.ks
rename to fedora-atomic-vagrant.ks
index 0ad0586..822311a 100644
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/fedora-atomic-vagrant.ks
@@ -1,7 +1,7 @@
# Like the Atomic cloud image, but tuned for vagrant. Enable
# the vagrant user, disable cloud-init.
-%include fedora-cloud-atomic.ks
+%include fedora-atomic.ks
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
diff --git a/fedora-cloud-atomic.ks b/fedora-atomic.ks
similarity index 97%
rename from fedora-cloud-atomic.ks
rename to fedora-atomic.ks
index 2caa8ce..ed8d4f1 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-atomic.ks
@@ -33,7 +33,7 @@ volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/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/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
reboot
8 years
