[systemd-commits] 2 commits - Makefile.am src/udev TODO

[Kay Sievers]

 Makefile.am                                  |   13 +++++--------
 TODO                                         |    2 ++
 src/udev/keymap/keyboard-force-release.sh    |   22 ++++++++++++++++++++++
 src/udev/keymap/keyboard-force-release.sh.in |   22 ----------------------
 src/udev/test-udev.c                         |    6 +++---
 5 files changed, 32 insertions(+), 33 deletions(-)

New commits:
commit f1ff47be175bdcb8ed8512393fee9f9615501e24
Author: Kay Sievers <kay at vrfy.org>
Date:   Sun Apr 8 17:08:09 2012 +0200

    udev: keymap: remove rootprefix mangling from script

diff --git a/Makefile.am b/Makefile.am
index f22806e..d4b706e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1634,20 +1634,16 @@ dist_udevrules_DATA += \
 	src/udev/keymap/95-keyboard-force-release.rules
 
 dist_udevhome_SCRIPTS = \
-	src/udev/keymap/findkeyboards
-
-udevhome_SCRIPTS = \
+	src/udev/keymap/findkeyboards \
 	src/udev/keymap/keyboard-force-release.sh
 
 EXTRA_DIST += \
-	src/udev/keymap/check-keymaps.sh \
-	src/udev/keymap/keyboard-force-release.sh.in
+	src/udev/keymap/check-keymaps.sh
 
 CLEANFILES += \
 	$(nodist_keymap_SOURCES) \
 	src/udev/keymap/keys.txt \
-	src/udev/keymap/keys-from-name.gperf \
-	src/udev/keymap/keyboard-force-release.sh
+	src/udev/keymap/keys-from-name.gperf
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
diff --git a/src/udev/keymap/keyboard-force-release.sh b/src/udev/keymap/keyboard-force-release.sh
new file mode 100755
index 0000000..a44fda2
--- /dev/null
+++ b/src/udev/keymap/keyboard-force-release.sh
@@ -0,0 +1,22 @@
+#/bin/sh -e
+# read list of scancodes, convert hex to decimal and
+# append to the atkbd force_release sysfs attribute
+# $1 sysfs devpath for serioX
+# $2 file with scancode list (hex or dec)
+
+case "$2" in
+        /*) scf="$2" ;;
+        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
+esac
+
+read attr <"/sys/$1/force_release"
+while read scancode dummy; do
+        case "$scancode" in
+                \#*) ;;
+                *)
+                        scancode=$(($scancode))
+                        attr="$attr${attr:+,}$scancode"
+                        ;;
+        esac
+done <"$scf"
+echo "$attr" >"/sys/$1/force_release"
diff --git a/src/udev/keymap/keyboard-force-release.sh.in b/src/udev/keymap/keyboard-force-release.sh.in
deleted file mode 100755
index dd040ce..0000000
--- a/src/udev/keymap/keyboard-force-release.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!@rootprefix@/bin/sh -e
-# read list of scancodes, convert hex to decimal and
-# append to the atkbd force_release sysfs attribute
-# $1 sysfs devpath for serioX
-# $2 file with scancode list (hex or dec)
-
-case "$2" in
-        /*) scf="$2" ;;
-        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
-esac
-
-read attr <"/sys/$1/force_release"
-while read scancode dummy; do
-        case "$scancode" in
-                \#*) ;;
-                *)
-                        scancode=$(($scancode))
-                        attr="$attr${attr:+,}$scancode"
-                        ;;
-        esac
-done <"$scf"
-echo "$attr" >"/sys/$1/force_release"

commit 1c0f62e37b0e775df7cb6121bc6ae64d1d885d3b
Author: Kay Sievers <kay at vrfy.org>
Date:   Sun Apr 8 17:03:17 2012 +0200

    udev: fix test-udev binary

diff --git a/Makefile.am b/Makefile.am
index 8d3ec4c..f22806e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1347,7 +1347,8 @@ test_udev_CFLAGS = \
 	$(udev_common_CFLAGS)
 
 test_udev_LDADD = \
-	$(udev_common_LDADD)
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
 
 test_udev_CPPFLAGS = \
 	$(udev_common_CPPFLAGS)
diff --git a/TODO b/TODO
index 0b80d65..d794cbb 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
 Bugfixes:
+* fix Fedora's cups.rpm to use tmpfiles instead of /lib/udev/devices/
+
 * do not link selinux and attr against all binaries
 
 * swap units that are activated by one name but shown in the kernel under another are semi-broken
diff --git a/src/udev/test-udev.c b/src/udev/test-udev.c
index 8cf07cc..53ecd95 100644
--- a/src/udev/test-udev.c
+++ b/src/udev/test-udev.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
         udev = udev_new();
         if (udev == NULL)
-                exit(1);
+                exit(EXIT_FAILURE);
         log_debug("version %s\n", VERSION);
         udev_selinux_init(udev);
 
@@ -116,6 +116,6 @@ out:
         udev_selinux_exit(udev);
         udev_unref(udev);
         if (err != 0)
-                return 1;
-        return 0;
+                return EXIT_FAILURE;
+        return EXIT_SUCCESS;
 }