-
Notifications
You must be signed in to change notification settings - Fork 706
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12218 from alanmcanonical/avoid-tmpfiles-override
Avoid tmpfiles override
- Loading branch information
Showing
6 changed files
with
66 additions
and
54 deletions.
There are no files selected for viewing
20 changes: 11 additions & 9 deletions
20
linux_os/guide/system/logging/journald/dir_groupowner_system_journal/bash/ubuntu.sh
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| # platform = multi_platform_ubuntu | ||
|
|
||
| TMPFILES_CONF="/etc/tmpfiles.d/systemd.conf" | ||
| TMPFILES_CONF="/usr/lib/tmpfiles.d/systemd.conf" | ||
|
|
||
| if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2systemd-journal/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /var/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/var\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/var\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| if grep -qP "^.[+]*\s+\/run\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/run\/log\/journal\s\+[^ $]\+\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2systemd-journal/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /run/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/run\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/run\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| systemd-tmpfiles --create |
20 changes: 11 additions & 9 deletions
20
linux_os/guide/system/logging/journald/dir_owner_system_journal/bash/ubuntu.sh
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| # platform = multi_platform_ubuntu | ||
|
|
||
| TMPFILES_CONF="/etc/tmpfiles.d/systemd.conf" | ||
| TMPFILES_CONF="/usr/lib/tmpfiles.d/systemd.conf" | ||
|
|
||
| if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2root/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /var/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/var\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/var\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| if grep -qP "^.[+]*\s+\/run\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/run\/log\/journal\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2root/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /run/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/run\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/run\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| systemd-tmpfiles --create |
20 changes: 11 additions & 9 deletions
20
linux_os/guide/system/logging/journald/dir_permissions_system_journal/bash/ubuntu.sh
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| # platform = multi_platform_ubuntu | ||
|
|
||
| TMPFILES_CONF="/etc/tmpfiles.d/systemd.conf" | ||
| TMPFILES_CONF="/usr/lib/tmpfiles.d/systemd.conf" | ||
|
|
||
| if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+\)\([^ $]*\)/Z\2~2750/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /var/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/var\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/var\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| if grep -qP "^.[+]*\s+\/run\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/run\/log\/journal\s\+\)\([^ $]*\)/Z\2~2750/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /run/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/run\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/run\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| systemd-tmpfiles --create |
20 changes: 11 additions & 9 deletions
20
linux_os/guide/system/logging/journald/file_groupowner_system_journal/bash/ubuntu.sh
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| # platform = multi_platform_ubuntu | ||
|
|
||
| TMPFILES_CONF="/etc/tmpfiles.d/systemd.conf" | ||
| TMPFILES_CONF="/usr/lib/tmpfiles.d/systemd.conf" | ||
|
|
||
| if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2systemd-journal/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /var/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/var\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/var\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| if grep -qP "^.[+]*\s+\/run\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/run\/log\/journal\s\+[^ $]\+\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2systemd-journal/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /run/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/run\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/run\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| systemd-tmpfiles --create |
20 changes: 11 additions & 9 deletions
20
linux_os/guide/system/logging/journald/file_owner_system_journal/bash/ubuntu.sh
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| # platform = multi_platform_ubuntu | ||
|
|
||
| TMPFILES_CONF="/etc/tmpfiles.d/systemd.conf" | ||
| TMPFILES_CONF="/usr/lib/tmpfiles.d/systemd.conf" | ||
|
|
||
| if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2root/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /var/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/var\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/var\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| if grep -qP "^.[+]*\s+\/run\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/run\/log\/journal\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2root/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /run/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/run\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/run\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| systemd-tmpfiles --create |
20 changes: 11 additions & 9 deletions
20
linux_os/guide/system/logging/journald/file_permissions_system_journal/bash/ubuntu.sh
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| # platform = multi_platform_ubuntu | ||
|
|
||
| TMPFILES_CONF="/etc/tmpfiles.d/systemd.conf" | ||
| TMPFILES_CONF="/usr/lib/tmpfiles.d/systemd.conf" | ||
|
|
||
| if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+\)\([^ $]*\)/Z\2~2750/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /var/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/var\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/var\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /var/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| if grep -qP "^.[+]*\s+\/run\/log\/journal\s+" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/run\/log\/journal\s\+\)\([^ $]*\)/Z\2~2750/" "$TMPFILES_CONF" | ||
| else | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >> "$TMPFILES_CONF" | ||
| if ! grep -q 'Z /run/log/journal ~2750 root systemd-journal - -' "$TMPFILES_CONF"; then | ||
| if grep -qP "^[zZ][+]*\s+\/run\/log\/journal" "$TMPFILES_CONF"; then | ||
| sed -i --follow-symlinks "s/\(^[zZ][+]*\)\(\s\+\/run\/log\/journal.*\)/# \1\2/" "$TMPFILES_CONF" | ||
| fi | ||
| echo "Z /run/log/journal ~2750 root systemd-journal - -" >>"$TMPFILES_CONF" | ||
| fi | ||
|
|
||
| systemd-tmpfiles --create |