aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2025-11-09 00:57:58 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2025-11-09 00:57:58 +0000
commitf994407328292d9e5788ab81a9fc6afe36091e46 (patch)
treef316ff6191f369e4839b4ccc9f7c8b213a2a3554 /package
parent7f6bc9d2ba0e3397c6d23f58a0535f2937548067 (diff)
downloads6-rc-f994407328292d9e5788ab81a9fc6afe36091e46.tar.gz
Make default bundle name configurable
Diffstat (limited to 'package')
-rw-r--r--package/configure-snippets/configure_case_lines1
-rw-r--r--package/configure-snippets/configure_generate_configh1
-rw-r--r--package/configure-snippets/configure_help_options1
-rw-r--r--package/configure-snippets/configure_init_vars1
4 files changed, 4 insertions, 0 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 1dcbf11..87c8df8 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1,4 +1,5 @@
--bootdb=*) bootdb=${arg#*=} ;;
--livedir=*) livedir=${arg#*=} ;;
--repodir=*) repodir=${arg#*=} ;;
+ --with-default-bundle=*) defaultbundle=${arg#*=} ;;
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index ba49153..3a43da6 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -1,4 +1,5 @@
echo "#define ${package_macro_name}_BOOTDB \"$bootdb\""
echo "#define ${package_macro_name}_LIVEDIR \"$livedir\""
echo "#define ${package_macro_name}_REPODIR \"$repodir\""
+echo "#define ${package_macro_name}_DEFBUNDLE \"$defaultbundle\""
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index 8b13789..e003d52 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1 +1,2 @@
+ --with-default-bundle=def name of the bundle started at boot [default]
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 04e5418..effff4f 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1,3 +1,4 @@
bootdb=/etc/s6-rc/compiled/current
livedir=/run/s6-rc
repodir=/var/lib/s6-rc/repository
+defaultbundle=default