[ bugfix ] Fixing default Chromium preferences file https://forum.armbian.com/topic/3327-asus-tinkerboard/?do=findComment&comment=65807 and adding optional DEFAULT_CONSOLE variable which can override default console settings per board

This commit is contained in:
Igor Pecovnik
2018-11-15 19:03:57 +01:00
parent 8edf8c56a8
commit e7657a5991
5 changed files with 12 additions and 7 deletions

View File

@@ -7,6 +7,7 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir xradio_wlan g_serial xradio_wla
MODULES_NEXT="g_serial"
MODULES_BLACKLIST="dhd"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
DEFAULT_CONSOLE="serial"
CPUMIN=240000
CPUMAX=1200000
BUILD_DESKTOP="no"

View File

@@ -227,7 +227,7 @@ for line in "${buildlist[@]}"; do
MODULES_BLACKLIST_DEV MOUNT SDCARD BOOTPATCHDIR KERNELPATCHDIR buildtext RELEASE IMAGE_TYPE OVERLAY_PREFIX ASOUND_STATE \
ATF_COMPILER ATF_USE_GCC ATFSOURCE ATFDIR ATFBRANCH ATFSOURCEDIR PACKAGE_LIST_RM NM_IGNORE_DEVICES DISPLAY_MANAGER family_tweaks_bsp_s \
CRYPTROOT_ENABLE CRYPTROOT_PASSPHRASE CRYPTROOT_SSH_UNLOCK CRYPTROOT_SSH_UNLOCK_PORT CRYPTROOT_SSH_UNLOCK_KEY_NAME ROOT_MAPPER \
NETWORK HDMI USB WIRELESS ARMBIANMONITOR
NETWORK HDMI USB WIRELESS ARMBIANMONITOR DEFAULT_CONSOLE
read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line
n=$[$n+1]

View File

@@ -480,13 +480,13 @@ prepare_partitions()
[[ -f $SDCARD/boot/armbianEnv.txt ]] && rm $SDCARD/boot/armbianEnv.txt
fi
# if we have a headless device, set console to serial
if [[ $BUILD_DESKTOP == "no" ]]; then
# if we have a headless device, set console to DEFAULT_CONSOLE
if [[ -n $DEFAULT_CONSOLE && -f $SDCARD/boot/armbianEnv.txt ]]; then
if grep -lq "^console=" $SDCARD/boot/armbianEnv.txt; then
sed -i "s/console=.*/console=serial/" $SDCARD/boot/armbianEnv.txt
else
echo "console=serial" >> $SDCARD/boot/armbianEnv.txt
fi
sed -i "s/console=.*/console=$DEFAULT_CONSOLE/" $SDCARD/boot/armbianEnv.txt
else
echo "console=$DEFAULT_CONSOLE" >> $SDCARD/boot/armbianEnv.txt
fi
fi
# recompile .cmd to .scr if boot.cmd exists

View File

@@ -210,6 +210,10 @@ create_board_package()
mv /etc/default/armbian-zram-config.dpkg-dist /etc/default/armbian-zram-config
fi
if [ -L "/usr/lib/chromium-browser/master_preferences.dpkg-dist" ]; then
mv /usr/lib/chromium-browser/master_preferences.dpkg-dist /usr/lib/chromium-browser/master_preferences
fi
systemctl --no-reload enable armbian-hardware-monitor.service armbian-hardware-optimize.service armbian-zram-config.service >/dev/null 2>&1
exit 0
EOF