Skip to content

Commit fe85eba

Browse files
authored
Merge pull request #2 from igorpecovnik/master
Update 4/17
2 parents 84b3a83 + 9cabd7d commit fe85eba

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ create_armbian()
106106
StopRunningServices "nfs-|smbd|nmbd|winbind|ftpd|netatalk|monit|cron|webmin|rrdcached" >> $logfile
107107
StopRunningServices "log2ram|postgres|mariadb|mysql|postfix|mail|nginx|apache|snmpd" >> $logfile
108108
echo -e "\n" >> $logfile
109+
logfile="/mnt/rootfs/var/log/nand-sata-install.log"
109110

110111
# count files is needed for progress bar
111112
dialog --title "$title" --backtitle "$backtitle" --infobox "\n Counting files ... few seconds." 5 40
@@ -425,14 +426,14 @@ main()
425426
{
426427
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
427428

428-
# if mounted
429-
umount /mnt/rootfs >> $logfile 2>&1
430-
umount /mnt/bootfs >> $logfile 2>&1
429+
# umount temporary mountpoints if mounted
430+
grep -q /mnt/rootfs /etc/mtab && umount -frv /mnt/rootfs >> $logfile 2>&1
431+
grep -q /mnt/bootfs /etc/mtab && umount -frv /mnt/bootfs >> $logfile 2>&1
431432

432433
# This tool must run under root
433434

434435
if [[ $EUID -ne 0 ]]; then
435-
echo "This tool must run as root. Exiting ..."
436+
echo "This tool must run as root. Exiting ..." >&2
436437
exit 1
437438
fi
438439

0 commit comments

Comments
 (0)