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

Serial shell and hardware now independently switchable.

Browse Source
This commit is contained in:
spl 2017-01-10 18:11:31 +00:00
parent 17a715ad75
commit 8555e8b524
1 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
raspi-config
View File

@ -699,36 +699,46 @@ do_i2c() {
} }
get_serial() { get_serial() {
if grep -q "ttyAMA" $CMDLINE ; then if grep -q -E "console=(serial0|ttyAMA0|ttyS0)" $CMDLINE ; then
if grep -q -E "^enable_uart=0" $CONFIG; then echo 0
echo 1
else
echo 0
fi
else else
if grep -q -E "^enable_uart=1" $CONFIG; then echo 1
echo 0 fi
else }
echo 1
fi get_serial_hw() {
if grep -q -E "^enable_uart=1" $CONFIG ; then
echo 0
elif grep -q -E "^enable_uart=0" $CONFIG ; then
echo 1
elif [ -e /dev/serial0 ] ; then
echo 0
else
echo 1
fi fi
} }
do_serial() { do_serial() {
DEFAULT=--defaultno DEFAULTS=--defaultno
CURRENT=0 DEFAULTH=--defaultno
CURRENTS=0
CURRENTH=0
if [ $(get_serial) -eq 0 ]; then if [ $(get_serial) -eq 0 ]; then
DEFAULT= DEFAULTS=
CURRENT=1 CURRENTS=1
fi
if [ $(get_serial_hw) -eq 0 ]; then
DEFAULTH=
CURRENTH=1
fi fi
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --yesno "Would you like a login shell to be accessible over serial?" $DEFAULT 20 60 2 whiptail --yesno "Would you like a login shell to be accessible over serial?" $DEFAULTS 20 60 2
RET=$? RET=$?
else else
get_init_sys get_init_sys
RET=$1 RET=$1
fi fi
if [ $RET -eq $CURRENT ]; then if [ $RET -eq $CURRENTS ]; then
ASK_TO_REBOOT=1 ASK_TO_REBOOT=1
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
@ -750,20 +760,38 @@ do_serial() {
fi fi
fi fi
set_config_var enable_uart 1 $CONFIG set_config_var enable_uart 1 $CONFIG
STATUS=enabled SSTATUS=enabled
HSTATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
if [ $SYSTEMD -eq 0 ]; then if [ $SYSTEMD -eq 0 ]; then
sed -i /etc/inittab -e "s|^.*:.*:respawn:.*ttyAMA0|#&|" sed -i /etc/inittab -e "s|^.*:.*:respawn:.*ttyAMA0|#&|"
fi fi
sed -i $CMDLINE -e "s/console=ttyAMA0,[0-9]\+ //" sed -i $CMDLINE -e "s/console=ttyAMA0,[0-9]\+ //"
sed -i $CMDLINE -e "s/console=serial0,[0-9]\+ //" sed -i $CMDLINE -e "s/console=serial0,[0-9]\+ //"
set_config_var enable_uart 0 $CONFIG SSTATUS=disabled
STATUS=disabled if [ "$INTERACTIVE" = True ]; then
whiptail --yesno "Would you like the serial port hardware to be enabled?" $DEFAULTH 20 60 2
RET=$?
else
RET=1
fi
if [ $RET -eq $CURRENTH ]; then
ASK_TO_REBOOT=1
fi
if [ $RET -eq 0 ]; then
set_config_var enable_uart 1 $CONFIG
HSTATUS=enabled
elif [ $RET -eq 1 ]; then
set_config_var enable_uart 0 $CONFIG
HSTATUS=disabled
else
return $RET
fi
else else
return $RET return $RET
fi fi
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "The serial interface is $STATUS" 20 60 1 whiptail --msgbox "The serial login shell is $SSTATUS\nThe serial interface is $HSTATUS" 20 60 1
fi fi
} }