GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-27 08:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfixes and remove unused function in nand-sata-install

Browse source
This commit is contained in:
ThomasKaiser 2019-03-08 17:58:46 +01:00
parent 71e7ad2e02
commit 59e8085ca1
1 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
packages/bsp/common/usr/sbin/nand-sata-install
View file

@ -128,7 +128,7 @@ create_armbian()
lsof / | awk 'NR==1 || $4~/[0-9][uw]/' | grep -v "^COMMAND" >> $logfile 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 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 "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 pkill dhclient 2>/dev/null
LANG=C echo -e "\n\nChecking again for open files:" >> $logfile LANG=C echo -e "\n\nChecking again for open files:" >> $logfile
lsof / | awk 'NR==1 || $4~/[0-9][uw]/' | grep -v "^COMMAND" >> $logfile lsof / | awk 'NR==1 || $4~/[0-9][uw]/' | grep -v "^COMMAND" >> $logfile
@ -426,7 +426,7 @@ format_emmc()
IFS=" " IFS=" "
BTRFS=$(grep -o btrfs /proc/filesystems) BTRFS=$(grep -o btrfs /proc/filesystems)
FilesystemTargets="1 ext4 2 ext3 3 ext2 4 f2fs" 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) FilesystemOptions=($FilesystemTargets)
FilesystemCmd=(dialog --title "Select filesystem type for eMMC $1" --backtitle "$backtitle" --menu "\n$infos" 10 60 16) 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]} DISK_ROOT_PART=${PartitionOptions[(2*$PartitionChoices)-1]}
} }
# choose target NVMe partition.
check_nvme_target()
{
IFS=" "
NVMeTargets=$(awk '/nvme0n1p/ {print "/dev/"$4}' </proc/partitions | nl | xargs echo -n)
if [[ -z $NVMeTargets ]]; then
dialog --title "$title" --backtitle "$backtitle" --colors --msgbox \
'\n\Z1There are no available partitions. Please create them.\Zn' 7 60
# We need gdisk for proper partition alignment
apt-get -y -q install gdisk >/dev/null 2>&1
gdisk /dev/$nvmecheck
fi
NVMeTargets=$(awk '/nvme0n1p/ {print "/dev/"$4}' </proc/partitions | nl | xargs echo -n)
NVMeOptions=($NVMeTargets)
NVMeCmd=(dialog --title 'Select destination:' --backtitle "$backtitle" --menu "\n$infos" 10 60 16)
NVMeChoices=$("${NVMeCmd[@]}" "${NVMeOptions[@]}" 2>&1 >/dev/tty)
[[ $? -ne 0 ]] && exit 12
DISK_ROOT_PART=${NVMeOptions[(2*$NVMeChoices)-1]}
}
# build and update new bootscript # build and update new bootscript
update_bootscript() update_bootscript()
{ {