chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: try to reload daemon after enable/disable only when not running in a chroot
[elogind.git]
/
src
/
locale
/
localed.c
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index 04268a19821f1559ea4cc4665ffa596e890aff91..4f85b8b583ddab7fb2e5bfaad5441cf4aa6a715e 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-31,6
+31,10
@@
#include "dbus-common.h"
#include "polkit.h"
#include "def.h"
#include "dbus-common.h"
#include "polkit.h"
#include "def.h"
+#include "env-util.h"
+#include "fileio.h"
+#include "fileio-label.h"
+#include "label.h"
#define INTERFACE \
" <interface name=\"org.freedesktop.locale1\">\n" \
#define INTERFACE \
" <interface name=\"org.freedesktop.locale1\">\n" \
@@
-389,7
+393,7
@@
static int write_data_locale(void) {
return 0;
}
return 0;
}
- r = write_env_file("/etc/locale.conf", l);
+ r = write_env_file
_label
("/etc/locale.conf", l);
strv_free(l);
return r;
strv_free(l);
return r;
@@
-545,7
+549,7
@@
static int write_data_vconsole(void) {
return 0;
}
return 0;
}
- r = write_env_file("/etc/vconsole.conf", l);
+ r = write_env_file
_label
("/etc/vconsole.conf", l);
strv_free(l);
return r;
strv_free(l);
return r;
@@
-567,7
+571,7
@@
static int write_data_x11(void) {
return 0;
}
return 0;
}
- mkdir_p
arents
_label("/etc/X11/xorg.conf.d", 0755);
+ mkdir_p_label("/etc/X11/xorg.conf.d", 0755);
r = fopen_temporary("/etc/X11/xorg.conf.d/00-keyboard.conf", &f, &temp_path);
if (r < 0)
r = fopen_temporary("/etc/X11/xorg.conf.d/00-keyboard.conf", &f, &temp_path);
if (r < 0)
@@
-853,7
+857,7
@@
static int convert_x11_to_vconsole(DBusConnection *connection) {
* layout stripped off. */
if (x > 0 &&
strlen(a[1]) == x &&
* layout stripped off. */
if (x > 0 &&
strlen(a[1]) == x &&
- strn
cmp(state.x11_layout, a[1], x) == 0
)
+ strn
eq(state.x11_layout, a[1], x)
)
matching = 5;
else {
size_t w;
matching = 5;
else {
size_t w;
@@
-1363,7
+1367,7
@@
int main(int argc, char *argv[]) {
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
-
+ label_init("/etc");
umask(0022);
if (argc == 2 && streq(argv[1], "--introspect")) {
umask(0022);
if (argc == 2 && streq(argv[1], "--introspect")) {