.github: try running with older Ubuntu version

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     # Verify we can build on latest Ubuntu with both gcc and clang
     name: ${{ matrix.compiler }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         compiler: [gcc, clang]
@@ -62,7 +62,7 @@ jobs:
         run: |
           ver=$(/tmp/sbin/initctl -V | awk '/Finit.*/ {print $2;}')
           dir=finit-$ver/_build/sub
-          make -j1 distcheck || (cat $dir/test/test-suite.log; false)
+          make -j1 distcheck || (cat $dir/test/setup-root.log; cat $dir/test/test-suite.log; false)
       - name: Upload Test Results
         uses: actions/upload-artifact@v2
         with:

plugins/bootmisc.c

@@ -135,7 +135,7 @@ static void setup(void *arg)
 		ln("/dev/shm", "/run/shm");
 
 		/* compat only, should really be set up by OS/dist */
-		ln("/run", "/var/run");
+		ln("../run", "/var/run");
 	} else {
 		makedir("/var/lock", 1777);
 		makedir("/var/run", 0755);

plugins/sys.c

@@ -160,19 +160,23 @@ static void sys_init(void *arg)
 	char sysdir[MAX_ARG_LEN];
 	char *path;
 
+	_d("Calling mkpath() on sys conds");
 	if (mkpath(pid_runpath(_PATH_CONDSYS, sysdir, sizeof(sysdir)), 0755) && errno != EEXIST) {
 		_pe("Failed creating %s condition directory, %s", COND_SYS, _PATH_CONDSYS);
 		return;
 	}
 
+	_d("Calling realpth() on condsys");
 	path = realpath(_PATH_CONDSYS, NULL);
 	if (!path) {
 		_pe("Cannot figure out real path to %s, aborting", _PATH_CONDSYS);
 		return;
 	}
 
+	_d("Calling iwatch_add()");
 	if (iwatch_add(&iw_sys, path, IN_ONLYDIR))
 		iwatch_exit(&iw_sys);
+	_d("Done.");
 }
 
 static plugin_t plugin = {

test/add-remove-dynamic-service.sh

@@ -3,6 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")
+export DEBUG=1
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
@@ -16,6 +17,11 @@ test_teardown()
 	texec rm -f /test_assets/service.sh
 }
 
+say "Hi, this is /run et al"
+texec sh -c "echo 'ROOT:/bin'; ls -l /bin/; echo 'ROOT:/sbin'; ls -l /sbin/; echo 'ROOT:/run'; ls -l /run/; echo 'ROOT:/run/finit/'; ls -l /run/finit/; echo 'ROOT:/dev'; ls -l /dev/; ps; ls -l /proc/1/fd/"
+say "HUPing PID 1 ..."
+texec sh -c "kill -HUP 1"
+
 say "Test start $(date)"
 
 cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/

test/setup-root.sh

@@ -12,3 +12,13 @@ FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$TENV_ROOT" make -f "$srcdir/ten
 for plugin in tty.so urandom.so rtc.so modprobe.so hotplug.so; do
 	find "$TENV_ROOT" -name $plugin -delete
 done
+
+echo "$TENV_ROOT:"
+ls -l "$TENV_ROOT"
+echo "$TENV_ROOT:/bin"
+ls -l "$TENV_ROOT"/bin
+echo "$TENV_ROOT:/sbin"
+ls -l "$TENV_ROOT"/sbin
+echo "$TENV_ROOT:/var"
+ls -l "$TENV_ROOT"/var/
+

test/tenv/lib.sh

@@ -154,10 +154,11 @@ if [ -n "${DEBUG:-}" ]; then
 	FINIT_ARGS="${FINIT_ARGS:-} finit.debug=on"
 fi
 # shellcheck disable=2086
-"$TEST_DIR/tenv/start.sh" finit ${FINIT_ARGS:-} &
+"$TEST_DIR/tenv/start.sh" finit ${FINIT_ARGS:-} finit.debug=on &
 finit_ppid=$!
 echo "$finit_ppid" > "$TENV_ROOT"/running_test.pid
 
+>&2 echo "Finit runs as PID $finit_ppid outside of container."
 >&2 echo "Hint: Execute 'TENV_ROOT=$TENV_ROOT $TEST_DIR/tenv/enter.sh' to enter the test namespace"
 log "$color_reset" 'Setup of test environment done' ''
 
@@ -169,4 +170,5 @@ fi
 
 #tty=/dev/$(texec cat /sys/class/tty/console/active)
 #texec cat "$tty" &
-#sleep 1
+sleep 5
+