aboutsummaryrefslogtreecommitdiff
path: root/etc/private/install
diff options
context:
space:
mode:
Diffstat (limited to 'etc/private/install')
-rwxr-xr-xetc/private/install/brep-startup15
-rwxr-xr-xetc/private/install/vm-gen-service7
2 files changed, 19 insertions, 3 deletions
diff --git a/etc/private/install/brep-startup b/etc/private/install/brep-startup
index 7a5f262..780a2c0 100755
--- a/etc/private/install/brep-startup
+++ b/etc/private/install/brep-startup
@@ -35,7 +35,20 @@ fi
r="$d/pkg/1"
if [ ! -f "$r/repositories.manifest" ]; then
- echo ": 1" >"$r/repositories.manifest"
+ cat <<EOF >"$r/repositories.manifest"
+: 1
+#summary: Private repository
+#description: \\
+#This is a private repository.
+#And this description can contain multiple lines.
+#\\
+#email: admin@example.org
+
+#:
+#role: prerequisite
+#location: https://pkg.cppget.org/1/stable
+#trust: ...
+EOF
fi
if [ ! -f "$r/packages.manifest" ]; then
diff --git a/etc/private/install/vm-gen-service b/etc/private/install/vm-gen-service
index c4938c2..ae49a49 100755
--- a/etc/private/install/vm-gen-service
+++ b/etc/private/install/vm-gen-service
@@ -180,13 +180,16 @@ ExecStart=$bin/vm-start \\
--ram \${RAM} \\
--tap \${TAP} \\
--mac \${MAC} \\
+ --pid $run/%i.pid \\
--monitor $run/%i-mon.sock \\
--console $run/%i-con.sock \\
$var/%i.img
-ExecStop=$bin/vm-stop $run/%i-mon.sock
+ExecStop=$bin/vm-stop $run/%i.pid $run/%i-mon.sock
-# Make systemd wait for ExecStop completion.
+# This makes sure systemd waits for the ExecStart command to exit rather
+# than killing it as soon as ExecStop exits (this is necessary since our
+# vm-stop may exit just before vm-start).
#
KillMode=none
TimeoutStopSec=60