summaryrefslogtreecommitdiffstats
path: root/remote/modules/debug
diff options
context:
space:
mode:
authorSimon Rettberg2013-09-13 16:58:35 +0200
committerSimon Rettberg2013-09-13 16:58:35 +0200
commit5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0 (patch)
treeced9de90514efc86cc0e07b718778534e821761a /remote/modules/debug
parent[debug] Optionally include tcpdump and getfacl (diff)
parent[blacklists] desktop-session/gnome: 'includes' for Gnome (diff)
downloadtm-scripts-5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0.tar.gz
tm-scripts-5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0.tar.xz
tm-scripts-5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Conflicts: remote/modules/debug/debug.conf
Diffstat (limited to 'remote/modules/debug')
-rw-r--r--remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service8
l---------remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service1
-rwxr-xr-xremote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger2
-rw-r--r--remote/modules/debug/debug.conf1
-rw-r--r--remote/modules/debug/debug.conf.opensuse1
5 files changed, 12 insertions, 1 deletions
diff --git a/remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service b/remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service
new file mode 100644
index 00000000..d834292f
--- /dev/null
+++ b/remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Logger for udevd-messages via udevadmin monitor
+DefaultDependencies=no
+IgnoreOnIsolate=yes
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-debug_udevd_logger
diff --git a/remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service b/remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service
new file mode 120000
index 00000000..ad7f978f
--- /dev/null
+++ b/remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service
@@ -0,0 +1 @@
+../debug-udevd_logger.service \ No newline at end of file
diff --git a/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger b/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger
new file mode 100755
index 00000000..8b772517
--- /dev/null
+++ b/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/udevadm monitor | /usr/bin/logger
diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
index 66f90011..82a741fe 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/debug.conf
@@ -12,6 +12,7 @@ REQUIRED_BINARIES="
su
file
@htop
+ logger
@tcpdump
getfacl
"
diff --git a/remote/modules/debug/debug.conf.opensuse b/remote/modules/debug/debug.conf.opensuse
index e4306fc3..b7971956 100644
--- a/remote/modules/debug/debug.conf.opensuse
+++ b/remote/modules/debug/debug.conf.opensuse
@@ -8,5 +8,4 @@ REQUIRED_INSTALLED_PACKAGES="
"
REQUIRED_BINARIES+="
fonts-config
- logger
"