From 090cc988b2b36fecdcc12addf236f5e477e70b36 Mon Sep 17 00:00:00 2001
From: Ivan Davidov <davidov.i@gmail.com>
Date: Mon, 4 Dec 2017 02:57:06 +0200
Subject: [PATCH] Updates on the bundle boot messages.

---
 .../bundles/dropbear/20_dropbear.sh            | 10 ++++------
 src/minimal_overlay/bundles/kbd/90_kbd.sh      | 18 +++++++-----------
 .../bundles/mll_source/90_src.sh               |  9 +++++++++
 .../bundles/mll_source/bundle.sh               |  6 ++++++
 src/minimal_overlay/bundles/nweb/90_nweb.sh    | 10 ++++------
 5 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100755 src/minimal_overlay/bundles/mll_source/90_src.sh

diff --git a/src/minimal_overlay/bundles/dropbear/20_dropbear.sh b/src/minimal_overlay/bundles/dropbear/20_dropbear.sh
index fac416202..e393c2dce 100755
--- a/src/minimal_overlay/bundles/dropbear/20_dropbear.sh
+++ b/src/minimal_overlay/bundles/dropbear/20_dropbear.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-cat << CEOF
-
-  Starting Dropbear SSH server.
-
-CEOF
-
 dropbear
+
+cat << CEOF
+  Dropbear SSH server has been started.
+CEOF
diff --git a/src/minimal_overlay/bundles/kbd/90_kbd.sh b/src/minimal_overlay/bundles/kbd/90_kbd.sh
index 61d518a27..7549a0235 100755
--- a/src/minimal_overlay/bundles/kbd/90_kbd.sh
+++ b/src/minimal_overlay/bundles/kbd/90_kbd.sh
@@ -1,22 +1,18 @@
 #!/bin/sh
 
-# This sample command loads German keyboard layout on boot.
-#
-# loadkeys de
+# The default keyboard which is set on boot.
+loadkeys de
 
 cat << CEOF
-
-  The default keyboard layout is English (US). You can
-  change the keyboard layout to German like this:
+  The default keyboard layout is English (US). You can change the keyboard
+  layout to German (for example) like this:
 
     loadkeys de
     
-  You can go back to the original US keyboard layout
-  like this:
+  You can go back to the original US keyboard layout like this:
   
     loadkeys us
     
-  Alternatively, change the file '90_kbd.sh' in the
-  'kbd' bundle and set the layout you want to use.
-
+  Alternatively, change the file '90_kbd.sh' in the 'kbd' bundle and set the
+  keyboard layout you want to use on boot.
 CEOF
diff --git a/src/minimal_overlay/bundles/mll_source/90_src.sh b/src/minimal_overlay/bundles/mll_source/90_src.sh
new file mode 100755
index 000000000..7fe9ee43c
--- /dev/null
+++ b/src/minimal_overlay/bundles/mll_source/90_src.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# This sample command loads German keyboard layout on boot.
+#
+# loadkeys de
+
+cat << CEOF
+  You can find all sources in '/usr/src'.
+CEOF
diff --git a/src/minimal_overlay/bundles/mll_source/bundle.sh b/src/minimal_overlay/bundles/mll_source/bundle.sh
index 442855a22..4cf5f3b25 100755
--- a/src/minimal_overlay/bundles/mll_source/bundle.sh
+++ b/src/minimal_overlay/bundles/mll_source/bundle.sh
@@ -10,6 +10,7 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME
 rm -rf $DEST_DIR
 
 mkdir -p $DEST_DIR/usr/src
+mkdir -p $DEST_DIR/etc/autorun
 
 # Copy all source files and folders to 'work/src'.
 cp $MAIN_SRC_DIR/*.sh $DEST_DIR/usr/src
@@ -20,6 +21,8 @@ cp -r $MAIN_SRC_DIR/minimal_rootfs $DEST_DIR/usr/src
 cp -r $MAIN_SRC_DIR/minimal_overlay $DEST_DIR/usr/src
 cp -r $MAIN_SRC_DIR/minimal_config $DEST_DIR/usr/src
 
+cp $SRC_DIR/90_src.sh $DEST_DIR/etc/autorun
+
 cd $DEST_DIR/usr/src
 
 # Delete the '.gitignore' files which we use in order to keep track of otherwise
@@ -30,6 +33,9 @@ find * -type f -name '.gitignore' -exec rm {} +
 # '$OVERLAY_ROOTFS' will be overwritten correctly.
 cp -r --remove-destination $DEST_DIR/* \
   $OVERLAY_ROOTFS
+cp -r --remove-destination $DEST_DIR/* \
+  $OVERLAY_ROOTFS
+
 
 echo "Bundle '$BUNDLE_NAME' has been installed."
 
diff --git a/src/minimal_overlay/bundles/nweb/90_nweb.sh b/src/minimal_overlay/bundles/nweb/90_nweb.sh
index 0ac3838d8..f58a02a19 100644
--- a/src/minimal_overlay/bundles/nweb/90_nweb.sh
+++ b/src/minimal_overlay/bundles/nweb/90_nweb.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-cat << CEOF
-
-  Starting 'nweb' on port 80. Serving '/srv/www'.
-
-CEOF
-
 nweb 80 /srv/www
+
+cat << CEOF
+  'nweb' has been started on port 80, serving '/srv/www'.
+CEOF