From 718ecc5e0dbdd2b805c8b9f4b23acb63996a7dc0 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 19 Oct 2016 19:50:21 +0300 Subject: [PATCH] Backward compatibility fixes --- debootstrap-ng.sh | 2 +- scripts/armhwinfo | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index 7536b686f5..99ee8aea29 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -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 diff --git a/scripts/armhwinfo b/scripts/armhwinfo index 042c7beed6..d1c1c4e8e2 100644 --- a/scripts/armhwinfo +++ b/scripts/armhwinfo @@ -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)