[gentoo-commits] gentoo-x86 commit in sys-fs/udev/files: udev-mount-135-r2.initd udev-start-135-r2.sh udev-dev-tarball-135-r2.initd udev-135-r2.initd

[gentoo-commits] gentoo-x86 commit in sys-fs/udev/files: udev-mount-135-r2.initd udev-start-135-r2.sh udev-dev-tarball-135-r2.initd udev-135-r2.initd

[Matthias Schwarzott (zzam)]

zzam        08/12/13 07:42:55

  Modified:             udev-mount-135-r2.initd udev-start-135-r2.sh
                        udev-dev-tarball-135-r2.initd udev-135-r2.initd
  Log:
  Fix udev-start to call the init-scripts, but not the openrc-version checks.
  (Portage version: 2.1.6/cvs/Linux 2.6.27-gentoo-r1 i686)

Revision  Changes    Path
1.2                  sys-fs/udev/files/udev-mount-135-r2.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-mount-135-r2.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-mount-135-r2.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-mount-135-r2.initd?r1=1.1&r2=1.2

Index: udev-mount-135-r2.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-mount-135-r2.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-mount-135-r2.initd	10 Dec 2008 22:29:09 -0000	1.1
+++ udev-mount-135-r2.initd	13 Dec 2008 07:42:55 -0000	1.2
@@ -78,6 +78,11 @@
 		return 1
 	fi
 
+	_start
+}
+
+_start()
+{
 	check_kernel || return 1
 	mount_dev_directory || return 1
 



1.2                  sys-fs/udev/files/udev-start-135-r2.sh

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-135-r2.sh?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-135-r2.sh?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-135-r2.sh?r1=1.1&r2=1.2

Index: udev-start-135-r2.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-start-135-r2.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-start-135-r2.sh	10 Dec 2008 22:29:09 -0000	1.1
+++ udev-start-135-r2.sh	13 Dec 2008 07:42:55 -0000	1.2
@@ -20,9 +20,8 @@
 start_initd()
 {
 	(
-		called_from_addon=1
 		. /etc/init.d/"$1"
-		start
+		_start
 	)
 }
 # mount tmpfs on /dev
@@ -36,5 +35,8 @@
 
 compat_volume_nodes
 
+# inject into boot runlevel
+IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1
+
 # udev started successfully
 exit 0



1.2                  sys-fs/udev/files/udev-dev-tarball-135-r2.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-dev-tarball-135-r2.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-dev-tarball-135-r2.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-dev-tarball-135-r2.initd?r1=1.1&r2=1.2

Index: udev-dev-tarball-135-r2.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-dev-tarball-135-r2.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-dev-tarball-135-r2.initd	10 Dec 2008 22:29:09 -0000	1.1
+++ udev-dev-tarball-135-r2.initd	13 Dec 2008 07:42:55 -0000	1.2
@@ -16,6 +16,10 @@
 
 start()
 {
+	_start
+}
+
+_start() {
 	if yesno "${rc_device_tarball}" && \
 		[ -s "${device_tarball}" ]
 	then



1.2                  sys-fs/udev/files/udev-135-r2.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd?r1=1.1&r2=1.2

Index: udev-135-r2.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-135-r2.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-135-r2.initd	10 Dec 2008 22:29:09 -0000	1.1
+++ udev-135-r2.initd	13 Dec 2008 07:42:55 -0000	1.2
@@ -175,6 +175,15 @@
 		return 1
 	fi
 
+	_start
+	
+	display_hotplugged_services
+
+	inject_postmount_initd
+}
+
+_start()
+{
 	root_link
 	persistent_net_switch
 	
@@ -186,11 +195,6 @@
 
 	check_udev_works || cleanup
 
-	if [ "$called_from_addon" != "1" ]; then
-		display_hotplugged_services
-	fi
-
-	inject_postmount_initd
 	return 0
 }