I backported some changes from fedora-atomic master to f21:
https://git.fedorahosted.org/cgit/fedora-atomic.git/log/?h=f21
Here are 4 patches for spin-kickstarts master for fedora-cloud-atomic.ks. I tried to actually test them against rawhide but hit https://bugzilla.redhat.com/show_bug.cgi?id=1111290
So I backported them to f21 and then I hit a different (presumably anaconda, but maybe dracut) bug where it loops forever at shutdown (haven't searched for/filed a bug yet).
However if I terminated the VM in imagefactory, the resulting qcow2 works.
To save you all the pain of testing this until we get patches landed, please try:
https://alt.fedoraproject.org/pub/alt/fedora-atomic/testing/f21/20141104.0/fedora-atomic-cloud-direct-lvm-walters-20141104.qcow2.gz
From c314ed756cc3579d305867a7da13127fa6ceeb98 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 4 Nov 2014 08:30:28 -0500
Subject: [PATCH 1/4] 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 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 2f94492..5b75865 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
--
1.8.3.1
From 4fbf117c9819bb618c9a3e0d01a24f53b1ad3241 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 4 Nov 2014 08:30:58 -0500
Subject: [PATCH 2/4] cloud-atomic: Point to dl.fedoraproject.org
Since this is the repository that's actually getting updates.
---
fedora-cloud-atomic.ks | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 5b75865..5ec2dcf 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
--
1.8.3.1
From d6b0df5916914921a67b74dcaf0433f8089fb9ec Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 4 Nov 2014 09:07:27 -0500
Subject: [PATCH 3/4] cloud-atomic: We use GRUB2 now instead of extlinux
In order to have one bootloader per architecture for rpmostreepayload.
---
fedora-cloud-atomic.ks | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 5ec2dcf..b077712 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 with fstrim."
/usr/sbin/fstrim /
--
1.8.3.1
From cdf0383c05c35d714b6439e2f7a6fa19d856901f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 4 Nov 2014 09:09:45 -0500
Subject: [PATCH 4/4] 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 file changed, 10 deletions(-)
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index b077712..af280d8 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
--
1.8.3.1
_______________________________________________
cloud mailing list
cloud@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/cloud
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
