Untested, but I think this will fix the Atomic compose.
CC'ing fedora-cloud as my patch also touches the invocations
for mainline cloud as well as the docker base image.
We need to specify --version to ensure the build host is
allowed to use kickstart syntax from the target version.
Remove the >& /dev/null as we'd like to be able to debug if it's
failing.
---
scripts/build-cloud-images | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
From 70667ab32be48c03479cc0651e01c935eee284d1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 11 Nov 2014 15:39:20 -0500
Subject: [PATCH] build-cloud-images: Use --version of ksflatten, and do show
stderr
We need to specify --version to ensure the build host is
allowed to use kickstart syntax from the target version.
Remove the >& /dev/null as we'd like to be able to debug if it's
failing.
---
scripts/build-cloud-images | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/build-cloud-images b/scripts/build-cloud-images
index bffbf27..7b39640 100755
--- a/scripts/build-cloud-images
+++ b/scripts/build-cloud-images
@@ -35,7 +35,7 @@ do
declare -l lspin
lspin=$spin
kickstart=fedora-cloud-$lspin-$GITHASH.ks
- ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
+ ksflatten --version F${RELEASE} -c fedora-cloud-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET --ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH --kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw --release=$VERSION --scratch --repo=$url --nowait --disk-size=3
koji image-build Fedora-Cloud-$spin $BUILD --distro Fedora-20 $TARGET --kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 i386 --format=qcow2 --format=raw-xz --release=$RELEASE --scratch --repo=$url --nowait --disk-size=3
@@ -46,7 +46,7 @@ do
declare -l lspin
lspin=$spin
kickstart=fedora-cloud-$lspin-$GITHASH.ks
- ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
+ ksflatten --version F${RELEASE} -c fedora-cloud-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
sed -i -e "s|--url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/|--url=$atomicurl|g" $kickstart
@@ -59,7 +59,7 @@ do
declare -l lspin
lspin=$spin
kickstart=fedora-docker-$lspin-$GITHASH.ks
- ksflatten -c fedora-docker-$lspin.ks -o $kickstart >& /dev/null
+ ksflatten --version F${RELEASE} -c fedora-docker-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET --ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH --kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw --release=$VERSION --scratch --repo=$url --nowait --disk-size=3
koji image-build Fedora-Docker-$spin $BUILD --distro Fedora-20 $TARGET --kickstart=fedora-docker-$lspin-$GITHASH.ks $url x86_64 --format=docker --release=$RELEASE --scratch --repo=$url --nowait --disk-size=3
--
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
