Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: helpers/, init.d/, /
Date: Sat, 30 Jun 2012 23:47:44
Message-Id: 1341099830.95f2c9b3242d6dea3dd81f4e19c1734216839072.WilliamH@gentoo
1 commit: 95f2c9b3242d6dea3dd81f4e19c1734216839072
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 30 23:43:50 2012 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 30 23:43:50 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=95f2c9b3
7
8 Drop the write_root_link_rule helper
9
10 This udev helper created /dev/root, which was a link to the root device.
11 However, this should not be needed.
12
13 ---
14 Makefile | 3 +--
15 helpers/write_root_link_rule | 29 -----------------------------
16 init.d/udev | 2 --
17 3 files changed, 1 insertions(+), 33 deletions(-)
18
19 diff --git a/Makefile b/Makefile
20 index 2844d4a..b4fbb67 100644
21 --- a/Makefile
22 +++ b/Makefile
23 @@ -9,8 +9,7 @@ CONFD ?= $(SYSCONFDIR)/conf.d
24 INITD ?= $(SYSCONFDIR)/init.d
25
26 HELPERS = \
27 - helpers/net.sh \
28 - helpers/write_root_link_rule
29 + helpers/net.sh
30
31 all:
32 @echo "Run make install DESTDIR="
33
34 diff --git a/helpers/write_root_link_rule b/helpers/write_root_link_rule
35 deleted file mode 100755
36 index 56c7998..0000000
37 --- a/helpers/write_root_link_rule
38 +++ /dev/null
39 @@ -1,29 +0,0 @@
40 -#!/bin/sh
41 -#
42 -# This script should run before doing udevtrigger at boot.
43 -# It will create a rule matching the device directory / is on, and
44 -# creating /dev/root symlink pointing on its device node.
45 -#
46 -# This is especially useful for hal looking at /proc/mounts containing
47 -# a line listing /dev/root as device:
48 -# /dev/root / reiserfs rw 0 0
49 -#
50 -# This program is free software; you can redistribute it and/or modify it
51 -# under the terms of the GNU General Public License as published by the
52 -# Free Software Foundation version 2 of the License.
53 -#
54 -# (c) 2007-2008 Matthias Schwarzott <zzam@g.o>
55 -
56 -eval $(udevadm info --export --export-prefix="ROOT_" --device-id-of-file=/)
57 -
58 -[ $? = 0 ] || exit 0
59 -[ "$ROOT_MAJOR" = 0 ] && exit 0
60 -
61 -[ -e /run ] && DIR=/run/udev/rules.d || DIR=/dev/.udev/rules.d
62 -[ -d "$DIR" ] || mkdir -p "$DIR"
63 -RULES=$DIR/10-root-link.rules
64 -
65 -echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}"
66 -echo "# This rule should create /dev/root as link to real root device." >> "${RULES}"
67 -echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", SYMLINK+=\"root\"" >> "${RULES}"
68 -
69
70 diff --git a/init.d/udev b/init.d/udev
71 index 2541a0c..9eb74bd 100644
72 --- a/init.d/udev
73 +++ b/init.d/udev
74 @@ -100,8 +100,6 @@ start_pre()
75 echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
76 fi
77
78 - /lib/udev/write_root_link_rule
79 -
80 if [ -e /proc/sys/kernel/hotplug ]; then
81 echo "" >/proc/sys/kernel/hotplug
82 fi