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

diff --git a/functions b/functions
index 2c819fa..8f39d40 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"
@@ -86,6 +92,9 @@ EOF
 
 # Setup the network namespace for the given $CABLES
 # $1=netns ( $2="br=mac" .. )
+# br is optional, mac is optional.
+# If mac is .N then it's taken as vlan tag on prior outer interface
+# (with ifup configuration) and the inner interface is left alone.
 setup_veth_cables() {
     local NETNS BR IF MAC C i ADD
     NETNS="$1"
@@ -94,14 +103,29 @@ setup_veth_cables() {
     for C in "$@" ; do
 	IF=$NETNS$i
 	MAC="${C#*=}"
-	[ -z "$MAC" ] || MAC="address $MAC"
-	ip link add $IF type veth peer name eth$i $MAC netns $NETNS
-	ip link set $IF up
+        if ip link show $IF > /dev/null 2>&1 ; then
+           : # The interface exists already (bad badness); let things fail
+        elif ifquery --state $IF >/dev/null 2>&1 ; then
+            # doesn't exist but has residue state; quiet cleanup
+            ifdown -f $IF > /dev/null 2>&1
+        fi
+	if [ -z "$MAC" ] ; then
+	    # set up veth with "random" mac address
+	    ip link add $IF type veth peer name eth$i netns $NETNS
+	elif [ -z "${MAC%%.*}" ] ; then
+	    # set up a host vlan with specified tag on previous eth 
+	    i=$((i-1))
+	    IF=$NETNS$i$MAC
+	    ifup $IF
+ 	else
+	    # set up veth with specified mac address
+	    ip link add $IF type veth peer name eth$i address $MAC netns $NETNS
+	fi
 	BR="${C%=*}"
 	if [ -z "$BR" ] ; then
-	    ip link set $IF
-	    ifup $IF
+	    ifup $IF || ip link set $IF up
 	else
+	    ip link set $IF up
 	    brctl addif $BR $IF
 	fi
 	i=$((i+1))
@@ -145,9 +169,20 @@ setup_overlay() {
     elif [ "$LIVE" != "$UPPER" ] ; then
 	# With UPPER = LOWER we rather make a bind mount to LIVE
 	env CONFIG="$CONFIG" $PREMOUNT "$UPPER"
-	mount --bind $UPPER $LOWER
+	mount --bind $UPPER $LIVE
     fi
 
+    grep ^SHARE= "$CONFIG" | while read A ; do
+        B="$(echo ${A#SHARE=})"
+        D="$(realpath "$B")"
+        [ "$D" = "$LOWER" ] && continue
+        if [ -d "$D" ] ; then
+            echo bind mount $D onto $LIVE$B
+            mkdir -p $LIVE$D
+            mount --bind $D $LIVE$B
+        fi
+    done
+
     env CONFIG="$CONFIG" $POSTMOUNT "LIVE" "$UPPER" 
 }
 
@@ -164,3 +199,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
+}