From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SpQUc-0005iX-Oo for garchives@archives.gentoo.org; Thu, 12 Jul 2012 21:00:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30460E0652; Thu, 12 Jul 2012 20:59:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F3A56E0652 for ; Thu, 12 Jul 2012 20:59:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61DCC1B4060 for ; Thu, 12 Jul 2012 20:59:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6732E543C for ; Thu, 12 Jul 2012 20:59:50 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1342126723.3c096a7efc4f8cb45938045c6e92bb827f4602cc.WilliamH@gentoo> Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/ X-VCS-Repository: proj/udev-gentoo-scripts X-VCS-Files: init.d/udev X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 3c096a7efc4f8cb45938045c6e92bb827f4602cc X-VCS-Branch: master Date: Thu, 12 Jul 2012 20:59:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ff641449-3626-44d4-b3c8-5c739818bb12 X-Archives-Hash: d62bfb1c5a0e2a50facea03200ab828e commit: 3c096a7efc4f8cb45938045c6e92bb827f4602cc Author: William Hubbs gentoo org> AuthorDate: Thu Jul 12 20:58:43 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jul 12 20:58:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/udev-gentoo-s= cripts.git;a=3Dcommit;h=3D3c096a7e disable oldnet hotplug after udev starts The /run/udev/rules.d directory does not exist until after udev starts, so we can't disable hotplugging until then. --- init.d/udev | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/init.d/udev b/init.d/udev index a054800..d2dd746 100644 --- a/init.d/udev +++ b/init.d/udev @@ -67,6 +67,25 @@ check_kernel() return 0 } =20 +start_pre() +{ + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" >/proc/sys/kernel/hotplug + fi + + # load unix domain sockets if built as module, Bug #221253 + # and not yet loaded, Bug #363549 + if [ ! -e /proc/net/unix ]; then + if ! modprobe unix; then + eerror "Cannot load the unix domain socket module" + fi + fi + + if yesno "${udev_debug}"; then + command_args=3D"${command_args} --debug 2> /run/udevdebug.log" + fi +} + is_service_enabled() { local svc=3D"$1" @@ -78,7 +97,7 @@ is_service_enabled() return 1 } =20 -start_pre() +disable_oldnet_hotplug() { if is_service_enabled network; then # disable network hotplugging @@ -87,22 +106,6 @@ start_pre() echo "# old-style openrc net scripts" >> "${f}" echo "# as we use /etc/init.d/network to set up our network" >> "${f}" fi - - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi - - # load unix domain sockets if built as module, Bug #221253 - # and not yet loaded, Bug #363549 - if [ ! -e /proc/net/unix ]; then - if ! modprobe unix; then - eerror "Cannot load the unix domain socket module" - fi - fi - - if yesno "${udev_debug}"; then - command_args=3D"${command_args} --debug 2> /run/udevdebug.log" - fi } =20 start_udevmonitor() @@ -173,6 +176,7 @@ display_hotplugged_services() =20 start_post() { + disable_oldnet_hotplug start_udevmonitor populate_dev stop_udevmonitor