udev: copy systemd specific files from data

11 files changed, 75 insertions, 20 deletions

diff --git a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service
new file mode 120000
index 00000000..3df21468
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service
@@ -0,0 +1 @@
+../udev-trigger.service
\ No newline at end of file
diff --git a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service
new file mode 120000
index 00000000..d94dbc16
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service
@@ -0,0 +1 @@
+../udev.service
\ No newline at end of file
diff --git a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket
new file mode 120000
index 00000000..24d13e63
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket
@@ -0,0 +1 @@
+../udev-control.socket
\ No newline at end of file
diff --git a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket
new file mode 120000
index 00000000..c12bc879
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket
@@ -0,0 +1 @@
+../udev-kernel.socket
\ No newline at end of file
diff --git a/remote/tools/udev/data/etc/systemd/system/udev-control.socket b/remote/tools/udev/data/etc/systemd/system/udev-control.socket
new file mode 100644
index 00000000..858ddffd
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/udev-control.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=udev Control Socket
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Socket]
+Service=udev.service
+ListenSequentialPacket=/run/udev/control
diff --git a/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket b/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket
new file mode 100644
index 00000000..1c554537
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=udev Kernel Socket
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Socket]
+Service=udev.service
+ReceiveBuffer=134217728
+ListenNetlink=kobject-uevent 1
diff --git a/remote/tools/udev/data/etc/systemd/system/udev-settle.service b/remote/tools/udev/data/etc/systemd/system/udev-settle.service
new file mode 100644
index 00000000..5ebad476
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/udev-settle.service
@@ -0,0 +1,25 @@
+# This service is usually not enabled by default. If enabled, it
+# acts as a barrier for basic.target -- so all later services will
+# wait for udev completely finishing its coldplug run.
+#
+# If needed, to work around broken or non-hotplug-aware services,
+# it might be enabled unconditionally, or pulled-in on-demand by
+# the services that assume a fully populated /dev at startup. It
+# should not be used or pulled-in ever on systems without such
+# legacy services running.
+
+[Unit]
+Description=udev Wait for Complete Device Initialization
+DefaultDependencies=no
+Wants=udev.service
+After=udev-trigger.service
+Before=basic.target
+
+[Service]
+Type=oneshot
+TimeoutSec=180
+RemainAfterExit=yes
+ExecStart=/sbin/udevadm settle
+
+[Install]
+WantedBy=basic.target
diff --git a/remote/tools/udev/data/etc/systemd/system/udev-trigger.service b/remote/tools/udev/data/etc/systemd/system/udev-trigger.service
new file mode 100644
index 00000000..88ec5acc
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/udev-trigger.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=udev Coldplug all Devices
+Wants=udev.service
+After=udev-kernel.socket udev-control.socket
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/sbin/udevadm trigger --type=subsystems --action=add ; /sbin/udevadm trigger --type=devices --action=add
diff --git a/remote/tools/udev/data/etc/systemd/system/udev.service b/remote/tools/udev/data/etc/systemd/system/udev.service
new file mode 100644
index 00000000..12bb582a
--- /dev/null
+++ b/remote/tools/udev/data/etc/systemd/system/udev.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=udev Kernel Device Manager
+Wants=udev-control.socket udev-kernel.socket
+After=udev-control.socket udev-kernel.socket
+Before=basic.target
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Service]
+Type=notify
+OOMScoreAdjust=-1000
+Sockets=udev-control.socket udev-kernel.socket
+Restart=on-failure
+ExecStart=/sbin/udevd
diff --git a/remote/tools/udev/udev.build b/remote/tools/udev/udev.build
index fe1b74e9..f16d747e 100644
--- a/remote/tools/udev/udev.build
+++ b/remote/tools/udev/udev.build
@@ -24,26 +24,12 @@ build() {
   [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
   tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR
   
-  # fix path: everything in lib/systemd to usr/lib/systemd
-  cd $BUILDDIR
-
-  TARLIST="list_files_to_fix_prefix"
-  [ -f $TARLIST ] && rm $TARLIST
-
-  # find files and symlinks with wrong prefix
-  for FILE in $(find . -type f -o -type l|grep ^./lib/systemd)
-  do
-	echo $FILE >> $TARLIST
-  done
-  # copy found files to usr/*
-  [ ! -d $BUILDDIR/usr ] && mkdir -p $BUILDDIR/usr
-  tar -cpv $(cat $TARLIST|sort -u) | tar -xpv -C $BUILDDIR/usr
-  # delete original location, removing only $TARLIST leave directories
-  # so simply delete everything under ./lib/systemd
-  rm -rf ./lib/systemd 
-  cd -
 }
 
 post_copy() {
-        :
+		#copy systemd specific files 
+		SYSTEMDDIR=$INIT_DIR/etc/systemd/system
+		[ ! -d $SYSTEMDDIR ] && mkdir -p $SYSTEMDDIR
+    cp -r $TOOL_DIR/$TOOL/data/* $INIT_DIR
+
 }
diff --git a/remote/tools/udev/udev.conf b/remote/tools/udev/udev.conf
index 1e7a6cde..7097012c 100644
--- a/remote/tools/udev/udev.conf
+++ b/remote/tools/udev/udev.conf
@@ -16,6 +16,5 @@ REQUIRED_BINARIES="	accelerometer
 			udevd"
 REQUIRED_DIRECTORIES="	/etc/udev
 			/lib/udev
-			/usr/lib/systemd/system"
 REQUIRED_FILES="	/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
 			/lib/udev/findkeyboards"