diff options
| -rwxr-xr-x | build_tools/clarch/larch/run/cachepacs | 3 | ||||
| -rwxr-xr-x | build_tools/clarch/larch/run/mklarch | 5 | ||||
| -rwxr-xr-x | build_tools/go.sh | 25 |
3 files changed, 21 insertions, 12 deletions
diff --git a/build_tools/clarch/larch/run/cachepacs b/build_tools/clarch/larch/run/cachepacs index f8b5951..3e4a1fb 100755 --- a/build_tools/clarch/larch/run/cachepacs +++ b/build_tools/clarch/larch/run/cachepacs @@ -109,11 +109,12 @@ doInstall() { mount --bind /proc ${INSTLDIR}/proc ${PACMAN} -r ${INSTLDIR} -Sw $1 RET=$? + echo $RET umount ${INSTLDIR}/proc umount ${INSTLDIR}/sys if [ ${RET} -ne 0 ]; then echo "//" - echo "// Package $1 FAILED." + echo "// cachepacks package $1 FAILED." echo "//" return 1 fi diff --git a/build_tools/clarch/larch/run/mklarch b/build_tools/clarch/larch/run/mklarch index 2a1c574..236088a 100755 --- a/build_tools/clarch/larch/run/mklarch +++ b/build_tools/clarch/larch/run/mklarch @@ -242,7 +242,10 @@ else fi cachepacs -a ${PROFILE}/cache_packs $INPACSO -d ${INSTLDIR} - +if [ $? -ne 0 ] +then + exit 1 +fi # Generate glibc locales if [ -f ${PROFILE}/locale.gen ]; then diff --git a/build_tools/go.sh b/build_tools/go.sh index 4cbea8b..4fe631e 100755 --- a/build_tools/go.sh +++ b/build_tools/go.sh @@ -9,17 +9,22 @@ echo ${array1[@]} element_count=${#menuarray[*]} element_count=`expr $element_count - 1` +if [ ! x$1 = xmv ] +then + for i in `seq 0 $element_count` + do + echo "$i ) ${menuarray[$i]}" + echo + done + echo "Select the profile to use:" + read a + profile=${menuarray[$a]} + pwd + ls +else + profile=MV-local +fi -for i in `seq 0 $element_count` -do - echo "$i ) ${menuarray[$i]}" - echo -done -echo "Select the profile to use:" -read a -profile=${menuarray[$a]} -pwd -ls echo "Running ./mklarch -f -p larch/profiles/$profile" time ./mklarch -f -c /tmp/$profile -p larch/profiles/$profile echo "your $profile iso has been moved to /tmp/testcd-2.iso" |