X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fprototypes%2Fauto-deploy%2Fdeploy%2Ffunctions%2Fpatch-iso.sh;h=d27dcdf2dd9678c5560de0e19a6dd104419a3678;hb=563547b4a9f44090f32c0e17d040114854563760;hp=933281f8b62bcd2b97b9bf813ee4209b04e1fc27;hpb=b9bbe514232c99f203df46873b2d290cbd4196c6;p=genesis.git

diff --git a/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh b/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh
index 933281f..d27dcdf 100755
--- a/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh
+++ b/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh
@@ -9,13 +9,10 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# This is a temporary script - this should be rolled into a separate
-# build target "make ci-iso" instead!
-
 exit_handler() {
     rm -Rf $tmpnewdir
     fusermount -u $tmporigdir 2>/dev/null
-    test -d $tmporigdir && mdir $tmporigdir
+    test -d $tmporigdir && rmdir $tmporigdir
 }
 
 trap exit_handler exit
@@ -39,8 +36,8 @@ fuelGateway=$6
 fuelHostname=$7
 fuelDns=$8
 
-tmporigdir=/${tmpdir}/origiso
-tmpnewdir=/${tmpdir}/newiso
+tmporigdir=${tmpdir}/origiso
+tmpnewdir=${tmpdir}/newiso
 
 test -f $origiso || error_exit "Could not find origiso $origiso"
 test -d $tmpdir || error_exit "Could not find tmpdir $tmpdir"
@@ -51,15 +48,15 @@ if [ "`whoami`" != "root" ]; then
 fi
 
 echo "Copying..."
-rm -Rf $tmporigdir $tmpnewdir
+rm -Rf $tmpnewdir || error_exit "Failed deleting old ISO copy dir"
 mkdir -p $tmporigdir $tmpnewdir
-fuseiso $origiso $tmporigdir || error_exit "Failed fuseiso"
+fuseiso $origiso $tmporigdir || error_exit "Failed to FUSE mount ISO"
 cd $tmporigdir
-find . | cpio -pd $tmpnewdir
+find . | cpio -pd $tmpnewdir || error_exit "Failed to copy FUSE ISO with cpio"
 cd $tmpnewdir
-fusermount -u $tmporigdir
-rmdir $tmporigdir
-chmod -R 755 $tmpnewdir
+fusermount -u $tmporigdir || error_exit "Failed to FUSE unmount ISO"
+rmdir $tmporigdir || error_exit "Failed to delete original FUSE ISO directory"
+chmod -R 755 $tmpnewdir || error_exit "Failed to set protection on new ISO dir"
 
 echo "Patching..."
 cd $tmpnewdir