openvpn, share-users: install the keep.d fragments PR #118 added - #151
Merged
Conversation
Neither package's install: section copied files/lib/upgrade/keep.d/* into the built .ipk -- both use narrow, explicit install rules (unlike gargoyle's own package, which does a blanket files/ tree copy), so the keep.d source files PR #118 added for these two packages were dead: never actually installed, confirmed live on a running router (neither gargoyle-openvpn nor gargoyle-share-users present in /lib/upgrade/keep.d/ despite both packages being installed). Impact was masked so far -- the same two paths (/etc/openvpn, /etc/samba/smbpasswd) were also added directly to /etc/sysupgrade.conf in the same PR, so backups still captured the data via that redundant path -- but the keep.d union mechanism itself (the PR's own stated fix for the two lists drifting apart) was non-functional for these two. Verified via a real scoped compile of both packages: the built .ipks now contain lib/upgrade/keep.d/gargoyle-openvpn and lib/upgrade/keep.d/gargoyle-share-users respectively.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
plugin-gargoyle-openvpn's andshare-users'install:sections never copyfiles/lib/upgrade/keep.d/*into the built.ipk— both use narrow, explicit install rules (unlikegargoyle's own package, which does a blanketfiles/tree copy), so the keep.d source files PR backup: close sysupgrade.conf/backup coverage gaps, add keep.d registry #118 added for these two packages were dead code.gargoyle-openvpnnorgargoyle-share-usersexists in/lib/upgrade/keep.d/— only the pre-existing baseopenvpnpackage's own keep.d entry is present./etc/openvpn,/etc/samba/smbpasswd) were also added directly to/etc/sysupgrade.confby the same PR, so backups still captured the data via that redundant path — but the keep.d union mechanism itself (the PR's own stated fix for "the two lists had already drifted apart once") was non-functional for these two fragments.Test plan
make package/plugin-gargoyle-openvpn/{clean,compile},make package/share-users/{clean,compile}) inside the build container.ipks and confirmedlib/upgrade/keep.d/gargoyle-openvpn/lib/upgrade/keep.d/gargoyle-share-usersare now genuinely present in the packaged output