-
-
Notifications
You must be signed in to change notification settings - Fork 504
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Beta v6.26.3
- Loading branch information
Showing
9 changed files
with
104 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3695,6 +3695,9 @@ _EOF_ | |
|
||
fi | ||
|
||
# https://github.com/MichaIng/DietPi/issues/3031#issuecomment-540477241 | ||
mkdir -p /etc/polkit-1/localauthority/50-local.d | ||
|
||
fi | ||
|
||
fi | ||
|
@@ -16091,13 +16094,42 @@ Do you wish to continue with DietPi as a pure minimal image?'; then | |
# - XU4: HC1/HC2 fail to boot into kernel without: https://github.com/MichaIng/DietPi/issues/2038#issuecomment-416089875 | ||
# - RockPro64: Fails to boot into kernel without | ||
# - NanoPi Neo Air: Required for end users/debugging/setting up WiFi without automation | ||
keep_serial0=1 | ||
if grep -q '^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=1' /DietPi/dietpi.txt && | ||
(( $G_HW_MODEL != 11 && $G_HW_MODEL != 42 && $G_HW_MODEL != 64 )) && | ||
G_WHIP_YESNO 'Serial console is currently enabled, would you like to disable it?\n - Disabling serial console will reduce memory consumption slightly\n - If you are unsure on what serial console is, it is safe to disable it'; then | ||
|
||
/DietPi/dietpi/func/dietpi-set_hardware serialconsole disable | ||
keep_serial0=0 | ||
|
||
fi | ||
|
||
# RPi: Convert "serial0" to its actual symlink target | ||
if (( $G_HW_MODEL < 10 )); then | ||
|
||
if [[ $keep_serial0 == 1 && -L '/dev/serial0' ]]; then | ||
|
||
tty=$(readlink -f /dev/serial0); tty={tty#\/dev\/} | ||
if [[ $(</boot/cmdline.txt) =~ 'serial0' ]]; then | ||
|
||
[[ $(</boot/cmdline.txt) =~ $tty ]] && sed -i "s/[[:blank:]]*console=$tty[^\"[:blank:]]*//" /boot/cmdline.txt || sed -i "s/serial0/$tty" /boot/cmdline.txt | ||
|
||
fi | ||
if [[ -f '/etc/systemd/system/getty.target.wants/[email protected]' ]]; then | ||
|
||
systemctl disable serial-getty@serial0 | ||
systemctl enable serial-getty@$tty | ||
|
||
fi | ||
|
||
else | ||
|
||
/DietPi/dietpi/func/dietpi-set_hardware serialconsole disable serial0 | ||
|
||
fi | ||
|
||
fi | ||
unset keep_serial0 tty | ||
|
||
fi | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
6 | ||
26 | ||
2 | ||
3 |