Skip to content
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

profiles: sort blacklist sections #6289

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

kmk3
Copy link
Collaborator

@kmk3 kmk3 commented Mar 24, 2024

See etc/templates/profile.template.

This is a follow-up to #6286.

See etc/templates/profile.template.

This is a follow-up to netblue30#6286.
@kmk3 kmk3 requested review from glitsj16 and rusty-snake March 24, 2024 07:16
kmk3 added a commit to kmk3/firejail that referenced this pull request Mar 26, 2024
That is, make "X11" lowercase so that the order of the includes in the
disable- section remain the same when sorted with `LC_ALL=C`, as is the
case for most of the other sections.  That is also likely to be the
default in text editors (such as in vim on Arch), so this should make
the disable- section more consistent and easier to sort when editing the
profile.

Also, keep the old include as a redirect to the new one for now to avoid
breakage.

Commands used to search and replace:

    git mv etc/inc/disable-X11.inc etc/inc/disable-x11.inc
    git grep -Ilz 'disable-X11' -- etc | xargs -0 \
      perl -pi -e 's/disable-X11/disable-x11/'

Relates to netblue30#4462 netblue30#4854 netblue30#6070 netblue30#6289.

This is a follow-up to netblue30#6286.
@kmk3 kmk3 merged commit 0d8fb3d into netblue30:master Mar 27, 2024
3 checks passed
@kmk3 kmk3 deleted the profiles-sort-blacklist branch March 27, 2024 12:13
kmk3 added a commit that referenced this pull request Mar 27, 2024
That is, make "X11" lowercase so that the order of the includes in the
disable- section remain the same when sorted with `LC_ALL=C`, as is the
case for most of the other sections.  That is also likely to be the
default in text editors (such as in vim on Arch), so this should make
the disable- section more consistent and easier to sort when editing the
profile.

Also, keep the old include as a redirect to the new one for now to avoid
breakage.

Commands used to search and replace:

    git mv etc/inc/disable-X11.inc etc/inc/disable-x11.inc
    git grep -Ilz 'disable-X11' -- etc | xargs -0 \
      perl -pi -e 's/disable-X11/disable-x11/'

Relates to #4462 #4854 #6070 #6289.

This is a follow-up to #6286.
kmk3 added a commit that referenced this pull request Mar 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done (on RELNOTES)
Development

Successfully merging this pull request may close these issues.

2 participants