JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Small nand-sata-install logging fix

Browse Source
This commit is contained in:
ThomasKaiser
2017-09-05 05:46:34 -07:00
parent ab786b312f
commit c79cb9e84a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/bootscripts/boot-udoo.cmd
View File

@@ -24,7 +24,7 @@ if test "${console}" = "display" || test "${console}" = "both"; then setenv cons
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttymxc1,115200"; fi
setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
ext4load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd
ext4load mmc 0 ${loadaddr} /boot/zImage || fatload mmc 0 ${loadaddr} zImage

8
packages/bsp/common/usr/sbin/nand-sata-install
View File

@@ -106,7 +106,6 @@ create_armbian()
StopRunningServices "nfs-|smbd|nmbd|winbind|ftpd|netatalk|monit|cron|webmin|rrdcached" >> $logfile
StopRunningServices "log2ram|folder2ram|postgres|mariadb|mysql|postfix|mail|nginx|apache|snmpd" >> $logfile
echo -e "\n" >> $logfile
logfile="/mnt/rootfs/var/log/nand-sata-install.log"
# count files is needed for progress bar
dialog --title "$title" --backtitle "$backtitle" --infobox "\n Counting files ... few seconds." 5 40
@@ -250,6 +249,10 @@ create_armbian()
mkswap /mnt/rootfs/var/swap
fi
LANG=C echo -e "\n$(date): Finished. Files open for write:" >> $logfile
lsof / | awk 'NR==1 || $4~/[0-9][uw]/' >> $logfile
cat $logfile >/mnt/rootfs${logfile}
umountdevice "/dev/sda"
} # create_armbian
@@ -519,9 +522,6 @@ main()
esac
done
LANG=C echo -e "\n$(date): Finished. Files open for write:" >> $logfile
lsof / | awk 'NR==1 || $4~/[0-9][uw]/' >> $logfile
dialog --title "$title" --backtitle "$backtitle" --yes-label "$command" --no-label "Exit" --yesno "\nAll done. $command $REMOVESDTXT" 7 60
[[ $? -eq 0 ]] && "$(echo ${command,,} | sed 's/ //')"
} # main