forked from pool/systemd
9cce0631b3
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/request/show/139371 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
186 lines
7.4 KiB
Diff
186 lines
7.4 KiB
Diff
Index: systemd-190/src/vconsole/vconsole-setup.c
|
|
===================================================================
|
|
--- systemd-190.orig/src/vconsole/vconsole-setup.c
|
|
+++ systemd-190/src/vconsole/vconsole-setup.c
|
|
@@ -287,12 +287,14 @@ int main(int argc, char **argv) {
|
|
char *vc_kbd_delay = NULL;
|
|
char *vc_kbd_rate = NULL;
|
|
char *vc_kbd_disable_caps_lock = NULL;
|
|
+ char *vc_kbd_numlock = NULL;
|
|
char *vc_compose_table = NULL;
|
|
pid_t kbd_rate_pid = 0, compose_table_pid = 0;
|
|
#endif
|
|
int fd = -1;
|
|
bool utf8;
|
|
bool disable_capslock = false;
|
|
+ bool numlock = false;
|
|
int r = EXIT_FAILURE;
|
|
pid_t font_pid = 0, keymap_pid = 0;
|
|
|
|
@@ -388,6 +390,37 @@ int main(int argc, char **argv) {
|
|
vc_keymap = t;
|
|
}
|
|
disable_capslock = vc_kbd_disable_caps_lock && strcasecmp(vc_kbd_disable_caps_lock, "YES") == 0;
|
|
+ if (vc_kbd_numlock && strcasecmp(vc_kbd_numlock, "BIOS") == 0) {
|
|
+ int hwinfo_fd[2];
|
|
+ pid_t hwinfo_pid;
|
|
+
|
|
+ pipe(hwinfo_fd);
|
|
+ if ((hwinfo_pid = fork()) < 0) {
|
|
+ log_error("Failed to fork: %m");
|
|
+ _exit(EXIT_FAILURE);
|
|
+ } else if (hwinfo_pid == 0) {
|
|
+ const char *args[3];
|
|
+ int i = 0;
|
|
+ args[i++] = HWINFO;
|
|
+ args[i++] = "--bios";
|
|
+ args[i++] = NULL;
|
|
+ close(hwinfo_fd[0]);
|
|
+ fclose(stdout);
|
|
+ dup2(hwinfo_fd[1], STDOUT_FILENO);
|
|
+ execv(args[0], (char **) args);
|
|
+ _exit(EXIT_FAILURE);
|
|
+ } else {
|
|
+ char line[17];
|
|
+ FILE *hwinfo_file = fdopen(hwinfo_fd[0], "r");
|
|
+ close(hwinfo_fd[1]);
|
|
+ while (fgets(line, 17, hwinfo_file))
|
|
+ if (strstr(line, "Num Lock: on"))
|
|
+ numlock = true;
|
|
+ close(hwinfo_fd[0]);
|
|
+ fclose(hwinfo_file);
|
|
+ }
|
|
+ } else
|
|
+ numlock = vc_kbd_numlock && strcasecmp(vc_kbd_numlock, "YES") == 0;
|
|
|
|
#elif defined(TARGET_SUSE)
|
|
r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
|
|
@@ -395,6 +428,7 @@ int main(int argc, char **argv) {
|
|
"KBD_DELAY", &vc_kbd_delay,
|
|
"KBD_RATE", &vc_kbd_rate,
|
|
"KBD_DISABLE_CAPS_LOCK", &vc_kbd_disable_caps_lock,
|
|
+ "KBD_NUMLOCK", &vc_kbd_numlock,
|
|
"COMPOSETABLE", &vc_compose_table,
|
|
NULL);
|
|
if (r < 0 && r != -ENOENT)
|
|
@@ -565,6 +599,10 @@ int main(int argc, char **argv) {
|
|
finish:
|
|
if (keymap_pid > 0)
|
|
wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
|
|
+ if (numlock)
|
|
+ close(open("/run/numlock-on", O_WRONLY|O_CREAT, 0644));
|
|
+ else
|
|
+ unlink("/run/numlock-on");
|
|
|
|
#ifdef TARGET_SUSE
|
|
if (compose_table_pid > 0)
|
|
Index: systemd-190/Makefile.am
|
|
===================================================================
|
|
--- systemd-190.orig/Makefile.am
|
|
+++ systemd-190/Makefile.am
|
|
@@ -1989,6 +1989,19 @@ dist_udevrules_DATA += \
|
|
rules/61-accelerometer.rules
|
|
|
|
# ------------------------------------------------------------------------------
|
|
+numlock_on_SOURCES = \
|
|
+ src/login/numlock-on.c
|
|
+
|
|
+numlock_on_CFLAGS = \
|
|
+ $(AM_CFLAGS)
|
|
+
|
|
+udevlibexec_PROGRAMS += \
|
|
+ numlock-on
|
|
+
|
|
+dist_udevrules_DATA += \
|
|
+ rules/73-seat-numlock.rules
|
|
+
|
|
+# ------------------------------------------------------------------------------
|
|
if ENABLE_GUDEV
|
|
if ENABLE_GTK_DOC
|
|
SUBDIRS += \
|
|
Index: systemd-190/configure.ac
|
|
===================================================================
|
|
--- systemd-190.orig/configure.ac
|
|
+++ systemd-190/configure.ac
|
|
@@ -598,6 +598,13 @@ fi
|
|
with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
|
|
AC_DEFINE_UNQUOTED(DISTRIBUTION, ["${with_distro}"], [Target Distribution])
|
|
|
|
+if test z"$with_distro" = z"suse" ; then
|
|
+ AC_PATH_PROG([HWINFO], [hwinfo], [/usr/sbin/hwinfo], [/sbin:/usr/sbin:/usr/bin:/bin])
|
|
+ AC_DEFINE_UNQUOTED([HWINFO], ["${HWINFO}"], [Path to hwinfo binary. (SUSE)])
|
|
+fi
|
|
+AC_PATH_PROG([SETLEDS], [setleds], [/bin/setleds], [/sbin:/usr/sbin:/usr/bin:/bin])
|
|
+AC_DEFINE_UNQUOTED([SETLEDS], ["${SETLEDS}"], [Path to setleds binary.])
|
|
+
|
|
# Location of the init scripts as mandated by LSB
|
|
SYSTEM_SYSVINIT_PATH=/etc/init.d
|
|
SYSTEM_SYSVRCND_PATH=/etc/rc.d
|
|
Index: systemd-190/rules/73-seat-numlock.rules
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ systemd-190/rules/73-seat-numlock.rules
|
|
@@ -0,0 +1,8 @@
|
|
+# This file is part of systemd.
|
|
+#
|
|
+# systemd is free software; you can redistribute it and/or modify it
|
|
+# under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation; either version 2 of the License, or
|
|
+# (at your option) any later version.
|
|
+
|
|
+SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TEST=="/run/numlock-on", RUN+="numlock-on $env{DEVNAME}"
|
|
Index: systemd-190/src/login/numlock-on.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ systemd-190/src/login/numlock-on.c
|
|
@@ -0,0 +1,36 @@
|
|
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
|
+
|
|
+/***
|
|
+ This file is part of systemd.
|
|
+
|
|
+ Copyright 2012 Stanislav Brabec
|
|
+
|
|
+ systemd is free software; you can redistribute it and/or modify it
|
|
+ under the terms of the GNU General Public License as published by
|
|
+ the Free Software Foundation; either version 2 of the License, or
|
|
+ (at your option) any later version.
|
|
+
|
|
+ systemd is distributed in the hope that it will be useful, but
|
|
+ WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ General Public License for more details.
|
|
+
|
|
+ You should have received a copy of the GNU General Public License
|
|
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
+***/
|
|
+
|
|
+#include "config.h"
|
|
+#include <fcntl.h>
|
|
+#include <sysexits.h>
|
|
+#include <unistd.h>
|
|
+
|
|
+int main (int argc, char *argv[]) {
|
|
+ static char *args[] = { SETLEDS, "-D", "+num", NULL };
|
|
+
|
|
+ if (argc != 2)
|
|
+ return EX_USAGE;
|
|
+ close (STDIN_FILENO);
|
|
+ if (open (argv[1], O_RDONLY) != STDIN_FILENO)
|
|
+ return EX_IOERR;
|
|
+ return execv(args[0], args);
|
|
+}
|
|
Index: systemd-190/units/systemd-vconsole-setup.service.in
|
|
===================================================================
|
|
--- systemd-190.orig/units/systemd-vconsole-setup.service.in
|
|
+++ systemd-190/units/systemd-vconsole-setup.service.in
|
|
@@ -11,7 +11,7 @@ Documentation=man:systemd-vconsole-setup
|
|
DefaultDependencies=no
|
|
Conflicts=shutdown.target
|
|
After=systemd-readahead-collect.service systemd-readahead-replay.service
|
|
-Before=sysinit.target shutdown.target
|
|
+Before=sysinit.target shutdown.target udev-trigger.service
|
|
ConditionPathExists=/dev/tty0
|
|
|
|
[Service]
|