enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backward compatibility fixes

Browse Source
This commit is contained in:
zador-blood-stained 2016-10-19 19:50:21 +03:00
parent b14da27a41
commit 718ecc5e0d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debootstrap-ng.sh
View File

@ -391,7 +391,7 @@ prepare_partitions()
[[ $CONTAINER_COMPAT == yes ]] && mknod -m0660 $LOOPp${rootpart} b 259 ${rootpart} > /dev/null
mkfs.${mkfs[$ROOTFS_TYPE]} ${mkopts[$ROOTFS_TYPE]} ${LOOP}p${rootpart}
[[ $ROOTFS_TYPE == ext4 ]] && tune2fs -o journal_data_writeback ${LOOP}p${rootpart} > /dev/null
[[ $ROOTFS_TYPE == btrfs ]] && fscreateopt="-o compress=zlib"
[[ $ROOTFS_TYPE == btrfs ]] && local fscreateopt="-o compress=zlib"
mount ${fscreateopt} ${LOOP}p${rootpart} $CACHEDIR/mount/
local rootfs="UUID=$(blkid -s UUID -o value ${LOOP}p${rootpart})"
echo "$rootfs / ${mkfs[$ROOTFS_TYPE]} defaults,noatime,nodiratime${mountopts[$ROOTFS_TYPE]} 0 1" >> $CACHEDIR/sdcard/etc/fstab

6
scripts/armhwinfo
View File

@ -257,7 +257,8 @@ case $1 in
log_hardware_info
# crash detection, enable verbose logging and disable it at clean shutdown
sed -i "s/^verbosity=1/verbosity=7/" /boot/armbianEnv.txt && sync &
[[ -f /boot/armbianEnv.txt ]] && sed -i "s/^verbosity=.*/verbosity=7/" /boot/armbianEnv.txt && sync &
touch /boot/.verbose
;;
query)
# armbianmonitor mode -- only interested in hardware info
@ -268,7 +269,8 @@ case $1 in
*stop*)
# set verbosity=1 only if set to 7 and /boot/.force-verbose doesn't exist.
if [ ! -f /boot/.force-verbose ]; then
sed -i "s/^verbosity=7/verbosity=1/" /boot/armbianEnv.txt && sync
[[ -f /boot/armbianEnv.txt ]] && sed -i "s/^verbosity=.*/verbosity=1/" /boot/armbianEnv.txt && sync
rm /boot/.verbose
fi
case ${LINUXFAMILY} in
sun?i)