Commit f687b273 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

localed: system-setup-keyboard is no more on fedora

parent a2927192
......@@ -128,9 +128,6 @@ Features:
* add _SYSTEMD_USER_UNIT= field to journal entries
* remove Fedora /dev/null logic from localed.c, now that system-config-keyboard is gone
delete /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf from spec file
* journal: expose current disk usage
* dracut-shutdown needs to be ordered before unmounting /boot
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment