diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-01-10 18:57:36 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-01-10 18:57:36 +0000 |
| commit | 193e07fffc95e8095e879c53dcf2b21b08dcdcf7 (patch) | |
| tree | bbeeb6b9a1eed0e17ea7dbf4daf0e62809b90871 | |
| parent | a68c091ca709593c9d9087ce3a0c7ac344b5003c (diff) | |
| download | s6-rc-193e07fffc95e8095e879c53dcf2b21b08dcdcf7.tar.gz | |
Use sysconfdir for the default bootdb
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | package/configure-snippets/configure_expand_dirs | 2 | ||||
| -rw-r--r-- | package/configure-snippets/configure_help_install | 2 | ||||
| -rw-r--r-- | package/configure-snippets/configure_init_vars | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -25,7 +25,7 @@ Fine tuning of the installation directories: --includedir=DIR C header files [PREFIX/include] --sysconfdir=DIR global configuration files [PREFIX/etc] --pkgconfdir=DIR pkg-config .pc files [PREFIX/lib/pkgconfig] - --bootdb=PATH default path for the boot database [/etc/s6-rc/compiled/current] + --bootdb=PATH default path for the boot database [SYSCONFDIR/s6-rc/compiled/current] --livedir=DIR default live directory [/run/s6-rc] --repodir=DIR default repo directory [/var/lib/s6-rc/repository] @@ -172,7 +172,7 @@ deplibpath='' vpaths='' vpathd='' build= -bootdb=/etc/s6-rc/compiled/current +bootdb='$sysconfdir/etc/s6-rc/compiled/current' livedir=/run/s6-rc repodir=/var/lib/s6-rc/repository defaultbundle=default @@ -246,7 +246,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot livedir repodir ; do +for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot bootdb livedir repodir ; do eval tmp=\${$i} eval $i=$tmp stripdir $i diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs index d020001..a4d8904 100644 --- a/package/configure-snippets/configure_expand_dirs +++ b/package/configure-snippets/configure_expand_dirs @@ -1 +1 @@ -livedir repodir +bootdb livedir repodir diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install index 6f256b0..1e6ae71 100644 --- a/package/configure-snippets/configure_help_install +++ b/package/configure-snippets/configure_help_install @@ -1,4 +1,4 @@ - --bootdb=PATH default path for the boot database [/etc/s6-rc/compiled/current] + --bootdb=PATH default path for the boot database [SYSCONFDIR/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 effff4f..a9dea00 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -1,4 +1,4 @@ -bootdb=/etc/s6-rc/compiled/current +bootdb='$sysconfdir/etc/s6-rc/compiled/current' livedir=/run/s6-rc repodir=/var/lib/s6-rc/repository defaultbundle=default |