X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=functions;h=45a634a1e575395e86c8457b342e3b2a39d5cc98;hb=325fc118fc6a2ad914947cc4ab9464ca5cf94815;hp=1d52d7439d9227bb0c86ebdea25272f8462a2839;hpb=df3ccb2170beff852f8ec7d421709c5e85bafc7d;p=rrq%2Foverlay-boot.git diff --git a/functions b/functions index 1d52d74..45a634a 100644 --- a/functions +++ b/functions @@ -1,32 +1,87 @@ -# This file implements common functions for all boot methods +# This file implements common functions for all boot scripts +# Rerun with sudo if needed +[ $(id -u) = 0 ] || exec sudo $0 $@ + +# Function to write a message and exit with error code die() { echo "$*" >&2 exit 1 } +# Function to setup subhost name and log file +subhost_name() { + CONFIG="$1" + [ -r "$CONFIG" ] || die "Cannot use $CONFIG" + config NAME "$(basename $CONFIG .conf)" + config LOG /tmp/oly-$NAME.log +} + +# Function to set up all subhost configuration +subhost_config() { + + config BASE + BASE="$(cd $(dirname $CONFIG); realpath $BASE)" + [ -z "$BASE" ] && die "BASE is unset; bogus $CONFIG ?" + [ -d "$BASE" ] || die "$BASE is not a directory; bogus $CONFIG ?" + cd "$BASE" || die "$BASE is inaccessible" + + config CABLES "" + config LIVE "$BASE/live" + config UPPER "$BASE/root" + config WORK "$BASE/work" + config LOWER "/" + config START "networking ssh" + config PREMOUNT "$PROGRAMDIR/overlay-premount" + config POSTMOUNT "$PROGRAMDIR/overlay-postmount" + config INIT "$PROGRAMDIR/overlay-init" + config RAM_SIZE 50M +} + +# function to reverse the $* words +reverse() { + local OUT="" + for w in $* ; do OUT="$w $OUT" ; done + echo "${OUT% }" +} + # grab and set a configuration variable # $1 = variable, [ $2 = default .. error otherwise ] config() { - eval $1="$(sed "/^$1=.*/{s|^$1=||;b};d" $CONFIG)" - [ -z "$(eval echo "\$$1")" ] || return 0 - [ $# -lt 2 ] && die "Missing $1=... in $CONFIG" - eval $1="'$2'" - eval echo "$1=\$$1" + local V W + read V <&2 } -# Unless the subhost already has a private /etc/network/interfaces, -# install an "empty" one +# Install a default $1/etc/network/interfaces on the subhost root $1 setup_networking() { - [ -r $UPPER/etc/network/interfaces ] && return 0 - [ "$UPPER/etc/network" = "/etc/network" ] && exit 1 - mkdir -p $UPPER/etc/network - cat < $UPPER/etc/network/interfaces + [ -r $1/etc/network/interfaces ] && return 0 + mkdir -p $1/etc/network + cat <> $1/etc/network/interfaces # Generated for $NAME subhost auto lo iface lo inet loopback EOF - return 1 + for IF in $(ip netns exec $NAME ip link show | grep "^eth") ; do + cat <> $1/etc/network/interfaces + +auto eth$i +iface eth$i inet manual +EOF + done } # Setup the network namespace for the given $CABLES @@ -36,49 +91,76 @@ setup_veth_cables() { NETNS="$1" shift 1 i=0 - ADD=false - setup_networking || ADD=true 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 - $ADD && cat <> $UPPER/etc/network/interfaces - -auto eth$i -iface eth$i inet manual -EOF BR="${C%=*}" - [ -z "$BR" ] || brctl addif $BR $IF + if [ -z "$BR" ] ; then + ip link set $IF + ifup $IF + else + brctl addif $BR $IF + fi i=$((i+1)) done } -REAPER=$(dirname $(realpath $0))/reaper/reaper -# (name live system root work) -# Set up an overlay fmr $name on $live, with a new tmpfs on its /run, +# Set up an overlay for $name on $live, with a new tmpfs on its /run, # and "install" a "reaper" as the upcoming pid 1 setup_overlay() { - set -x - mkdir -p $4/run - mount -t tmpfs -osize=100M tmpfs $4/run - mkdir -p $4/run/lock - grep -q "$1 $2" /proc/mounts || \ - mount -t overlay -olowerdir=$3,upperdir=$4,workdir=$5 $1 $2 || \ - die "Cannot set up the overlay mount $2" - mount --bind $4/run $2/run - cp $REAPER $LIVE/.reaper -} + local NAME="$1" LIVE="$2" LOWER="$3" UPPER="$4" WORK="$5" + + echo setup_overlay "$NAME" "$LIVE" "$LOWER" "$UPPER" "$WORK" + if grep -qE "^[^ ]+ $LIVE " /proc/mounts ; then + die "$LIVE already has a mount" + fi -# Check if $SRV is "live" ; will + [ -d "$UPPER" ] || die "UPPER=$UPPER is not a directory" + [ -d "$LOWER" ] || die "LOWER=LOWPER is not a directory" + [ -d "$LIVE" ] || die "LOWER=LOWPER is not a directory" + [ -x "${PREMOUNT%% *}" ] || die "PREMOUNT=${PREMOUNT%% *} not executable" + [ -f "${PREMOUNT%% *}" ] || die "PREMOUNT='$PREMOUNT' is not a command" + [ -x "${POSTMOUNT%% *}" ] || \ + die "POSTMOUNT=${POSTMOUNT%% *} not executable" + [ -f "${POSTMOUNT%% *}" ] || \ + die "POSTMOUNT='$POSTMOUNT' is not a command" + + # UPPER is the same as LOWER then skip the overlay mount + if [ "$UPPER" != "$LOWER" ] ; then + # sanity check + [ -d "$WORK" ] || die "WORK=$WORK is not a directory" + + env CONFIG="$CONFIG" $PREMOUNT "$UPPER" + + OLY="-olowerdir=$3,upperdir=$UPPER,workdir=$5" + if ! mount -t overlay "$OLY" $1 $2 ; then + umount -R "$UPPER/dev" + umount "$UPPER/run" + die "Cannot set up the overlay mount $2" + fi + elif [ "$LIVE" != "$UPPER" ] ; then + # With UPPER = LOWER we rather make a bind mount to LIVE + env CONFIG="$CONFIG" $PREMOUNT "$UPPER" + mount --bind $UPPER $LOWER + fi + + env CONFIG="$CONFIG" $POSTMOUNT "LIVE" "$UPPER" +} + +# Find the "unshare" process for $1 and echo the its pid and the pids +# of its child processes. is_live() { - pgrep -f ".reaper $SRV" > /dev/null + local NAME=$1 + local USPID="$(pgrep -f "unshare.* $NAME ")" + [ -z "$USPID" ] && return 1 + echo "$USPID $(ps -hopid --ppid=$USPID)" } -start_services() { - for S in "$@" ; do - service $S start - done +# Find all overlay-boot processes and list their config files +list_running() { + pgrep -a overlay-boot | awk '{print $4}' }