On Tue, Nov 4, 2014, at 09:20 PM, Matthew Miller wrote:
> Applied to master -- I had to update the one about extlinux because an
> unrelated change you hadn't pulled. Can you rebase for f21? They don't
> apply cleanly -- I think just for minor things but I'll need more focus
> than I have right now to do it right. (Will look again tomorrow.)
These are the two patches that should go on f21, backported from master. And only the first is really needed.
From 6986a630452bb4ed75dbbdb40c0629d238c1e64b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 4 Nov 2014 08:30:28 -0500
Subject: [PATCH 1/2] 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 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
--
1.8.3.1
From a4eb88794fbcac93c685c282bb54ce3e8080f603 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 4 Nov 2014 09:09:45 -0500
Subject: [PATCH 2/2] 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 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
--
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
