X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=functions;h=e9111fe08e9c72e6640a7cca20dfe1e1f88b9449;hb=ed11b098bd4dd6e181e5281498e169982144a845;hp=2c819fae3454b4ab96854aa508cb2c16a8657511;hpb=7f766756c6d328a4a8d57a274a215f67376af68d;p=rrq%2Foverlay-boot.git

diff --git a/functions b/functions
index 2c819fa..e9111fe 100644
--- a/functions
+++ b/functions
@@ -3,12 +3,18 @@
 # Rerun with sudo if needed
 [ $(id -u) = 0 ] || exec sudo $0 $@
 
+export ACTION="$(basename $0)"
+
 # Function to write a message and exit with error code
 die() {
     echo "$*" >&2
     exit 1
 }
 
+beginswith() {
+    [ "$1" != "${1#$2}" ]
+}
+
 # Function to setup subhost name and log file
 subhost_name() {
     CONFIG="$1"
@@ -31,7 +37,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"
@@ -148,6 +154,17 @@ setup_overlay() {
 	mount --bind $UPPER $LOWER
     fi
 
+    grep ^SHARE= "$CONFIG" | while read A ; do
+        B="$(echo ${A#SHARE=})"
+        D="$(realpath "$LOWER$B")"
+        [ "$D" = "$LOWER" ] && continue
+        if [ -d "$D" ] ; then
+            echo bind mount $D onto $LIVE$D
+            mkdir -p $LIVE$D
+            mount --bind $D $LIVE$D
+        fi
+    done
+
     env CONFIG="$CONFIG" $POSTMOUNT "LIVE" "$UPPER" 
 }
 
@@ -164,3 +181,14 @@ is_live() {
 list_running() {
     pgrep -a overlay-boot | awk '{print $4}'
 }
+
+# Start cgroup v2 cpuset accounting if enabled.
+# Needs manual enabling, with:
+#    mount -t cgroup2 cgroup2 /sys/fs/cgroup
+setup_cgroup2_accounting() {
+    local NAME="$1" ME="$2"
+    local ACCDIR="$(awk '$3 == "cgroup2" {print $2; exit}' /proc/mounts)"
+    [ -z "$ACCDIR" ] && return 0
+    mkdir -p "$ACCDIR/$NAME"
+    echo "$ME" > $ACCDIR/$NAME/cgroup.procs
+}