brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2025-01-03 10:00:07 +09:00
Code Issues Projects Releases Wiki Activity

Mods to support new serial device alias in cmdline.txt.

Browse Source
This commit is contained in:
spl 2016-02-23 14:20:45 +00:00 committed by Serge Schneider
parent 1e2ced32b8
commit acfd7db900
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
raspi-config
View File

@ -677,7 +677,7 @@ do_i2c() {
do_serial() { do_serial() {
DEFAULT= DEFAULT=
if ! grep -q "console=ttyAMA0" /boot/cmdline.txt; then if ! grep -q "console=ttyAMA0" /boot/cmdline.txt && ! grep -q "console=serial0" /boot/cmdline.txt ; then
DEFAULT=--defaultno DEFAULT=--defaultno
fi fi
@ -693,6 +693,7 @@ do_serial() {
sed -i /etc/inittab -e "s|^.*:.*:respawn:.*ttyAMA0|#&|" sed -i /etc/inittab -e "s|^.*:.*:respawn:.*ttyAMA0|#&|"
fi fi
sed -i /boot/cmdline.txt -e "s/console=ttyAMA0,[0-9]\+ //" sed -i /boot/cmdline.txt -e "s/console=ttyAMA0,[0-9]\+ //"
sed -i /boot/cmdline.txt -e "s/console=serial0,[0-9]\+ //"
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "Serial is now disabled" 20 60 1 whiptail --msgbox "Serial is now disabled" 20 60 1
fi fi
@ -703,8 +704,16 @@ do_serial() {
printf "T0:23:respawn:/sbin/getty -L ttyAMA0 115200 vt100\n" >> /etc/inittab printf "T0:23:respawn:/sbin/getty -L ttyAMA0 115200 vt100\n" >> /etc/inittab
fi fi
fi fi
if ! grep -q "console=ttyAMA0" /boot/cmdline.txt; then if grep -q "console=ttyAMA0" /boot/cmdline.txt ; then
if [ -e /proc/device-tree/aliases/serial0 ]; then
sed -i /boot/cmdline.txt -e "s/console=ttyAMA0/console=serial0/"
fi
elif ! grep -q "console=ttyAMA0" /boot/cmdline.txt && ! grep -q "console=serial0" /boot/cmdline.txt ; then
if [ -e /proc/device-tree/aliases/serial0 ]; then
sed -i /boot/cmdline.txt -e "s/root=/console=serial0,115200 root=/"
else
sed -i /boot/cmdline.txt -e "s/root=/console=ttyAMA0,115200 root=/" sed -i /boot/cmdline.txt -e "s/root=/console=ttyAMA0,115200 root=/"
fi
fi fi
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "Serial is now enabled" 20 60 1 whiptail --msgbox "Serial is now enabled" 20 60 1