diff --git a/LCD35-show b/LCD35-show index 9978443..6e311b2 100755 --- a/LCD35-show +++ b/LCD35-show @@ -36,16 +36,25 @@ sudo cp -rf ./usr/99-calibration.conf-35-90 /etc/X11/xorg.conf.d/99-calibration if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-35.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:35:90:480:320" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -90,6 +99,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -98,8 +108,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/etc/rc_x11.local b/etc/rc_x11.local new file mode 100755 index 0000000..6f4bae8 --- /dev/null +++ b/etc/rc_x11.local @@ -0,0 +1,23 @@ +#!/bin/sh -e +# +# rc.local +# +# This script is executed at the end of each multiuser runlevel. +# Make sure that the script will "exit 0" on success or any other +# value on error. +# +# In order to enable or disable this script just change the execution +# bits. +# +# By default this script does nothing. + +# Print the IP address +_IP=$(hostname -I) || true +if [ "$_IP" ]; then + printf "My IP address is %s\n" "$_IP" +fi + +export FRAMEBUFFER=/dev/fb1 +startx 2> /tmp/log_output.txt & + +exit 0 diff --git a/system_config.sh b/system_config.sh index d953a6e..8c09501 100755 --- a/system_config.sh +++ b/system_config.sh @@ -16,6 +16,7 @@ else hardware_model=255 fi +sudo raspi-config nonint do_boot_behaviour B2 sudo raspi-config nonint do_wayland W1 if [ -f /boot/firmware/config.txt ]; then sudo ln -sf /boot/firmware/config.txt /boot/config.txt