Add dummy clock and modules init.d scripts to avoid dying during startup. Bug #129166.

(Portage version: 2.1_pre7-r4)

5 files changed, 36 insertions, 19 deletions

diff --git a/sys-freebsd/freebsd-baselayout/ChangeLog b/sys-freebsd/freebsd-baselayout/ChangeLog
index 51968b3d3173..d551935e31a5 100644
--- a/sys-freebsd/freebsd-baselayout/ChangeLog
+++ b/sys-freebsd/freebsd-baselayout/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/ChangeLog,v 1.3 2006/04/02 21:49:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/ChangeLog,v 1.4 2006/04/08 10:56:02 flameeyes Exp $
+
+*freebsd-baselayout-20060401-r1 (08 Apr 2006)
+
+  08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> +files/dummy.initd,
+  -freebsd-baselayout-20060401.ebuild,
+  +freebsd-baselayout-20060401-r1.ebuild:
+  Add dummy clock and modules init.d scripts to avoid dying during startup.
+  Bug #129166.
 
   01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-baselayout-20060401.ebuild:
diff --git a/sys-freebsd/freebsd-baselayout/Manifest b/sys-freebsd/freebsd-baselayout/Manifest
index 27e068ab74bf..72b0d88202f3 100644
--- a/sys-freebsd/freebsd-baselayout/Manifest
+++ b/sys-freebsd/freebsd-baselayout/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d0988ff08f5b70763bb856e6df38ff2b ChangeLog 3854
 RMD160 7f604ea06ca63cf0f3923d5413fb0a445c705bbf ChangeLog 3854
 SHA256 20ed10d9af828d27bca24e49be4c3bcb144b328f6a384f312b3cf14a03fbd292 ChangeLog 3854
-MD5 e976bdc5ab7291838293ac9765bb3aaa files/digest-freebsd-baselayout-20060401 560
-RMD160 5e8df4ae6ac94bd3569a5c949419cbd3ff8c21ab files/digest-freebsd-baselayout-20060401 560
-SHA256 986d1edf26c70067016d1b46851130e3c24d7d3279635a6ec8654560730d5460 files/digest-freebsd-baselayout-20060401 560
+MD5 e976bdc5ab7291838293ac9765bb3aaa files/digest-freebsd-baselayout-20060401-r1 560
+RMD160 5e8df4ae6ac94bd3569a5c949419cbd3ff8c21ab files/digest-freebsd-baselayout-20060401-r1 560
+SHA256 986d1edf26c70067016d1b46851130e3c24d7d3279635a6ec8654560730d5460 files/digest-freebsd-baselayout-20060401-r1 560
+MD5 3982112fc4bf2d6f7adabbc28035fad3 files/dummy.initd 186
+RMD160 1802974f22719d82ec99911a3bd669412719a171 files/dummy.initd 186
+SHA256 1fe737503cd68c7a77aec997567e30aa5ff01adfb92f028ad57a5c4aab0afbc0 files/dummy.initd 186
 MD5 059ff3014205750225ae743b6821c0bd files/profile 2053
 RMD160 254d1aa5a81e2bfa7cb5d0b2f6f53d544195be52 files/profile 2053
 SHA256 489703e9a80c9b9d66f3b4f922a191f238ad9111479b22d90bb6d0c8905a2383 files/profile 2053
-MD5 0f66939de53ac85058d4262214ca2981 freebsd-baselayout-20060401.ebuild 19882
-RMD160 4653d746233dad5a8744dc0ee1aaabf4c2ae2ca5 freebsd-baselayout-20060401.ebuild 19882
-SHA256 eb8acfe6260735bbe3743dc3202e14bc606a7c0fe21ff8850f5c7349a248cba0 freebsd-baselayout-20060401.ebuild 19882
+MD5 59aceb8c3c3118b140be2aa8090f0ebb freebsd-baselayout-20060401-r1.ebuild 20091
+RMD160 fffdd41a54d12b64c0ce3e4530db2289bbf26da2 freebsd-baselayout-20060401-r1.ebuild 20091
+SHA256 e0f7f2ce43f7c0765be8439d5973483b2db35377118991cdc1608ecf943b5ee6 freebsd-baselayout-20060401-r1.ebuild 20091
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEMEcSAiZjviIA2XgRApIRAJ9hxQHUfieLVuIpn8OZh5YDx2PKEACgrDvE
-bc3COaHULGdkLh9i49bVtFo=
-=jWlM
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401 b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r1
index 0b7a79ec7cb4..0b7a79ec7cb4 100644
--- a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401
+++ b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r1
diff --git a/sys-freebsd/freebsd-baselayout/files/dummy.initd b/sys-freebsd/freebsd-baselayout/files/dummy.initd
new file mode 100755
index 000000000000..c267b43e1a9f
--- /dev/null
+++ b/sys-freebsd/freebsd-baselayout/files/dummy.initd
@@ -0,0 +1,8 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	# This is a fake, you know that?
+	einfo "Fake"
+}
diff --git a/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401.ebuild b/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r1.ebuild
index 0c620ee92884..5e8a64322b6d 100644
--- a/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401.ebuild
+++ b/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401.ebuild,v 1.2 2006/04/01 17:10:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r1.ebuild,v 1.1 2006/04/08 10:56:02 flameeyes Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib autotools
 
@@ -292,6 +292,12 @@ src_install() {
 	# doinitd doesnt respect symlinks
 	dodir /etc/init.d
 	cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+	# These two aren't working on Gentoo/FreeBSD, replace with dummy modules in
+	# the time being
+	rm -f "${D}"/etc/init.d/{clock,modules}
+	newinitd "${FILESDIR}/dummy.initd" clock
+	newinitd "${FILESDIR}/dummy.initd" modules
+
 	#doinitd "${S}"/init.d/* || die "doinitd"
 	doconfd "${S}"/etc/conf.d/* || die "doconfd"
 	doenvd "${S}"/etc/env.d/* || die "doenvd"
@@ -394,8 +400,10 @@ src_install() {
 	# Original design had these in /etc/net.modules.d but that is too
 	# problematic with CONFIG_PROTECT
 	dodir ${rcscripts_dir}
-	cp -pPR "${S}"/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
+	cp -pPR "${S}"/net-scripts/net.modules.d ${D}${rcscripts_dir}
 	chown -R root:0 ${D}${rcscripts_dir}
+	newinitd "${S}"/net-scripts/init.d/net.lo net.lo0
+	doconfd "${S}"/net-scripts/conf.d/net{,.example}
 
 	#
 	# Install baselayout documentation