| 1 |
commit: 1dbe971168bcc3f28b730e81afc03fe6de531b57 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 18:58:09 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 18:58:09 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=1dbe9711 |
| 7 |
|
| 8 |
Move code from _start functions to start |
| 9 |
|
| 10 |
The _start functions are no longer needed since they were called by the |
| 11 |
addons. |
| 12 |
|
| 13 |
--- |
| 14 |
init.d/udev | 10 ++-------- |
| 15 |
init.d/udev-mount | 5 ----- |
| 16 |
2 files changed, 2 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/init.d/udev b/init.d/udev |
| 19 |
index 3dfd442..5ec0f23 100644 |
| 20 |
--- a/init.d/udev |
| 21 |
+++ b/init.d/udev |
| 22 |
@@ -238,15 +238,7 @@ start() |
| 23 |
fi |
| 24 |
|
| 25 |
check_openrc_net |
| 26 |
- _start |
| 27 |
- |
| 28 |
- display_hotplugged_services |
| 29 |
- |
| 30 |
- return 0 |
| 31 |
-} |
| 32 |
|
| 33 |
-_start() |
| 34 |
-{ |
| 35 |
if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then |
| 36 |
ewarn "You should add udev-postmount service to your default runlevel." |
| 37 |
fi |
| 38 |
@@ -264,6 +256,8 @@ _start() |
| 39 |
|
| 40 |
check_udev_works || cleanup |
| 41 |
stop_udevmonitor |
| 42 |
+ |
| 43 |
+ display_hotplugged_services |
| 44 |
|
| 45 |
return 0 |
| 46 |
} |
| 47 |
|
| 48 |
diff --git a/init.d/udev-mount b/init.d/udev-mount |
| 49 |
index 55a30a2..f81d82d 100644 |
| 50 |
--- a/init.d/udev-mount |
| 51 |
+++ b/init.d/udev-mount |
| 52 |
@@ -83,11 +83,6 @@ start() |
| 53 |
return 1 |
| 54 |
fi |
| 55 |
|
| 56 |
- _start |
| 57 |
-} |
| 58 |
- |
| 59 |
-_start() |
| 60 |
-{ |
| 61 |
check_kernel || return 1 |
| 62 |
mount_dev_directory || return 1 |
Archives