|
Zbigniew Jędrzejewski-Szmek |
436654 |
From 33d3e88a8015c16b0d8c908b094c0fbc4dfcf2bb Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
From: Jason Pleau <jason@jpleau.ca>
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
Date: Sun, 31 May 2015 12:51:17 -0400
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
Subject: [PATCH] core/namespace: Protect /usr instead of /home with
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
ProtectSystem=yes
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
A small typo in ee818b8 caused /home to be put in read-only instead of
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
/usr when ProtectSystem was enabled (ie: not set to "no").
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
(cherry picked from commit d38e01dc96c5cae1986561c4f3bc7f760560bf2a)
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
src/core/namespace.c | 2 +-
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
diff --git a/src/core/namespace.c b/src/core/namespace.c
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
index 7d0b7e7e84..01a817bf23 100644
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
--- a/src/core/namespace.c
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
+++ b/src/core/namespace.c
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
@@ -499,7 +499,7 @@ int setup_namespace(
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
if (protect_system != PROTECT_SYSTEM_NO) {
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
const char *usr_dir, *boot_dir, *etc_dir;
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
- usr_dir = prefix_roota(root_directory, "/home");
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
+ usr_dir = prefix_roota(root_directory, "/usr");
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
boot_dir = prefix_roota(root_directory, "/boot");
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
boot_dir = strjoina("-", boot_dir);
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
etc_dir = prefix_roota(root_directory, "/etc");
|