Merge pull request #110 from bauen1/misc-changes

Misc changes - added deps for some bundles, autorun enhancements, host resolution, code refactoring.

src/.config

@@ -248,6 +248,7 @@ COPY_SOURCE_ISO=true
 # fio         - I/O load generator.
 # java        - installs Oracle's JRE or JDK. Manual preparations are required.
 # kbd         - keyboard utilities
+# kexec-tools - execute another kernel from userspace
 # libevent    - event notification library.
 # links       - text browser for the web.
 # lua         - scripting language.

src/00_clean.sh

@@ -1,12 +1,11 @@
 #!/bin/sh
+set -e
 
 echo "*** CLEAN BEGIN ***"
 
 echo "Cleaning up the main work area. This may take a while..."
 rm -rf work
 mkdir work
-
-# -p stops errors if the directory already exists
 mkdir -p source
 
 echo "*** CLEAN END ***"

src/08_prepare_src.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo "*** PREPARE SRC BEGIN ***"
 

src/09_generate_rootfs.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo "*** GENERATE ROOTFS BEGIN ***"
 

src/10_pack_rootfs.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo "*** PACK ROOTFS BEGIN ***"
 

src/11_get_syslinux.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo "*** GET SYSLINUX BEGIN ***"
 

src/README

@@ -69,6 +69,8 @@ Currently available overlay bundles:
                 callback function when a specific event occurs on a file
                 descriptor or after a timeout has been reached.
 
+* kexec-tools - Kexec tools, can be used to boot another kernel from userspace
+
 * Links       - Text based browser. Requires ~1MB additional space. Use the
                 "links" command to activate the browser.
 

src/minimal_overlay/bundles/dhcp/bundle.sh

@@ -13,6 +13,8 @@ DESTDIR="$MAIN_SRC_DIR/work/src/minimal_overlay/rootfs"
 mkdir -p "$DESTDIR"
 
 install -d -m755 "$DESTDIR/etc"
+install -m644 "$SRC_DIR/hosts" "$DESTDIR/etc/hosts"
+install -m644 "$SRC_DIR/nsswitch.conf" "$DESTDIR/etc/nsswitch.conf"
 install -m644 "$SRC_DIR/resolv.conf" "$DESTDIR/etc/resolv.conf"
 install -d -m755 "$DESTDIR/etc/autorun"
 install -m755 "$SRC_DIR/01_network.sh" "$DESTDIR/etc/autorun/01_network.sh"
@@ -22,6 +24,7 @@ install -m755 "$SRC_DIR/05_rc.dhcp" "$DESTDIR/etc/05_rc.dhcp"
 install -d -m755 "$DESTDIR/lib"
 install -m755 "$SYSROOT/lib/libresolv.so.2" "$DESTDIR/lib/libresolv.so.2"
 install -m755 "$SYSROOT/lib/libnss_dns.so.2" "$DESTDIR/lib/libnss_dns.so.2"
+install -m755 "$SYSROOT/lib/libnss_files.so.2" "$DESTDIR/lib/libnss_files.so.2"
 strip -g "$DESTDIR/lib/*" 2>/dev/null
 
 echo "dhcp scripts and libraries have been installed"

src/minimal_overlay/bundles/dhcp/hosts

@@ -0,0 +1,5 @@
+# /etc/hosts
+127.0.0.1	localhost
+
+# ipv6
+::1	localhost ipv6-localhost

src/minimal_overlay/bundles/dhcp/nsswitch.conf

@@ -0,0 +1 @@
+hosts:		files dns

src/minimal_overlay/bundles/dialog/mll_deps

@@ -0,0 +1 @@
+ncurses

src/minimal_overlay/bundles/dropbear/mll_deps

@@ -0,0 +1 @@
+glibc_full

src/minimal_overlay/bundles/nano/mll_deps

@@ -0,0 +1 @@
+ncurses

src/minimal_overlay/bundles/nweb/bundle.sh

@@ -24,7 +24,7 @@ install -m644 "$SRC_DIR/index.html" "$DESTDIR/srv/www/index.html"
 install -m644 "$SRC_DIR/favicon.ico" "$DESTDIR/srv/www/favicon.ico"
 install -d -m755 "$DESTDIR/etc"
 install -d -m755 "$DESTDIR/etc/autorun"
-install -m755 "$SRC_DIR/nweb.sh" "$DESTDIR/etc/autorun/90_nweb.sh"
+install -m755 "$SRC_DIR/90_nweb.sh" "$DESTDIR/etc/autorun/90_nweb.sh"
 
 echo "nweb has been installed."
 echo "It will be autostarted on boot."

src/minimal_overlay/bundles/vim/mll_deps

@@ -0,0 +1 @@
+ncurses

src/minimal_overlay/overlay_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 SRC_DIR=$(pwd)
 

src/minimal_rootfs/etc/04_bootscript.sh

@@ -30,8 +30,10 @@ echo -e "Welcome to \\e[1mMinimal \\e[32mLinux \\e[31mLive\\e[0m (/sbin/init)"
 if [ -d /etc/autorun ] ; then
 for AUTOSCRIPT in /etc/autorun/*
   do
+    if [ -f "$AUTOSCRIPT" ] && [ -x "$AUTOSCRIPT" ]; then
       echo -e "Executing \\e[32m$AUTOSCRIPT\\e[0m in subshell."
-    sh $AUTOSCRIPT
+      $AUTOSCRIPT
+    fi
   done
 fi