refactoring for more flexible config

diff --git a/Makefile b/Makefile
index aee4b759a6d4f50e93db971d8a67a3df95853497..4b77ede4132024b6d1a1d7bef748aabbaeacfc70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ MAN1FILES =
 MAN8FILES = overlay-boot.8 overlay-go.8 overlay-stop.8
 HTMLDOC = $(MAN8FILES:%=%.html)
 VARLIBFILES = overlay-boot overlay-go overlay-stop functions reaper
+VARLIBFILES += overlay-init overlay-postmount overlay-premount
 
 all: asm/reaper
 

diff --git a/functions b/functions
index 2c819fae3454b4ab96854aa508cb2c16a8657511..45a634a1e575395e86c8457b342e3b2a39d5cc98 100644 (file)
--- a/functions
+++ b/functions
@@ -31,7 +31,7 @@ subhost_config() {
     config UPPER "$BASE/root"
     config WORK "$BASE/work"
     config LOWER "/"
-    config START "!networking ssh"
+    config START "networking ssh"
     config PREMOUNT "$PROGRAMDIR/overlay-premount"
     config POSTMOUNT "$PROGRAMDIR/overlay-postmount"
     config INIT "$PROGRAMDIR/overlay-init"

diff --git a/overlay-boot b/overlay-boot
index d635da4347739db34020cd6856382d5c6f7827f9..44bc76f0ec71873e73167f347bbb988dc3533dbd 100755 (executable)
--- a/overlay-boot
+++ b/overlay-boot
@@ -4,6 +4,7 @@
 # configuration file named on the command line.
 # See "man overlay-boot" for details.
 
+set -x
 PROGRAMDIR="$(dirname $(realpath $0))"
 . $PROGRAMDIR/functions
 

diff --git a/overlay-boot.8.adoc b/overlay-boot.8.adoc
index 9e39eec327e53c1c09e2c492f951f8a44de39095..932cae0b8310cf4e3bb6a57061d374b4ea42a930 100644 (file)
--- a/overlay-boot.8.adoc
+++ b/overlay-boot.8.adoc
@@ -178,6 +178,7 @@ EXAMPLES
 ./opt/subhost/mta/mta.conf
 ****
 BASE=.
+CABLES= =
 START= rsyslog newtorking ssh postfix
 ****
 
@@ -185,5 +186,11 @@ The above example assumes a directory +/opt/subhost/mta+ that contains
 the configuration file +mta.conf+ and directories +root+, +work+ and
 +live+. *overlay-boot* will set up an overlay mount on +live+ with
 +root+ as UPPER, +work+ as WORK and +/+ as LOWER, i.e. an overlay of
-the main host filesystem.
+the main host filesystem. Further, the running subhost will feature a
+virtual cable to the main host, where the subhost end is named +eth0+
+and the main host end is named +mta0+, and upon start, an +ifup mta0+
+is attempted at the host end while the subhost end is handled via its
+neworking service.
+
+