diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-05 23:54:09 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-05 23:54:09 -0700 |
| commit | f687b2738229570453c9412add6b9c4f99c9c004 (patch) | |
| tree | ea942fc654dd4940b2a04872cbe7ebcd8114bff4 /src | |
| parent | a29271926ad5530276cec486c93ea72ef71a652c (diff) | |
| download | systemd-f687b2738229570453c9412add6b9c4f99c9c004.tar.gz | |
localed: system-setup-keyboard is no more on fedora
Diffstat (limited to 'src')
| -rw-r--r-- | src/locale/localed.c | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/src/locale/localed.c b/src/locale/localed.c index 22950a60a9..667c5d1970 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -271,24 +271,8 @@ static int read_data_x11(void) { free_data_x11(); f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re"); - if (!f) { - if (errno == ENOENT) { - -#ifdef TARGET_FEDORA - f = fopen("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf", "re"); - if (!f) { - if (errno == ENOENT) - return 0; - else - return -errno; - } -#else - return 0; -#endif - - } else - return -errno; - } + if (!f) + return errno == ENOENT ? 0 : -errno; while (fgets(line, sizeof(line), f)) { char *l; @@ -577,14 +561,6 @@ static int write_data_x11(void) { isempty(state.x11_variant) && isempty(state.x11_options)) { -#ifdef TARGET_FEDORA - unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); - - /* Symlink this to /dev/null, so that s-s-k (if it is - * still running) doesn't recreate this. */ - symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); -#endif - if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0) return errno == ENOENT ? 0 : -errno; @@ -624,18 +600,8 @@ static int write_data_x11(void) { r = -errno; unlink("/etc/X11/xorg.conf.d/00-keyboard.conf"); unlink(temp_path); - } else { - -#ifdef TARGET_FEDORA - unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); - - /* Symlink this to /dev/null, so that s-s-k (if it is - * still running) doesn't recreate this. */ - symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); -#endif - + } else r = 0; - } fclose(f); free(temp_path); |