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

fedora: improve error handling

Browse Source 
Interrupt build process when error encountered.
This commit is contained in:
Marek Marczykowski-Górecki 2013-12-13 04:29:29 +01:00
parent 25459fe993
commit 3eaa198c97
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts_fedora/02_install_groups.sh
View File

@ -15,3 +15,5 @@ yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR $PKGGROUPS |
yum update -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR || RETCODE=1
umount mnt/proc
exit $RETCODE

6
scripts_fedora/04_install_qubes.sh
View File

@ -4,9 +4,11 @@ mount -t proc proc $PWD/mnt/proc
echo "--> Installing RPMs..."
export YUM0=$PWD/yum_repo_qubes
yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt @qubes-vm
yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt @qubes-vm || RETCODE=1
echo "--> Installing 3rd party apps"
$SCRIPTSDIR/add_3rd_party_software.sh
$SCRIPTSDIR/add_3rd_party_software.sh || RETCODE=1
umount $PWD/mnt/proc
exit $RETCODE

4
scripts_fedora/add_3rd_party_software.sh
View File

@ -2,6 +2,6 @@
INSTALLDIR=$PWD/mnt
rpm -i --root=$INSTALLDIR $SCRIPTSDIR/3rd_party_software/adobe-release-x86_64-*.noarch.rpm
rpm -i --root=$INSTALLDIR $SCRIPTSDIR/3rd_party_software/adobe-release-x86_64-*.noarch.rpm || exit 1
rpm --import --root=$INSTALLDIR mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux
yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR flash-plugin
yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR flash-plugin || exit 1