pthbs

commit 36b3e5b9850b59277bdcf9430a7a3ebf47c6e1d8
parent ec862e36eed183fa9ec77a5d3f0113eeb90be9ee
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 17:42:26 +0000

Install ssh authorized_keys

Diffstat:
M
packages/core-system-conf
 | 
8
+++++---
M
packages/core-system-init
 | 
4
++--
M
packages/core-system-rc
 | 
4
++--
M
packages/default.environment
 | 
6
+++---
M
templates/pkg/core-system-conf
 | 
2
++

5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -12,7 +12,7 @@
 #+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
 #+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
 #+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
-#@git:a4f36429f9597be5ee3f9dcedda6c21175387599:core-system-conf
+#@git:c5749fff4c5653b40568de4753a309c7e9e8d80e:core-system-conf
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -40,8 +40,8 @@ linkdep() {
 cd 'core-system-conf'
 printf '%s\n' >config/etc/motd \
 	"Welcome to $(cat ./config/hostname)!" \
-	'Current running configuration was generated from core-system-conf:a4f36429f9597be5ee3f9dcedda6c21175387599' \
-	'Last change on 2024-03-07 16:55:01 +0000 by ccx'
+	'Current running configuration was generated from core-system-conf:c5749fff4c5653b40568de4753a309c7e9e8d80e' \
+	'Last change on 2024-03-07 17:41:40 +0000 by ccx'
 
 env 'pthbs_path_core-system-conf'="$prefix" \
 	'pthbs_path_containers=/versions/containers.environment.5c638a60055f057e241390ce3f606b4555427cd47c09becd05c48c29ca76d8bb' \
@@ -63,6 +63,7 @@ chmod +x "$dest/command/install-as-current-environment.postinstall"
 mkdir -p "$dest/config/"
 rsync -ai ./config/ "$dest/config/"
 rsync -ai ./out/ "$dest/config/"
+mv -v keys "$dest/"
 
 
 cd "$pthbs_destdir/versions/$pthbs_package"
@@ -87,6 +88,7 @@ $1!="."{exit 1}
 
 
 $2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
 
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,9 +5,9 @@
 #+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00
 #+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d
 #+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+core-system-rc.d7cb3721d0c1e7a04d3d2c7e192aa5b99c5d7e7386d4d924e023a0497ded1a87
+#+core-system-rc.2a5717ff1a0ecdabeac3e5d7f5f51a2069cf1582e5707317252c38bb1b609323
 
-s6rcdb=/versions/core-system-rc.d7cb3721d0c1e7a04d3d2c7e192aa5b99c5d7e7386d4d924e023a0497ded1a87/s6-rc-db
+s6rcdb=/versions/core-system-rc.2a5717ff1a0ecdabeac3e5d7f5f51a2069cf1582e5707317252c38bb1b609323/s6-rc-db
 prefix=/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -3,7 +3,7 @@
 #+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded
 #+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
 #+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2
-#+core-system-conf.64b1d13d389cc531cb705aeac6aa2f61901b06a85043caee227d7973281e4156
+#+core-system-conf.60994dadd57b391b13346d1c6fab4226f6e5a9f289353a0d342c3afaec68a91a
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/core-system-conf.64b1d13d389cc531cb705aeac6aa2f61901b06a85043caee227d7973281e4156/config/s6-rc-source
+src=/versions/core-system-conf.60994dadd57b391b13346d1c6fab4226f6e5a9f289353a0d342c3afaec68a91a/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
-#+core-system-conf.64b1d13d389cc531cb705aeac6aa2f61901b06a85043caee227d7973281e4156
-#+core-system-rc.d7cb3721d0c1e7a04d3d2c7e192aa5b99c5d7e7386d4d924e023a0497ded1a87
+#+core-system-conf.60994dadd57b391b13346d1c6fab4226f6e5a9f289353a0d342c3afaec68a91a
+#+core-system-rc.2a5717ff1a0ecdabeac3e5d7f5f51a2069cf1582e5707317252c38bb1b609323
 #+core-system-scripts.132a3b1c6b226dee79156049db1244ebeacdf5a4bfcffc74b6b97175dad000fd
-#+core-system-init.91f6e14df04fd08bd86e675bc3e8cce828d839aad456d6280f67b1db606036b8
+#+core-system-init.15f0de38e7a20145c67f5c829feac2edc0406713936279885f4792a08bd81e6d
 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
 #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
diff --git a/templates/pkg/core-system-conf b/templates/pkg/core-system-conf
@@ -59,8 +59,10 @@ chmod +x "$dest/command/install-as-current-environment.postinstall"
 mkdir -p "$dest/config/"
 rsync -ai ./config/ "$dest/config/"
 rsync -ai ./out/ "$dest/config/"
+mv -v keys "$dest/"
 
 {% endblock -%}
 {% block rules %}
 $2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
 {% endblock -%}