Skip to content

Commit

Permalink
Fix sorting private-etc in i2prouter.profile
Browse files Browse the repository at this point in the history 
@rusty-snake For now I've fixed the sorting to let it pass CI. Do you think sort.py should put java-{8,9}-openjdk before java-10-openjdk?
  • Loading branch information
@glitsj16
glitsj16 authored Jan 13, 2020
1 parent bf53cec commit 74e33f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion etc/i2prouter.profile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ shell none
disable-mnt
private-cache
private-dev
private-etc alternatives,ca-certificates,crypto-policies,dconf,group,hostname,hosts,i2p,java-8-openjdk,java-9-openjdk,java-10-openjdk,java-11-openjdk,java-12-openjdk,java-13-openjdk,java-openjdk,ld.so.cache,localtime,machine-id,nsswitch.conf,passwd,pki,resolv.conf,ssl
private-etc alternatives,ca-certificates,crypto-policies,dconf,group,hostname,hosts,i2p,java-10-openjdk,java-11-openjdk,java-12-openjdk,java-13-openjdk,java-8-openjdk,java-9-openjdk,java-openjdk,ld.so.cache,localtime,machine-id,nsswitch.conf,passwd,pki,resolv.conf,ssl
private-tmp

5 comments on commit 74e33f0

@rusty-snake
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rusty-snake For now I've fixed the sorting to let it pass CI. Do you think sort.py should put java-{8,9}-openjdk before java-10-openjdk?

Sounds reasonable, however private-etc would need a own sort-function with hardcoded specials for java-*-openjdk. If anyone has the time …

@glitsj16
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rusty-snake Thanks for your input. As this seems to be the only profile showing this 'exotic' private-etc sorting issue, IMHO it's not a high priority issue. If we had globbing support for private-etc we could simplify and avoid things like this by using java-*. @smitsohu: would that be doable/too much hassle?

@smitsohu
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we had globbing support for private-etc

@glitsj16 It should be quite straightforward, mostly copy/paste from other places (like private-bin)

@glitsj16
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smitsohu Thanks for your response. I have some time next week to take a stab at it.

@glitsj16
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smitsohu Going over the code more closely to implement globbing support for private-etc I noticed 2 occasions where asprinf is used instead of asprintf: https://github.com/netblue30/firejail/blob/master/src/firejail/fs_bin.c#L188 and https://github.com/netblue30/firejail/blob/master/src/firejail/fs_bin.c#L193. I'm assuming these are just typos and have a fix in #3168. If you find some time, could you take a look and merge if you're OK with it please?

Please sign in to comment.