QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Exit with retcode!=0 on failure

Browse Source
This commit is contained in:
Marek Marczykowski 2011-09-25 22:41:27 +02:00
parent 15aa57bfa8
commit 7788bc3013
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fedorize_image
View File

@ -3,6 +3,8 @@
IMG=$1 IMG=$1
PKGLISTFILE=$2 PKGLISTFILE=$2
RETCODE=0
: ${DIST=fc14} : ${DIST=fc14}
if ! [ $# -eq 2 ]; then if ! [ $# -eq 2 ]; then
@ -38,7 +40,7 @@ else
rpm --import --root=$INSTALLDIR keys/* rpm --import --root=$INSTALLDIR keys/*
echo "-> Installing core RPM packages..." echo "-> Installing core RPM packages..."
rpm -i --root=$INSTALLDIR base_rpms/*.rpm rpm -i --root=$INSTALLDIR base_rpms/*.rpm || exit 1
cp clean_images/network $INSTALLDIR/etc/sysconfig cp clean_images/network $INSTALLDIR/etc/sysconfig
cp clean_images/resolv.conf $INSTALLDIR/etc cp clean_images/resolv.conf $INSTALLDIR/etc
@ -48,6 +50,8 @@ fi
mount -t proc proc mnt/proc mount -t proc proc mnt/proc
PKGGROUPS=$(cat $PKGLISTFILE) PKGGROUPS=$(cat $PKGLISTFILE)
echo "-> Installing package groups..." echo "-> Installing package groups..."
yum install -y --installroot=$INSTALLDIR $PKGGROUPS yum install -y --installroot=$INSTALLDIR $PKGGROUPS || RETCODE=1
umount mnt/proc mnt umount mnt/proc mnt
exit $RETCODE

2
qubeize_image
View File

@ -3,6 +3,8 @@
CLEANIMG=$1 CLEANIMG=$1
NAME=$2 NAME=$2
set -e
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
echo "usage $0 <clean_image_file> <template_name>" echo "usage $0 <clean_image_file> <template_name>"
exit exit