diff --git a/packages/bsp/common/usr/sbin/nand-sata-install b/packages/bsp/common/usr/sbin/nand-sata-install index a1e37fe24..a7f6a4da5 100755 --- a/packages/bsp/common/usr/sbin/nand-sata-install +++ b/packages/bsp/common/usr/sbin/nand-sata-install @@ -128,7 +128,7 @@ create_armbian() lsof / | awk 'NR==1 || $4~/[0-9][uw]/' | grep -v "^COMMAND" >> $logfile echo -e "\nTrying to stop running services to minimize open files:\c" >> $logfile stop_running_services "nfs-|smbd|nmbd|winbind|ftpd|netatalk|monit|cron|webmin|rrdcached" >> $logfile - stop_running_services "fail2ban|log2ram|folder2ram|postgres|mariadb|mysql|postfix|mail|nginx|apache|snmpd" >> $logfile + stop_running_services "fail2ban|ramlog|folder2ram|postgres|mariadb|mysql|postfix|mail|nginx|apache|snmpd" >> $logfile pkill dhclient 2>/dev/null LANG=C echo -e "\n\nChecking again for open files:" >> $logfile lsof / | awk 'NR==1 || $4~/[0-9][uw]/' | grep -v "^COMMAND" >> $logfile @@ -426,7 +426,7 @@ format_emmc() IFS=" " BTRFS=$(grep -o btrfs /proc/filesystems) FilesystemTargets="1 ext4 2 ext3 3 ext2 4 f2fs" - [[ -n $BTRFS && `uname -r | grep '^3.' ` ]] || FilesystemTargets=$FilesystemTargets" 5 $BTRFS" + [[ -n $BTRFS && ! `uname -r | grep '^3.' ` ]] && FilesystemTargets=$FilesystemTargets" 5 $BTRFS" FilesystemOptions=($FilesystemTargets) FilesystemCmd=(dialog --title "Select filesystem type for eMMC $1" --backtitle "$backtitle" --menu "\n$infos" 10 60 16) @@ -547,28 +547,6 @@ check_partitions() DISK_ROOT_PART=${PartitionOptions[(2*$PartitionChoices)-1]} } -# choose target NVMe partition. -check_nvme_target() -{ - IFS=" " - NVMeTargets=$(awk '/nvme0n1p/ {print "/dev/"$4}' /dev/null 2>&1 - gdisk /dev/$nvmecheck - fi - NVMeTargets=$(awk '/nvme0n1p/ {print "/dev/"$4}' &1 >/dev/tty) - - [[ $? -ne 0 ]] && exit 12 - DISK_ROOT_PART=${NVMeOptions[(2*$NVMeChoices)-1]} -} - # build and update new bootscript update_bootscript() {