1 |
commit: 4015c45dbdcb3207bb428d13ee0bc965afa978b1 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 30 23:36:44 2012 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 30 23:36:44 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=4015c45d |
7 |
|
8 |
remove udev-postmount |
9 |
|
10 |
Since the persistent net and cd rules generators are removed, there is |
11 |
no longer a function for udev-postmount. |
12 |
|
13 |
--- |
14 |
init.d/udev | 4 --- |
15 |
init.d/udev-postmount | 66 ------------------------------------------------- |
16 |
2 files changed, 0 insertions(+), 70 deletions(-) |
17 |
|
18 |
diff --git a/init.d/udev b/init.d/udev |
19 |
index ff53537..2541a0c 100644 |
20 |
--- a/init.d/udev |
21 |
+++ b/init.d/udev |
22 |
@@ -100,10 +100,6 @@ start_pre() |
23 |
echo "# as we use /etc/init.d/network to set up our network" >> "${f}" |
24 |
fi |
25 |
|
26 |
- if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then |
27 |
- ewarn "You should add udev-postmount service to your default runlevel." |
28 |
- fi |
29 |
- |
30 |
/lib/udev/write_root_link_rule |
31 |
|
32 |
if [ -e /proc/sys/kernel/hotplug ]; then |
33 |
|
34 |
diff --git a/init.d/udev-postmount b/init.d/udev-postmount |
35 |
deleted file mode 100644 |
36 |
index fcf5864..0000000 |
37 |
--- a/init.d/udev-postmount |
38 |
+++ /dev/null |
39 |
@@ -1,66 +0,0 @@ |
40 |
-#!/sbin/runscript |
41 |
-# Copyright 1999-2010 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-udev_version() |
45 |
-{ |
46 |
- udevadm --version |
47 |
-} |
48 |
- |
49 |
-depend() |
50 |
-{ |
51 |
- need localmount |
52 |
- if [ $(udev_version) -lt 175 ]; then |
53 |
- after dbus # for trigger failed |
54 |
- fi |
55 |
- keyword -vserver -lxc |
56 |
-} |
57 |
- |
58 |
-dir_writeable() |
59 |
-{ |
60 |
- touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ |
61 |
-} |
62 |
- |
63 |
-# store persistent-rules that got created while booting |
64 |
-# when / was still read-only |
65 |
-store_persistent_rules() |
66 |
-{ |
67 |
- # only continue if rules-directory is writable |
68 |
- dir_writeable /etc/udev/rules.d || return 0 |
69 |
- |
70 |
- local file dest |
71 |
- for file in "${RUNDIR}"/tmp-rules--*; do |
72 |
- dest=${file##*tmp-rules--} |
73 |
- [ "$dest" = '*' ] && break |
74 |
- type=${dest##70-persistent-} |
75 |
- type=${type%%.rules} |
76 |
- ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" |
77 |
- cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" |
78 |
- eend $? "Failed moving persistent rules!" |
79 |
- done |
80 |
-} |
81 |
- |
82 |
-start() |
83 |
-{ |
84 |
- RUNDIR=$(udevadm info --run) |
85 |
- # check if this system uses udev |
86 |
- [ -d "${RUNDIR}" ] || return 0 |
87 |
- |
88 |
- einfo "Doing udev cleanups" |
89 |
- |
90 |
- if [ $(udev_version) -lt 175 ]; then |
91 |
- # Run the events that failed at first udev trigger |
92 |
- udevadm trigger --type=failed -v |
93 |
- fi |
94 |
- |
95 |
- # store persistent-rules that got created while booting |
96 |
- # when / was still read-only |
97 |
- store_persistent_rules |
98 |
-} |
99 |
- |
100 |
-stop() |
101 |
-{ |
102 |
- return 0 |
103 |
-} |
104 |
- |
105 |
-# vim:ts=4 |