aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2025-10-30 23:23:52 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2025-10-30 23:23:52 +0000
commit35b102dae60e53a4be06dbe1c5d2950ee862542b (patch)
tree8eab291fe25a8b4766eae81ef645da6bcf90acbf /package
parent6fc2d7953120668622f0cb3e4f771084eb77ca4c (diff)
downloads6-rc-35b102dae60e53a4be06dbe1c5d2950ee862542b.tar.gz
Finish repo documentation; make bootdb configurable; fix install
Diffstat (limited to 'package')
-rw-r--r--package/configure-snippets/configure_case_lines1
-rw-r--r--package/configure-snippets/configure_generate_configh5
-rw-r--r--package/configure-snippets/configure_help_install1
-rw-r--r--package/configure-snippets/configure_init_vars1
4 files changed, 6 insertions, 2 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 1659cc4..1dcbf11 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1,3 +1,4 @@
+ --bootdb=*) bootdb=${arg#*=} ;;
--livedir=*) livedir=${arg#*=} ;;
--repodir=*) repodir=${arg#*=} ;;
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index 679b6f8..ba49153 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -1,3 +1,4 @@
-echo "#define ${package_macro_name}_LIVE_BASE \"$livedir\""
-echo "#define ${package_macro_name}_REPO_BASE \"$repodir\""
+echo "#define ${package_macro_name}_BOOTDB \"$bootdb\""
+echo "#define ${package_macro_name}_LIVEDIR \"$livedir\""
+echo "#define ${package_macro_name}_REPODIR \"$repodir\""
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index cb03148..6f256b0 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -1,3 +1,4 @@
+ --bootdb=PATH default path for the boot database [/etc/s6-rc/compiled/current]
--livedir=DIR default live directory [/run/s6-rc]
--repodir=DIR default repo directory [/var/lib/s6-rc/repository]
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index e3d8701..04e5418 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1,2 +1,3 @@
+bootdb=/etc/s6-rc/compiled/current
livedir=/run/s6-rc
repodir=/var/lib/s6-rc/repository