From: Guy Martin <gmsoft@gentoo.org>
Date: Mon, 10 Jan 2005 23:34:54 +0000 (+0000)
Subject: Yes we *NEED* the symlinks for netboot.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89cf38e32b08813408979db1c330ac6682796769;p=gentoo.git

Yes we *NEED* the symlinks for netboot.
---

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 4e7220ae01b3..d86c899ebeae 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.55 2005/01/02 09:59:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.56 2005/01/10 23:34:54 gmsoft Exp $
+
+  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> busybox-1.00-r1.ebuild:
+  Yes we *NEED* the symlinks for netboot.
 
   02 Jan 2005; Guy Martin <gmsoft@gentoo.org> busybox-1.00-r1.ebuild:
   Added dodir before dosym for creating correctly the link /sbin/init when
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 50a1388fa766..c19dec3dc4e9 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,7 +1,7 @@
-MD5 7350f2b027292b204767f42e20ac4316 ChangeLog 10649
+MD5 00ead324724f40697260a3e23c0b030a ChangeLog 10762
 MD5 bd53514006037cd4d88fa5b7bb9ede8e busybox-0.60.3-r1.ebuild 1090
 MD5 7c7ecdb7faae49f2740ad820e2bfe430 busybox-0.60.3-r2.ebuild 1181
-MD5 b1fdd65a86c8140e2ae2b34155cbff54 busybox-1.00-r1.ebuild 6124
+MD5 72c161d88a126c7facf0efd0a87dd7a9 busybox-1.00-r1.ebuild 6013
 MD5 af139366511d706056d4d86332a43b08 busybox-1.00.ebuild 6430
 MD5 cd13848c8be3ae3af5b42b9d242b9865 busybox-1.00_rc3.ebuild 6487
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
@@ -11,16 +11,16 @@ MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
 MD5 1bce86c66f42d204c0780faee28004d6 files/Config.h-0.60.5-cd 14299
 MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
 MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
-MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00 66
 MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658
 MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
+MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r1 66
 MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
+MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00 66
 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66
 MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70
 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
 MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
-MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964
-MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
 MD5 0935d76af47dda2deda0364f8c9018e3 files/1.00/more-insmod-arches.patch 1095
+MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
diff --git a/sys-apps/busybox/busybox-1.00-r1.ebuild b/sys-apps/busybox/busybox-1.00-r1.ebuild
index 86d212d439d8..3aa4fccb81bd 100644
--- a/sys-apps/busybox/busybox-1.00-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.6 2005/01/02 09:59:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.7 2005/01/10 23:34:54 gmsoft Exp $
 
 inherit eutils
 
@@ -73,7 +73,8 @@ src_unpack() {
 			einfo "Found your ${configfile} and using it."
 			return 0
 		fi
-	elif use netboot ; then
+	fi
+	if use netboot ; then
 		cp ${FILESDIR}/config-netboot .config
 		sed -i \
 			-e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
@@ -134,12 +135,6 @@ src_install() {
 
 	into /
 	dobin busybox
-	if use netboot ; then
-		dosym /bin/busybox /bin/sh
-		dodir /sbin
-		dosym /bin/busybox /sbin/init
-		return 0
-	fi
 	if use make-busybox-symlinks ; then
 		if [ ! "${VERY_BRAVE_OR_VERY_DUMB}" = "yes" ] && [ "${ROOT}" = "/" ];
 		then