shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

hwdb: selinuxify a bit (#3460)

Browse Source 
-bash-4.3# rm /etc/udev/hwdb.bin
-bash-4.3# systemd-hwdb update
-bash-4.3# ls -Z /etc/udev/hwdb.bin
system_u:object_r:systemd_hwdb_etc_t:s0 /etc/udev/hwdb.bin

Fixes: #3458
This commit is contained in:
Evgeny Vereshchagin 2016-06-07 20:47:41 +03:00 committed by Lennart Poettering
parent a849538e3b
commit ea683512f9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hwdb/hwdb.c
View File

@ -29,7 +29,9 @@
#include "fs-util.h" #include "fs-util.h"
#include "hwdb-internal.h" #include "hwdb-internal.h"
#include "hwdb-util.h" #include "hwdb-util.h"
#include "label.h"
#include "mkdir.h" #include "mkdir.h"
#include "selinux-util.h"
#include "strbuf.h" #include "strbuf.h"
#include "string-util.h" #include "string-util.h"
#include "strv.h" #include "strv.h"
@ -643,12 +645,12 @@ static int hwdb_update(int argc, char *argv[], void *userdata) {
if (!hwdb_bin) if (!hwdb_bin)
return -ENOMEM; return -ENOMEM;
mkdir_parents(hwdb_bin, 0755); mkdir_parents_label(hwdb_bin, 0755);
r = trie_store(trie, hwdb_bin); r = trie_store(trie, hwdb_bin);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failure writing database %s: %m", hwdb_bin); return log_error_errno(r, "Failure writing database %s: %m", hwdb_bin);
return 0; return label_fix(hwdb_bin, false, false);
} }
static void help(void) { static void help(void) {
@ -732,6 +734,8 @@ int main (int argc, char *argv[]) {
if (r <= 0) if (r <= 0)
goto finish; goto finish;
mac_selinux_init();
r = hwdb_main(argc, argv); r = hwdb_main(argc, argv);
finish: finish: