[releng] not send kfsflatten output to /dev/null wrap the urls for atomic with "" to match the kickstart

Dennis Gilmore ausil at fedoraproject.org
Thu Nov 13 00:42:19 UTC 2014


commit 26fea317977335707d29d6c08abdc3d2a42a93b8
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Nov 11 18:49:11 2014 -0600

    not send kfsflatten output to /dev/null
    wrap the urls for atomic with "" to match the kickstart

 scripts/build-cloud-images |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/build-cloud-images b/scripts/build-cloud-images
index bffbf27..1d12df1 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 -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,9 +46,9 @@ do
     declare -l lspin
     lspin=$spin
     kickstart=fedora-cloud-$lspin-$GITHASH.ks
-    ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
+    ksflatten -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
+    sed -i -e "s|--url=\"http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/\"|--url=\"$atomicurl\"|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 --format=qcow2 --format=raw-xz --release=$RELEASE --scratch --repo=$url --nowait --disk-size=6
@@ -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 -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


More information about the rel-eng mailing list