diff options
author | netblue30 <netblue30@yahoo.com> | 2016-12-14 09:20:52 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-12-14 09:20:52 -0500 |
commit | e92d5d54195bae30ca78f33371460b98f94cc2ef (patch) | |
tree | 8b58ed7dc8732d2b654cc7d203e3f460c8f41fcc | |
parent | snap profile fix (diff) | |
download | firejail-e92d5d54195bae30ca78f33371460b98f94cc2ef.tar.gz firejail-e92d5d54195bae30ca78f33371460b98f94cc2ef.tar.zst firejail-e92d5d54195bae30ca78f33371460b98f94cc2ef.zip |
machine-id fix
-rw-r--r-- | src/firejail/fs_etc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c index a04bf6725..a27c0e41b 100644 --- a/src/firejail/fs_etc.c +++ b/src/firejail/fs_etc.c | |||
@@ -58,7 +58,6 @@ void fs_machineid(void) { | |||
58 | 58 | ||
59 | 59 | ||
60 | struct stat s; | 60 | struct stat s; |
61 | // mount-bind | ||
62 | if (stat("/etc/machine-id", &s) == 0) { | 61 | if (stat("/etc/machine-id", &s) == 0) { |
63 | if (arg_debug) | 62 | if (arg_debug) |
64 | printf("installing a new /etc/machine-id\n"); | 63 | printf("installing a new /etc/machine-id\n"); |
@@ -66,12 +65,10 @@ void fs_machineid(void) { | |||
66 | if (mount(RUN_MACHINEID, "/etc/machine-id", "none", MS_BIND, "mode=444,gid=0")) | 65 | if (mount(RUN_MACHINEID, "/etc/machine-id", "none", MS_BIND, "mode=444,gid=0")) |
67 | errExit("mount"); | 66 | errExit("mount"); |
68 | } | 67 | } |
69 | //#if 0 // todo: investigate | ||
70 | if (stat("/var/lib/dbus/machine-id", &s) == 0) { | 68 | if (stat("/var/lib/dbus/machine-id", &s) == 0) { |
71 | if (mount(RUN_MACHINEID, "/etc/machine-id", "none", MS_BIND, "mode=444,gid=0")) | 69 | if (mount(RUN_MACHINEID, "/var/lib/dbus/machine-id", "none", MS_BIND, "mode=444,gid=0")) |
72 | errExit("mount"); | 70 | errExit("mount"); |
73 | } | 71 | } |
74 | //#endif | ||
75 | } | 72 | } |
76 | 73 | ||
77 | // return 0 if file not found, 1 if found | 74 | // return 0 if file not found, 1 if found |