From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] 66: clean default $PATH, change system-dir.
Date: Tue, 16 Feb 2021 19:55:36 +0100 [thread overview]
Message-ID: <20210216185536.-uSfKJKkzRY6t_ZMAvt9ERnUnE94ybl3gx-eurOo348@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28783@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2156 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages 66
https://github.com/void-linux/void-packages/pull/28783
66: clean default $PATH, change system-dir.
<!-- Mark items with [x] where applicable -->
#### General
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
There are two significant changes in the commit.
1. The default $PATH 66 uses for the services contains too many dirs. This reduces it to just /usr/bin:/usr/sbin, which is what runsvdir uses by default.
2. The default directory for the system-dir, which is where 66 stores the trees created and information about enabled services, is `/var/lib/66`. But 66 can be used to boot a system and /var may not be in the root filesystem or mounted early, so boot will fail. This update, changes service-dir to `/usr/lib/66`. Users that upgrade from an earlier version or revision should either copy the contents of the old system-dir to the new or create trees again and enable services.
@gspe @flexibeast @Obarun
A patch file from https://github.com/void-linux/void-packages/pull/28783.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66-28783.patch --]
[-- Type: text/x-diff, Size: 2211 bytes --]
From e624460da8ebde54e6a738be88231be1a3568411 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 15 Feb 2021 15:55:47 +0200
Subject: [PATCH] 66: clean default $PATH, change system-dir.
---
srcpkgs/66/INSTALL.msg | 10 ++++++----
srcpkgs/66/template | 12 ++++++++++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
index 4eb62e16d37..48212a333c1 100644
--- a/srcpkgs/66/INSTALL.msg
+++ b/srcpkgs/66/INSTALL.msg
@@ -1,4 +1,6 @@
-CAUTION: 66 v0.6.0.0 has changes to the way the log and env options
-are handled in the frontend service file. Please consult the
-documentation and make the appropriate changes before restarting
-or enabling your services, especially complex module services.
+CAUTION: package revision 0.6.1.1_2 changes the default system-dir
+from /var/lib/66 to /etc/66/lib. The change requires user intervention.
+Users who upgrade from an earlier version should either copy the
+contents of the old dir to the new one after installation, or re-create
+trees and re-enable services. That should be done before rebooting/halting
+the system.
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 1a81ba6b898..6c1a3aa22fc 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,14 +1,15 @@
# Template file for '66'
pkgname=66
version=0.6.1.1
-revision=1
+revision=2
wrksrc="66-v${version}"
build_style=configure
configure_args="--prefix=/usr
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
--with-lib=${XBPS_CROSS_BASE}/usr/lib
--with-s6-log-timestamp=iso
- --with-s6-log-user=_s6log"
+ --with-s6-log-user=_s6log
+ --with-system-dir=/etc/66/lib"
hostmakedepends="pkg-config lowdown"
makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel"
short_desc="Small tools built around s6 and s6-rc programs"
@@ -23,6 +24,13 @@ conf_files="/etc/66/init /etc/66/init.conf"
system_accounts="_s6log"
+pre_configure() {
+
+ # Clean the default $PATH for service scripts
+ vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:usr/sbin@" \
+ "${wrksrc}/skel/init.conf"
+}
+
post_install() {
vdoc README.md
vlicense LICENSE
next prev parent reply other threads:[~2021-02-16 18:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 19:23 [PR PATCH] " mobinmob
2021-02-15 19:30 ` [PR PATCH] [Updated] " mobinmob
2021-02-16 16:03 ` ericonr
2021-02-16 16:20 ` mobinmob
2021-02-16 18:55 ` mobinmob [this message]
2021-02-16 18:58 ` mobinmob
2021-02-16 18:59 ` mobinmob
2021-02-24 4:21 ` [PR REVIEW] " ericonr
2021-02-24 4:21 ` ericonr
2021-02-24 9:47 ` [PR PATCH] [Updated] " mobinmob
2021-02-24 9:49 ` [PR REVIEW] " mobinmob
2021-02-24 9:51 ` mobinmob
2021-02-24 12:41 ` [PR PATCH] [Updated] " mobinmob
2021-02-24 12:48 ` mobinmob
2021-02-24 12:49 ` [PR REVIEW] " mobinmob
2021-02-24 13:32 ` mobinmob
2021-02-24 14:15 ` [PR REVIEW] " mobinmob
2021-02-24 15:04 ` ericonr
2021-02-24 15:16 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210216185536.-uSfKJKkzRY6t_ZMAvt9ERnUnE94ybl3gx-eurOo348@z \
--to=mobinmob@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).