diff --git a/src/minimal_rootfs/etc/03_init.sh b/src/minimal_rootfs/etc/03_init.sh index b518bd7e0..6e6f96ed8 100755 --- a/src/minimal_rootfs/etc/03_init.sh +++ b/src/minimal_rootfs/etc/03_init.sh @@ -37,8 +37,8 @@ # # exec /sbin/init -# Set cyan color. -echo -en "\\e[36m" +# Set white color. +echo -en "\\e[1m" # Print message on screen. cat << CEOF @@ -60,14 +60,24 @@ if [ "$key" = "" ] ; then echo "Executing /sbin/init as PID 1." exec /sbin/init else + # Set white color. + echo -en "\\e[1m" + # Print message on screen. cat << CEOF This is PID 1 rescue shell outside of the initramfs area. Execute the following in order to continue with the system initialization: +CEOF + # Set green color. + echo -en "\\e[32m" + + cat << CEOF exec /sbin/init CEOF + # Unset all attributes. + echo -en "\\e[0m" if [ "$PID1_SHELL" = "true" ] ; then # PID1_SHELL flag is set which means we have controlling terminal. diff --git a/src/minimal_rootfs/etc/04_bootscript.sh b/src/minimal_rootfs/etc/04_bootscript.sh index eca525462..1799cbde1 100755 --- a/src/minimal_rootfs/etc/04_bootscript.sh +++ b/src/minimal_rootfs/etc/04_bootscript.sh @@ -26,7 +26,7 @@ # | # +--(2) /bin/sh (Alt + F4) -echo -e "\\e[32mWelcome to \"Minimal Linux Live\" \\e[35m(/sbin/init)\\e[0m" +echo -e "Welcome to \\e[1mMinimal \\e[32mLinux \\e[31mLive\\e[0m (/sbin/init)" for DEVICE in /sys/class/net/* ; do echo "Found network device ${DEVICE##*/}" diff --git a/src/minimal_rootfs/etc/inittab b/src/minimal_rootfs/etc/inittab index c7a19d609..d1645d41a 100644 --- a/src/minimal_rootfs/etc/inittab +++ b/src/minimal_rootfs/etc/inittab @@ -1,13 +1,13 @@ ::sysinit:/etc/04_bootscript.sh ::restart:/sbin/init -::shutdown:echo -e "\n\\e[35mSync all file buffers...\\e[0m" +::shutdown:echo "\nSync all file buffers..." ::shutdown:sync -::shutdown:echo -e "\\e[35mUnmount all filesystems...\\e[0m" +::shutdown:echo "Unmount all filesystems..." ::shutdown:umount -a -r -::shutdown:echo -e "\n\\e[32mSee you soon! :)\\e[0m\n" +::shutdown:echo -e "\n \\e[1mSee you soon!\\e[0m\n" ::shutdown:sleep 1 ::ctrlaltdel:/sbin/reboot -::once:/etc/welcome.sh 0 +::once:cat /etc/welcome.txt ::respawn:/bin/cttyhack /bin/sh tty2::once:cat /etc/welcome.txt tty2::respawn:/bin/sh diff --git a/src/minimal_rootfs/etc/welcome.sh b/src/minimal_rootfs/etc/welcome.sh deleted file mode 100755 index e76ac044c..000000000 --- a/src/minimal_rootfs/etc/welcome.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Set cyan color. -echo -en "\\e[$1m" - -cat /etc/welcome.txt - -# Unset all attributes. -echo -en "\\e[0m" - diff --git a/src/minimal_rootfs/etc/welcome.txt b/src/minimal_rootfs/etc/welcome.txt index 37042c691..e39d1bfa7 100644 --- a/src/minimal_rootfs/etc/welcome.txt +++ b/src/minimal_rootfs/etc/welcome.txt @@ -1,7 +1,7 @@ - - ##################################### - # # - # Welcome to "Minimal Linux Live" # - # # - ##################################### - + + ################################### + # # + # Welcome to Minimal Linux Live # + # # + ################################### + diff --git a/src/minimal_rootfs/init b/src/minimal_rootfs/init index 67ce764e9..4f5cc2939 100755 --- a/src/minimal_rootfs/init +++ b/src/minimal_rootfs/init @@ -26,13 +26,13 @@ # | # +--(2) /bin/sh (Alt + F4) -echo -e "\\e[32mWelcome to \"Minimal Linux Live\" \\e[35m(/init)\\e[0m" +echo -e "Welcome to \\e[1mMinimal \\e[32mLinux \\e[31mLive\\e[0m (/init)" # Let's mount all core file systems. /etc/01_prepare.sh -# Set cyan color. -echo -en "\\e[36m" +# Set white color. +echo -en "\\e[1m" # Print message on screen. cat << CEOF @@ -46,24 +46,43 @@ CEOF # Unset all attributes. echo -en "\\e[0m" - # Wait 5 second or until any keybord key is pressed. read -t 5 -n1 -s key if [ ! "$key" = "" ] ; then + # Set white color. + echo -en "\\e[1m" + # Print message on screen. cat << CEOF This is PID 1 rescue shell inside the initramfs area. Execute the following in order to continue with the overlay initialization process: - + +CEOF + # Set green color. + echo -en "\\e[32m" + + cat << CEOF exec /etc/02_overlay.sh +CEOF + # Set white color. + echo -en "\\e[0m\\e[1m" + + cat << CEOF Execute the following in order to skip the overlay initialization and continue directly with the system initialization: - exec /sbin/init - CEOF + # Set green color. + echo -en "\\e[32m" + + cat << CEOF + exec /sbin/init + +CEOF + # Unset all attributes. + echo -en "\\e[0m" # Set flag which indicates that we have obtained controlling terminal. export PID1_SHELL=true