X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=overlay-boot;h=f068b43b06fa4ac32168551c331a6974e551b139;hb=53e1af91a724d9b4b0f819b3f5e6a12bb496e571;hp=239ae1cc7228d4c4a1b06a86b5b44a0e4e336516;hpb=df3ccb2170beff852f8ec7d421709c5e85bafc7d;p=rrq%2Foverlay-boot.git

diff --git a/overlay-boot b/overlay-boot
index 239ae1c..f068b43 100755
--- a/overlay-boot
+++ b/overlay-boot
@@ -5,12 +5,9 @@
 # subhost is defined by a configuration file named on teh command line
 
 [ $(id -u) = 0 ] || exec sudo $0 $@
-
-. $(dirname $(realpath $0))/functions
-
+. $(dirname $(realpath $0))/functions $*
 CONFIG="$1"
 [ -r "$CONFIG" ] || die "Missing configuration $CONFIG"
-
 config NAME $(basename $1 .${1##*.})
 config LOG /tmp/oly-$NAME.log
 
@@ -26,6 +23,8 @@ if [ -z "$UNSHARED" ] ; then
 fi
 
 config BASE
+BASE="$(cd $(dirname $CONFIG); realpath $BASE)"
+
 config LIVE "$BASE/live"
 config UPPER "$BASE/root"
 config WORK "$BASE/work"
@@ -50,11 +49,11 @@ trap "exithandler" 0
 
 CMD="unshare -fp --mount-proc ip netns exec $NAME chroot $LIVE /bin/sh"
 echo "$CMD"
+
 cat <<EOF | $CMD
 set -x
-mount --bind $UPPER/run /run
+mount -t proc proc /proc
 for srv in $START ; do service \$srv start ; done
 exec /.reaper $NAME
 EOF
 echo "EXITED $CMD"
-#echo "$STOP" | ip netns exec $NAME chroot $LIVE $SUBSHELL