Hello community,
here is the log from the commit of package udev for openSUSE:Factory checked in
at 2012-09-23 17:31:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/udev (Old)
and /work/SRC/openSUSE:Factory/.udev.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "udev", Maintainer is "rmila...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/udev/udev.changes 2012-08-13
19:54:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.udev.new/udev.changes 2012-09-23
17:31:04.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 18 09:26:59 UTC 2012 - rmila...@suse.com
+
+- create /dev/root symlink with dynamic rule for systemd (bnc#776882).
+
+-------------------------------------------------------------------
New:
----
udev-root-symlink.systemd
write_dev_root_rule
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ udev.spec ++++++
--- /var/tmp/diff_new_pack.aAAAfs/_old 2012-09-23 17:31:07.000000000 +0200
+++ /var/tmp/diff_new_pack.aAAAfs/_new 2012-09-23 17:31:07.000000000 +0200
@@ -50,6 +50,8 @@
Source1: udev-rpmlintrc
Source2: baselibs.conf
Source60: boot.udev
+Source61: write_dev_root_rule
+Source62: udev-root-symlink.systemd
# PATCH-FIX-OPENSUSE move-udevd-and-udevadm-back-to-sbin.patch
Patch0: move-udevd-and-udevadm-back-to-sbin.patch
# PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch
@@ -240,6 +242,10 @@
cp -ax README NEWS $RPM_BUILD_ROOT%{_docdir}/udev
install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev
+install -m755 -D %{S:61} $RPM_BUILD_ROOT/lib/udev/write_dev_root_rule
+install -m644 -D %{S:62}
$RPM_BUILD_ROOT/lib/systemd/system/udev-root-symlink.service
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants
+ln -sf ../udev-root-symlink.service
$RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants
%pre
/usr/bin/getent group tape > /dev/null 2>&1 || /usr/sbin/groupadd -r tape 2>
/dev/null
++++++ boot.udev ++++++
--- /var/tmp/diff_new_pack.aAAAfs/_old 2012-09-23 17:31:07.000000000 +0200
+++ /var/tmp/diff_new_pack.aAAAfs/_new 2012-09-23 17:31:07.000000000 +0200
@@ -17,24 +17,12 @@
PATH="/sbin:/bin"
udev_timeout=180
-root_symlink_rule() {
- eval $(/sbin/udevadm info --export --export-prefix=ROOT_
--device-id-of-file=/)
- [ "$ROOT_MAJOR" -gt 0 ] || return
-
- [ -d /run/udev/rules.d ] || mkdir -m 0755 -p /run/udev/rules.d
- ln -sf /run/udev/rules.d /dev/.udev 2>/dev/null || :
-
- echo "\
-ACTION==\"add|change\", SUBSYSTEM==\"block\", \
-ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", \
-SYMLINK+=\"root\"" > /run/udev/rules.d/10-root-symlink.rules
-}
-
-
case "$1" in
start)
# create /dev/root symlink with dynamic rule
- root_symlink_rule
+ if [ -x /lib/udev/write_dev_root_rule ]; then
+ /lib/udev/write_dev_root_rule
+ fi
# start udevd
echo -n "Starting udevd: "
++++++ udev-root-symlink.systemd ++++++
[Unit]
Description=create /dev/root symlink with dynamic rule
Before=udev.service
DefaultDependencies=no
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/lib/udev/write_dev_root_rule
++++++ write_dev_root_rule ++++++
#!/bin/sh
eval $(/sbin/udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/)
[ "$ROOT_MAJOR" -gt 0 ] || return
mkdir -m 0755 -p /run/udev/rules.d >/dev/null 2>&1
ln -sf /run/udev /dev/.udev 2>/dev/null || :
echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", \
ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", \
SYMLINK+=\"root\"" > /run/udev/rules.d/10-root-symlink.rules
exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
