diff --git a/FunKey/board/funkey/rootfs-overlay/etc/inittab b/FunKey/board/funkey/rootfs-overlay/etc/inittab index 119c823..8f243ad 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/inittab +++ b/FunKey/board/funkey/rootfs-overlay/etc/inittab @@ -27,13 +27,12 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr ::sysinit:/bin/hostname -F /etc/hostname ::sysinit:/sbin/syslogd ::sysinit:/sbin/klogd + # now run any rc scripts ::sysinit:/etc/init.d/rcS -# Put a getty on the serial port -#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL -#ttyS0::respawn:/sbin/getty -L -n -l /loginroot.sh ttyS0 115200 vt100 # GENERIC_SERIAL -::respawn:-/bin/sh +# Start an automatic root login on the console +::respawn:-/bin/login -f root # Stuff to do for the 3-finger salute #::ctrlaltdel:/sbin/reboot diff --git a/FunKey/board/funkey/rootfs-overlay/root/.bashrc b/FunKey/board/funkey/rootfs-overlay/root/.bashrc deleted file mode 100755 index b3e270c..0000000 --- a/FunKey/board/funkey/rootfs-overlay/root/.bashrc +++ /dev/null @@ -1,74 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. - -# Note: PS1 and umask are already set in /etc/profile. You should not -# need this unless you want different defaults for root. -# PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ ' -# umask 022 - -# You may uncomment the following lines if you want `ls' to be colorized: -export TERM=xterm -export LS_OPTIONS='--color=auto' -eval "`dircolors`" -alias ls='ls $LS_OPTIONS' -alias ll='ls $LS_OPTIONS -l' -alias l='ls $LS_OPTIONS -lA' -# -# Some more alias to avoid making mistakes: -# alias rm='rm -i' -# alias cp='cp -i' -# alias mv='mv -i' - -# Resize the console to the terminal dimensions -resize() { - if [[ -t 0 && $# -eq 0 ]]; then - local IFS='[;' escape geometry x y - echo -ne '\e7\e[r\e[999;999H\e[6n\e8' - read -sd R escape geometry - x=${geometry##*;} y=${geometry%%;*} - if [[ ${COLUMNS} -eq ${x} && ${LINES} -eq ${y} ]]; then - echo "${TERM} ${x}x${y}" - else - echo "${COLUMNS}x${LINES} -> ${x}x${y}" - stty cols ${x} rows ${y} - fi - else - print 'Usage: resize' - fi -} - -# Mount /dev/mmcblk0p1 in /boot -echo "Mount /dev/mmcblk0p1 in /boot" -mount /dev/mmcblk0p1 /boot/ >/dev/null 2>&1 - -# Start ampli if necessary -echo "Start ampli if necessary" -if [[ "$(volume_get)" -ne "0" ]]; then - start_audio_amp 1 >/dev/null 2>&1 -fi - -# Force unmute sound card and reset volume -echo "Force unmute sound card and reset volume" -volume_set $(volume_get) >/dev/null 2>&1 - -# Reset saved brightness -echo "Reset saved brightness" -brightness_set $(brightness_get) >/dev/null 2>&1 - -# Enable USB gadget share and internet forwarding over USB -share init& - -# Start launcher -echo "Start launcher" -start_launcher >/dev/null 2>&1 & - -# Init GPIO manager -echo "Init GPIO manager" -PREVENT_GPIOMNG_FILE=/mnt/prevent_gpiomanager -PREVENT_GPIOMNG_FILE2=/boot/prevent_gpiomanager -if [ -f $PREVENT_GPIOMNG_FILE ]; then - echo "Found file: $PREVENT_GPIOMNG_FILE, not launching gpio manager" -elif [ -f $PREVENT_GPIOMNG_FILE2 ]; then - echo "Found file: $PREVENT_GPIOMNG_FILE2, not launching gpio manager" -else - start_gpio_manager >/dev/null 2>&1 & -fi diff --git a/FunKey/board/funkey/rootfs-overlay/root/.profile b/FunKey/board/funkey/rootfs-overlay/root/.profile index 1a79163..79a8850 100755 --- a/FunKey/board/funkey/rootfs-overlay/root/.profile +++ b/FunKey/board/funkey/rootfs-overlay/root/.profile @@ -36,39 +36,20 @@ resize() { fi } -# Mount /dev/mmcblk0p1 in /boot -#echo "Mount /dev/mmcblk0p1 in /boot" -#mount /dev/mmcblk0p1 /boot/ >/dev/null 2>&1 - # Start ampli if necessary -#echo "Start ampli if necessary" +echo "Start audio amplifier if necessary" if [[ "$(volume_get)" -ne "0" ]]; then start_audio_amp 1 >/dev/null 2>&1 fi # Force unmute sound card and reset volume -#echo "Force unmute sound card and reset volume" +echo "Force unmute sound card and reset volume" volume_set $(volume_get) >/dev/null 2>&1 # Reset saved brightness -#echo "Reset saved brightness" +echo "Reset saved brightness" brightness_set $(brightness_get) >/dev/null 2>&1 -# Enable USB gadget share and internet forwarding over USB -share init& - # Start launcher -#echo "Start launcher" +echo "Start launcher" start_launcher >/dev/null 2>&1 & - -# Init GPIO manager -#echo "Init GPIO manager" -PREVENT_GPIOMNG_FILE=/mnt/prevent_gpiomanager -PREVENT_GPIOMNG_FILE2=/boot/prevent_gpiomanager -if [ -f $PREVENT_GPIOMNG_FILE ]; then - echo "Found file: $PREVENT_GPIOMNG_FILE, not launching gpio manager" -elif [ -f $PREVENT_GPIOMNG_FILE2 ]; then - echo "Found file: $PREVENT_GPIOMNG_FILE2, not launching gpio manager" -else - start_gpio_manager >/dev/null 2>&1 & -fi