logauth
/
setup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix] Fixed partition check before mounting it

This commit is contained in:
xdrm-brackets 2017-07-23 12:16:22 +02:00
parent ba30eb1bc6
commit 02e9dac13f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clone/clone
View File

@ -51,7 +51,7 @@ step1(){
mounted_partitions=$( cat /proc/mounts | awk '{print $1}' | grep "$DEV" ); mounted_partitions=$( cat /proc/mounts | awk '{print $1}' | grep "$DEV" );
# if nothing found -> next step # if nothing found -> next step
ls ${DEV}2 > /dev/null 2>&1 || $( echo "<<< done" && step2 ); ls ${DEV}2 > /dev/null 2>&1 || (echo "<<< done"; step2);
for mounted in $mounted_partitions; do for mounted in $mounted_partitions; do
@ -111,12 +111,12 @@ step3(){
echo " - using gunzip"; echo " - using gunzip";
( dd if=$IMAGE_FILE | pv -s $(du -bs $IMAGE_FILE | gunzip | awk '{print $1}') | sudo dd of=$DEV bs=4M ) \ ( dd if=$IMAGE_FILE | pv -s $(du -bs $IMAGE_FILE | gunzip | awk '{print $1}') | sudo dd of=$DEV bs=4M ) \
|| $( echo "<<< error: dd command failed" && exit ); || (echo "<<< error: dd command failed"; exit);
else else
( dd if=$IMAGE_FILE | pv -s $(du -bs $IMAGE_FILE | awk '{print $1}') | sudo dd of=$DEV bs=4M ) \ ( dd if=$IMAGE_FILE | pv -s $(du -bs $IMAGE_FILE | awk '{print $1}') | sudo dd of=$DEV bs=4M ) \
|| $( echo "<<< error: dd command failed" && exit ); || (echo "<<< error: dd command failed"; exit);
fi; fi;
@ -137,10 +137,18 @@ step3(){
step4(){ step4(){
echo -e "\n>>> [4] Mounting partition ${DEV}2"; echo -e "\n>>> [4] Mounting partition ${DEV}2";
test ! -f ${DEV}2 && ( echo "<<< error: device ${DEV}2 does not exist" && exit ); count=0;
while [ $count -lt 5 ] && [ ! -e ${DEV}2 ]; do
echo " * Waiting for ${DEV}2 to be ready (remaining `expr 5 - $count`s)";
count=`expr $count + 1`;
sleep 1;
done;
test $count -eq 5 && (echo "<<< error: can't find device ${DEV}2"; exit 1);
# [1] Mount device partition # [1] Mount device partition
sudo mount ${DEV}2 /mnt || $( echo "<<< error: can't mount" && exit ); sudo mount ${DEV}2 /mnt || (echo "<<< error: can't mount"; exit 1);
echo "<<< done"; echo "<<< done";