[spin-kickstarts] atomic: Switch /boot to ext4
by Colin Walters
commit 26d2bef549dad80cd9e3c13cb241eb801e85904a
Author: Colin Walters <walters(a)verbum.org>
Date: Wed Nov 5 12:38:27 2014 -0500
atomic: Switch /boot to ext4
For some reason Anaconda in Fedora rejects XFS as /boot, even though
that's what RHEL defaults to.
fedora-cloud-atomic.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index b16f13a..91e123e 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -24,7 +24,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
zerombr
clearpart --all
# Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="xfs"
+part /boot --size=300 --fstype="ext4"
part pv.01 --grow
volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
9 years, 5 months
[spin-kickstarts/f21] cloud-atomic: Drop yum/rpm bits from %post
by Matthew Miller
commit 4bc31dd88e0e67b2f5631be06729c2557eb33e43
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Nov 4 09:09:45 2014 -0500
cloud-atomic: Drop yum/rpm bits from %post
While it makes sense to import the GPG key, it has to be done
as part of the treecompose, because it'll drop out of the rpmdb
on the next upgrade.
For yum, it was run as part of the treecompose, not Anaconda, so
there's already no history.
fedora-cloud-atomic.ks | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index f881e4d..ea28fcf 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -152,16 +152,6 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/random-seed
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.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
9 years, 5 months
[spin-kickstarts/f21] cloud-atomic: Use LVM by default in combination with docker-storage-setup
by Matthew Miller
commit 11c22f0c8de67f22c353f812c7bae8ecd0c054d8
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Nov 4 08:30:28 2014 -0500
cloud-atomic: Use LVM by default in combination with docker-storage-setup
This will allow flexible expansion of direct Docker LVM.
fedora-cloud-atomic.ks | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 6e10fc0..f881e4d 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -24,7 +24,10 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
zerombr
clearpart --all
# Atomic differs from cloud - we want LVM
-autopart
+part /boot --size=300 --fstype="xfs"
+part pv.01 --grow
+volgroup atomicos pv.01
+logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
9 years, 5 months
[spin-kickstarts] cloud-atomic: Drop yum/rpm bits from %post
by Matthew Miller
commit 8173ebec2eaf25caecdfde29587e054b7a91dfe4
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Nov 4 09:09:45 2014 -0500
cloud-atomic: Drop yum/rpm bits from %post
While it makes sense to import the GPG key, it has to be done
as part of the treecompose, because it'll drop out of the rpmdb
on the next upgrade.
For yum, it was run as part of the treecompose, not Anaconda, so
there's already no history.
fedora-cloud-atomic.ks | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 50ff215..b16f13a 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -104,16 +104,6 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/random-seed
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.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
9 years, 5 months
[spin-kickstarts] Use GRUB2 for atomic instead extlinux
by Matthew Miller
commit 039307e153c31a31d3cc0b0b2755a6914ec012d0
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Nov 4 21:10:28 2014 -0500
Use GRUB2 for atomic instead extlinux
fedora-cloud-atomic.ks | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 7c3c710..50ff215 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -16,7 +16,7 @@ user --name=none
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=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -42,10 +42,6 @@ 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
-
# If you want to remove rsyslog and just use journald, remove this!
echo -n "Disabling persistent journal"
rmdir /var/log/journal/
@@ -125,15 +121,6 @@ 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
-
-
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 || :
9 years, 5 months
[spin-kickstarts] cloud-atomic: Point to dl.fedoraproject.org
by Matthew Miller
commit 319ef2422f981421fbc76eb9e9a27d6d2184cf99
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Nov 4 08:30:58 2014 -0500
cloud-atomic: Point to dl.fedoraproject.org
Since this is the repository that's actually getting updates.
fedora-cloud-atomic.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 6bdc6e9..7c3c710 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -30,7 +30,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-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://dl.fedoraproject.org/pub/alt/fedora-atomic/repo --ref=fedora-atomic/rawhide/x86_64/docker-host
reboot
9 years, 5 months
[spin-kickstarts] cloud-atomic: Use LVM by default in combination with docker-storage-setup
by Matthew Miller
commit 213dbfcaaa7cc24c7cda76c9be46854c36dc4189
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Nov 4 08:30:28 2014 -0500
cloud-atomic: Use LVM by default in combination with docker-storage-setup
This will allow flexible expansion of direct Docker LVM.
fedora-cloud-atomic.ks | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index ae288b3..6bdc6e9 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -24,7 +24,10 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
zerombr
clearpart --all
# Atomic differs from cloud - we want LVM
-autopart
+part /boot --size=300 --fstype="xfs"
+part pv.01 --grow
+volgroup atomicos pv.01
+logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks
ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/ --ref=fedora-atomic/rawhide/x86_64/docker-host
9 years, 5 months
[spin-kickstarts] Revert "Use fstrim to zero out empty space rather than forcing it with dd"
by Matthew Miller
commit 0679b37d654ab96d81bd7e678ae3521712c7d6b2
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Mon Nov 3 15:27:08 2014 -0500
Revert "Use fstrim to zero out empty space rather than forcing it with dd"
Nope -- still does not work
This reverts commit 99c9224ef57a58ccc40bb23cb3b93eb314b2f94c.
fedora-cloud-atomic.ks | 7 +++++--
fedora-cloud-base.ks | 7 +++++--
fedora-cloud-bigdata.ks | 7 +++++--
fedora-cloud-experimental.ks | 7 +++++--
4 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 2f94492..ae288b3 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -131,8 +131,11 @@ rm -f /var/lib/rpm/__db*
dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
%end
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 440589a..e88e24b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -216,8 +216,11 @@ chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
%end
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 7bf1a7a..1a9ef6a 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -216,8 +216,11 @@ chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
%end
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index 529cb41..fb902a5 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -208,8 +208,11 @@ chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
%end
9 years, 5 months
[spin-kickstarts] cmdline output for hopefully better debugging in automation
by Matthew Miller
commit 0ab674dc2a82dd57f9b9c15d7e54531fe71e7b0e
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Mon Nov 3 12:30:39 2014 -0500
cmdline output for hopefully better debugging in automation
fedora-cloud-base.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 38f70a4..440589a 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -11,7 +11,7 @@
# may need slight modification for use with actual anaconda or other tools.
# We intend to target anaconda-in-a-vm style image building for F20.
-text
+cmdline
lang en_US.UTF-8
keyboard us
timezone --utc Etc/UTC
9 years, 5 months
[spin-kickstarts] switch to use dnf for f22
by Matthew Miller
commit aa63eae541dd9e9a82c7a16347f9e27912cb6094
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Mon Nov 3 12:30:23 2014 -0500
switch to use dnf for f22
fedora-cloud-base.ks | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 21ff23d..38f70a4 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -107,17 +107,22 @@ echo .
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+dnf -C -y erase linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is pulled in
# in install/image building.
echo "Removing firewalld."
-yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+# 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."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+dnf -C -y erase authconfig
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
@@ -176,10 +181,11 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/random-seed
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
+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)
@@ -202,10 +208,10 @@ rm -f /var/lib/rpm/__db*
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
-mkdir -p /var/cache/yum
chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
9 years, 5 months
