-
Notifications
You must be signed in to change notification settings - Fork 692
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
testing/etckeeper: new aport #788
Conversation
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 mostly good. My biggest question is if the limitations, and hacky trigger script can be done after the apk-tools change? If yes, I'd like to do this right from the beginning and merge only after improved apk-tools. Thanks!
testing/etckeeper/etckeeper.trigger
Outdated
exec 200>"$LOCK" | ||
|
||
# wait for $LOCK before commit | ||
(flock --timeout 180 200 && etckeeper post-install) & |
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.
Is this trigger script hack something we get rid of after alpinelinux/apk-tools#2 is merged?
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.
yes ;-) was not happy with that trigger at all, but it was the only way to do it with current apk-tools. Hence this trigger (removal of it) is the motivation for the work in alpinelinux/apk-tools#2 i.
testing/etckeeper/README.alpine
Outdated
Known Limitations | ||
----------------- | ||
* Can not block package installation | ||
* Can not handle commit before install |
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.
Both are fixable after alpinelinux/apk-tools#2 ?
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.
yes thats right.
pkgname=etckeeper | ||
pkgver=1.18.6 | ||
pkgrel=1 | ||
pkgdesc="Store /etc in git." |
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.
I generally dislike this, because git tracks history, and in tmpfs installs it means the whole history is also stored in the apkovl. Which is part of the reason why we wrote aaudit
. Then again, it's much less known, less feature complete etc. And I do understand that people are possibly familiar with etckeeper
so I think we should include it as an option.
testing/etckeeper/APKBUILD
Outdated
package() { | ||
cd "$builddir" | ||
sed -i 's|^PYTHON=python$|PYTHON=/bin/false|' Makefile || return 1 | ||
sed -i 's/_PACKAGE_MANAGER=.*/_PACKAGE_MANAGER=apk/' "$builddir"/etckeeper.conf || return 1 |
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.
There sed scripts should probably be in prepare step.
Note 2720907 testing/etckeeper: use apk commit_hook |
Can you flatten this down? |
Note: uses a apk commit_hooks.d script, so it requires a new apk version.
@kaniini sure I can push a squash. |
It seems documentation on how to use apk commit-hook is missing. Can you bring back the README.Alpine file for that? |
The apk commit hook will not work before a new version of apk-tools has been tagged: |
Okay. Lets hold on this one then. |
Merged in 188d8ba by @fabled. Thanks for your contribution! (This pull request has been closed automatically by GitHub PR Closer. If you think that it’s not resolved yet, please add a comment.) |
For limitations see README.alpine