Skip to content

Commit

Permalink
Merge pull request openSUSE#652 from aschnell/master
Browse files Browse the repository at this point in the history
fixed systemd sandboxing
  • Loading branch information
aschnell authored May 11, 2021
2 parents 4f10920 + 44a6e4c commit 57f2b40
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 17 deletions.
4 changes: 0 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ AC_DEFINE_UNQUOTED([LVCHANGEBIN], ["$LVCHANGEBIN"], [Path of lvchange program.])
AC_DEFINE_UNQUOTED([LVMBIN], ["$LVMBIN"], [Path of lvm program.])
AC_DEFINE_UNQUOTED([LVRENAMEBIN], ["$LVRENAMEBIN"], [Path of lvrename program.])

dnl Automake 1.11 enables silent compilation
dnl Disable it by "configure --disable-silent-rules" or "make V=1"
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat -Wmissing-prototypes -Wno-unused-parameter"
CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat -Wnon-virtual-dtor -Wno-unused-parameter"

Expand Down
3 changes: 0 additions & 3 deletions data/boot.service
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN
LockPersonality=true
NoNewPrivileges=false
PrivateNetwork=true
ProtectControlGroups=true
ProtectHostname=true
ProtectKernelLogs=true
ProtectKernelTunables=true
RestrictAddressFamilies=AF_UNIX
RestrictRealtime=true
3 changes: 0 additions & 3 deletions data/cleanup.service
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN
LockPersonality=true
NoNewPrivileges=false
PrivateNetwork=true
ProtectControlGroups=true
ProtectHostname=true
ProtectKernelLogs=true
ProtectKernelTunables=true
RestrictAddressFamilies=AF_UNIX
RestrictRealtime=true
3 changes: 0 additions & 3 deletions data/snapperd.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN
LockPersonality=true
NoNewPrivileges=false
PrivateNetwork=true
ProtectControlGroups=true
ProtectHostname=true
ProtectKernelLogs=true
ProtectKernelTunables=true
RestrictAddressFamilies=AF_UNIX
RestrictRealtime=true
7 changes: 6 additions & 1 deletion data/systemd-sandboxing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ ProtectKernelModules=true breaks LVM.

CapabilityBoundingSet=CAP_SYS_NICE is also needed by LVM.

ProtectHome=true breaks diff for LVM.
ProtectHome=true, ProtectControlGroups=true, ProtectKernelLogs=true
and ProtectKernelTunables=true breaks diff for LVM.

SystemCallFilter=@mount breaks almost everything with older systemd,
e.g. on SLE15 SP1.

CapabilityBoundingSet=CAP_FOWNER is needed if for home directories.

Finally do not forget the hooks.

Have a lot of fun...

3 changes: 0 additions & 3 deletions data/timeline.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN
LockPersonality=true
NoNewPrivileges=false
PrivateNetwork=true
ProtectControlGroups=true
ProtectHostname=true
ProtectKernelLogs=true
ProtectKernelTunables=true
RestrictAddressFamilies=AF_UNIX
RestrictRealtime=true
5 changes: 5 additions & 0 deletions package/snapper.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 11 10:01:30 CEST 2021 - [email protected]

- fixed systemd sandboxing (gh#openSUSE/snapper#651)

-------------------------------------------------------------------
Tue May 04 08:35:28 CEST 2021 - [email protected]

Expand Down

0 comments on commit 57f2b40

Please sign in to comment.