brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2025-11-04 14:38:36 +09:00
Code Issues Projects Releases Wiki Activity

Splash screen switching made more error-tolerant.

Browse Source
This commit is contained in:
Simon Long
2016-10-11 09:33:02 +00:00
parent 7dae58a9cb
commit f7b7829def
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
raspi-config
View File

@@ -7,6 +7,7 @@ INTERACTIVE=True
ASK_TO_REBOOT=0 ASK_TO_REBOOT=0
BLACKLIST=/etc/modprobe.d/raspi-blacklist.conf BLACKLIST=/etc/modprobe.d/raspi-blacklist.conf
CONFIG=/boot/config.txt CONFIG=/boot/config.txt
CMDLINE=/boot/cmdline.txt
is_pione() { is_pione() {
if grep -q "^Revision\s*:\s*00[0-9a-fA-F][0-9a-fA-F]$" /proc/cpuinfo; then if grep -q "^Revision\s*:\s*00[0-9a-fA-F][0-9a-fA-F]$" /proc/cpuinfo; then
@@ -722,15 +723,15 @@ 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" $CMDLINE ; then
if [ -e /proc/device-tree/aliases/serial0 ]; then if [ -e /proc/device-tree/aliases/serial0 ]; then
sed -i /boot/cmdline.txt -e "s/console=ttyAMA0/console=serial0/" sed -i $CMDLINE -e "s/console=ttyAMA0/console=serial0/"
fi fi
elif ! grep -q "console=ttyAMA0" /boot/cmdline.txt && ! grep -q "console=serial0" /boot/cmdline.txt ; then elif ! grep -q "console=ttyAMA0" $CMDLINE && ! grep -q "console=serial0" $CMDLINE ; then
if [ -e /proc/device-tree/aliases/serial0 ]; then if [ -e /proc/device-tree/aliases/serial0 ]; then
sed -i /boot/cmdline.txt -e "s/root=/console=serial0,115200 root=/" sed -i $CMDLINE -e "s/root=/console=serial0,115200 root=/"
else else
sed -i /boot/cmdline.txt -e "s/root=/console=ttyAMA0,115200 root=/" sed -i $CMDLINE -e "s/root=/console=ttyAMA0,115200 root=/"
fi fi
fi fi
set_config_var enable_uart 1 $CONFIG set_config_var enable_uart 1 $CONFIG
@@ -739,8 +740,8 @@ do_serial() {
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 /boot/cmdline.txt -e "s/console=ttyAMA0,[0-9]\+ //" sed -i $CMDLINE -e "s/console=ttyAMA0,[0-9]\+ //"
sed -i /boot/cmdline.txt -e "s/console=serial0,[0-9]\+ //" sed -i $CMDLINE -e "s/console=serial0,[0-9]\+ //"
set_config_var enable_uart 0 $CONFIG set_config_var enable_uart 0 $CONFIG
STATUS=disabled STATUS=disabled
else else
@@ -925,7 +926,7 @@ EOF
} }
get_boot_splash() { get_boot_splash() {
if grep -q "splash" /boot/cmdline.txt; then if grep -q "splash" $CMDLINE ; then
echo 0 echo 0
else else
echo 1 echo 1
@@ -948,13 +949,15 @@ do_boot_splash() {
RET=$1 RET=$1
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
if ! grep -q "splash" /boot/cmdline.txt; then if ! grep -q "splash" $CMDLINE ; then
sed -i /boot/cmdline.txt -e "s/rootwait/rootwait quiet splash plymouth.ignore-serial-consoles/" sed -i $CMDLINE -e "s/$/ quiet splash plymouth.ignore-serial-consoles/"
fi fi
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
if grep -q "splash" /boot/cmdline.txt; then if grep -q "splash" $CMDLINE ; then
sed -i /boot/cmdline.txt -e "s/rootwait quiet splash plymouth.ignore-serial-consoles/rootwait/" sed -i $CMDLINE -e "s/ quiet//"
sed -i $CMDLINE -e "s/ splash//"
sed -i $CMDLINE -e "s/ plymouth.ignore-serial-consoles//"
fi fi
STATUS=disabled STATUS=disabled
else else