etc: Support local customizations in *.inc #1034

Merged
merged 1 commit into from Jan 11, 2017

Projects

None yet

2 participants

@KellerFuchs
Contributor

This is useful for places, like hashbang.sh, which have site-specific modifications of the *.inc files.

With the current setup, the package manager cannot automatically install updated versions of those files, as it would need to somehow merge the site-specific and upstream changes. Having the site-specific changes in separate files solves this.

@KellerFuchs KellerFuchs etc: Support local customizations in *.inc
This is useful for places, like hashbang.sh, which have site-specific
modifications of the *.inc files.

With the current setup, the package manager cannot automatically install
updated versions of those files, as it would need to somehow merge the
site-specific and upstream changes.  Having the site-specific changes in
separate files solves this.
ec719b9
@KellerFuchs
Contributor

@netblue30 Do you think the include is better at the head or the tail of each file?

@KellerFuchs KellerFuchs added a commit to KellerFuchs/shell-etc that referenced this pull request Jan 9, 2017
@KellerFuchs KellerFuchs firejail: Merge profiles from upstream
This corresponds to commit ec719b9e0f4f7258b5f752af4857649a34a35dfe,
as submitted in netblue30/firejail#1034

This also overwrites our local firejail customizations, which are
re-added again in this branch.
416642d
@KellerFuchs KellerFuchs referenced this pull request in hashbang/shell-etc Jan 9, 2017
Merged

firejail: Update profiles and use disable-common.local #137

@netblue30 netblue30 merged commit 54e60b3 into netblue30:master Jan 11, 2017
@netblue30
Owner

That's a good idea! Including them at the head is fine. Just remember to bring your .local files in under /etc/firejail after you reinstall the software. During install all files in that directory are overwritten.

@KellerFuchs
Contributor

@netblue30 Is that the case for the Debian package too?
Sounds dangerous (and def. a breach of Debian policy)

Anyhow, we keep out config versioned in Git ;-)

@KellerFuchs KellerFuchs deleted the KellerFuchs:disable-local branch Jan 11, 2017
@netblue30
Owner

I have to take it back, the install will not touch .local files in /etc/firejail. I put in a fix last night.

@KellerFuchs
Contributor

\o/

@netblue30
Owner

I have removed .local files form git, so there should be no danger of overwriting /etc/firejail files on the system during install.

@netblue30
Owner

Also ported it on 0.9.44-bugfixes branch.

@KellerFuchs
Contributor

@netblues How does firejail behave when the included file is missing?
(firejail-profile(5) doesn't mention anything one way or another)

@netblue30
Owner

Fixed in the man page, thanks.

@KellerFuchs
Contributor

Awesome, thanks <3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment