From: Ralph Ronnquist <ralph.ronnquist@gmail.com>
Date: Fri, 25 Mar 2022 09:41:09 +0000 (+1100)
Subject: pre-packaging fixes
X-Git-Tag: deb_0.1~19
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=b270a682e2931b7188e9d3a46fd46361a2d3b390;p=rrq%2Foverlay-boot.git

pre-packaging fixes
---

diff --git a/functions b/functions
index 38e8725..feb500e 100644
--- a/functions
+++ b/functions
@@ -55,7 +55,7 @@ EOF
     done
 }
 
-REAPER=$(dirname $(realpath $0))/reaper/reaper
+REAPER=$(dirname $(realpath $0))/reaper
 # (name live system root work)
 # Set up an overlay fmr $name on $live, with a new tmpfs on its /run,
 # and "install" a "reaper" as the upcoming pid 1
@@ -100,7 +100,7 @@ setup_overlay() {
 	umount "$ROOT/run"
 	die "Cannot set up the overlay mount $2"
     fi
-    cp $REAPER $LIVE/.reaper
+    cp -p $REAPER $LIVE/.reaper
 }
 
 start_services() {
diff --git a/overlay-boot b/overlay-boot
index b6e0045..431263d 100755
--- a/overlay-boot
+++ b/overlay-boot
@@ -55,6 +55,8 @@ echo "$CMD"
 cat <<EOF | $CMD
 set -x
 mount -t proc proc /proc
+mount -t devpts devpts /dev/pts
+mount -t sysfs sysfs /sys
 for srv in $START ; do service \$srv start ; done
 exec /.reaper $NAME
 EOF
diff --git a/reaper/Makefile b/reaper/Makefile
index 87ca419..4afe034 100644
--- a/reaper/Makefile
+++ b/reaper/Makefile
@@ -3,4 +3,4 @@ reaper: reaper.asm
 	chmod a+x $@
 
 clean:
-	rm reaper
+	rm -f reaper