diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-09-09 15:04:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-09-09 15:04:52 +0200 |
| commit | 25ef69650687f0fca9951bdcb16b2b3679a0601d (patch) | |
| tree | eee80b51a0a0e1c573f16cbb9c8a971000603f31 /etc/private/install | |
| parent | 1a4a071568116f1131507f692f5618d5e5748b71 (diff) | |
Updates to private install infrastructure and instructions
Diffstat (limited to 'etc/private/install')
| -rwxr-xr-x | etc/private/install/brep-startup | 15 | ||||
| -rwxr-xr-x | etc/private/install/vm-gen-service | 7 |
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 |