pthbs

commit 611c1b628f6549ffa4ac88c9450a7d8b2ec14a02
parent e53e0b3441987bbed54cf240c6848e8f2d53ddc7
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 19:52:42 +0000

fix path to s6-rc-db

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

5 files changed, 13 insertions(+), 13 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:eea35c1b742ef1e5637c84a2f2e4720172513f4b:core-system-conf
+#@git:eb2f9a71bb07c73d73cce36ba69e1440180f6b29: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:eea35c1b742ef1e5637c84a2f2e4720172513f4b' \
-	'Last change on 2024-03-07 17:54:03 +0000 by ccx'
+	'Current running configuration was generated from core-system-conf:eb2f9a71bb07c73d73cce36ba69e1440180f6b29' \
+	'Last change on 2024-03-07 19:51:14 +0000 by ccx'
 
 env 'pthbs_path_core-system-conf'="$prefix" \
 	'pthbs_path_containers=/versions/containers.environment.5c638a60055f057e241390ce3f606b4555427cd47c09becd05c48c29ca76d8bb' \
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.522e47e850abfbd15de410d6a46db41ea65792560b27c05fd3528650393ed85a
+#+core-system-rc.b8371187cb9bc42975fe32c24d12a48f7230f59c99fb0bb943a1771e553e2219
 
-s6rcdb=/versions/core-system-rc.522e47e850abfbd15de410d6a46db41ea65792560b27c05fd3528650393ed85a/s6-rc-db
+s6rcdb=/versions/core-system-rc.b8371187cb9bc42975fe32c24d12a48f7230f59c99fb0bb943a1771e553e2219/config/s6-rc-db
 prefix=/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
@@ -95,7 +95,7 @@ $(qx ifelse) -X {
 	$(qx foreground) { $(qx s6-svc) -d /run/service/console-log-tail }
 	$(qx s6-rc) -v 2 -t 600000 -- change ok-all
 }
-$(qx s6-echo) "* System startup failure: retry"
+$(qx foreground) { $(qx s6-echo) "* System startup failure: retry" }
 # try again without tty and then with
 $(qx foreground) { $(qx s6-rc) -v 2 -t 600000 -- change ok-all-but-tty }
 $(qx foreground) { $(qx sleep) 0.1 }
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.54f31fbd0960366e896aba0dd69a155177a496d2bdf7fe197a7f02259a0157a2
+#+core-system-conf.06c3ee1a306ef1da8e1de2a2ccfd162f9d727693576136226bfdddb1550ab6b3
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/core-system-conf.54f31fbd0960366e896aba0dd69a155177a496d2bdf7fe197a7f02259a0157a2/config/s6-rc-source
+src=/versions/core-system-conf.06c3ee1a306ef1da8e1de2a2ccfd162f9d727693576136226bfdddb1550ab6b3/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.54f31fbd0960366e896aba0dd69a155177a496d2bdf7fe197a7f02259a0157a2
-#+core-system-rc.522e47e850abfbd15de410d6a46db41ea65792560b27c05fd3528650393ed85a
+#+core-system-conf.06c3ee1a306ef1da8e1de2a2ccfd162f9d727693576136226bfdddb1550ab6b3
+#+core-system-rc.b8371187cb9bc42975fe32c24d12a48f7230f59c99fb0bb943a1771e553e2219
 #+core-system-scripts.132a3b1c6b226dee79156049db1244ebeacdf5a4bfcffc74b6b97175dad000fd
-#+core-system-init.46d9ac7fde7f9d2d7307809f8f99e098463bd7c560275cbe36ff6ae63e516bc4
+#+core-system-init.19dfdc2450c0459d2629e603a19c216ad89ad5c85e56d031f6484269569cfc28
 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
 #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
diff --git a/templates/pkg/core-system-init b/templates/pkg/core-system-init
@@ -8,7 +8,7 @@
 #+{{pkg_install_name("execline")}}
 #+{{pkg_install_name("core-system-rc")}}
 
-s6rcdb={{pkg_install_dir("core-system-rc")}}/s6-rc-db
+s6rcdb={{pkg_install_dir("core-system-rc")}}/config/s6-rc-db
 prefix={{versions}}/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
@@ -96,7 +96,7 @@ $(qx ifelse) -X {
 	$(qx foreground) { $(qx s6-svc) -d /run/service/console-log-tail }
 	$(qx s6-rc) -v 2 -t 600000 -- change ok-all
 }
-$(qx s6-echo) "* System startup failure: retry"
+$(qx foreground) { $(qx s6-echo) "* System startup failure: retry" }
 # try again without tty and then with
 $(qx foreground) { $(qx s6-rc) -v 2 -t 600000 -- change ok-all-but-tty }
 $(qx foreground) { $(qx sleep) 0.1 }