-
Notifications
You must be signed in to change notification settings - Fork 18.9k
some debian init script polishing #42420
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
contrib/init/sysvinit-debian/docker
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like the shfmt settings we use doesn't like some of these formatting changes; https://ci-next.docker.com/public/blue/rest/organizations/jenkins/pipelines/moby/branches/PR-42420/runs/1/nodes/251/log/?start=0
You can check the format it wants with; shfmt -w -bn -ci -sr

(The change of order of -p "$DOCKER_PIDFILE" it expects is a bit odd though; looks like it's getting confused by something)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, since patch is just for aligning formatting to Debian's version (no idea which one was first) - to make diffing easier - I can move that one to my packager queue and drop it from this submission.
thaJeztah
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you're updating, could you also fix the typo in the first commit message? (s/DEAMON/DAEMON/)
|
I've got to be honest that most of this seems like changes just for changes sake. For example, I don't see a compelling reason to adjust any of the whitespace in this file (especially since we're now using The fact that https://salsa.debian.org/debian/sysvinit/-/blob/21ee620f9aac4d910a769cf3f84c783c19eac199/debian/init-d-script doesn't seem to muck with PID files any more than setting |
1343634 to
6c2da9d
Compare
3b712c1 to
528db9b
Compare
|
The retionale behind this queue: when packaging the upstream tree for Debian family, I've found lots of many differences between moby's and debian's versions. Lots of small things, but summing up to a huge diff. One thing is actually making a big difference: the last patch is picking the config scriptlet name from the init script's name. If you wanna have multiple instances, you can just copy or hardlink the init script as-is and it will load a separate config. (yes, that's not the cleanest imaginable solutions, but works well enough and often used in the field). |
dca39d1 to
462721b
Compare
Make it a bit more aligned to debian init script standards. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Make it a bit more aligned to debian init script standards. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Make sure stale pidfiles are removed. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
automatically derive the service name from init script name. this way, eg. one script can drive multiple instances. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
462721b to
1313552
Compare
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)