From owner-cvs-all Wed Jan 29 0:19:13 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1972F37B407 for ; Wed, 29 Jan 2003 00:19:07 -0800 (PST) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8000743FA3 for ; Wed, 29 Jan 2003 00:19:02 -0800 (PST) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (root@localhost) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Sunbay) with SMTP id h0T8IsVG070124 for ; Wed, 29 Jan 2003 10:18:54 +0200 (EET) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Sunbay) with ESMTP id h0T8Iq4N070108 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Wed, 29 Jan 2003 10:18:53 +0200 (EET) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Submit) id h0T8Iq46070103; Wed, 29 Jan 2003 10:18:52 +0200 (EET) Date: Wed, 29 Jan 2003 10:18:52 +0200 From: Ruslan Ermilov To: Poul-Henning Kamp Cc: cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sbin/disklabel disklabel.8 disklabel.c Message-ID: <20030129081852.GB66833@sunbay.com> References: <200301261435.h0QEZrPd064188@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="24zk1gE8NUlDmwG9" Content-Disposition: inline In-Reply-To: <200301261435.h0QEZrPd064188@repoman.freebsd.org> User-Agent: Mutt/1.5.1i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --24zk1gE8NUlDmwG9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jan 26, 2003 at 06:35:53AM -0800, Poul-Henning Kamp wrote: > phk 2003/01/26 06:35:53 PST >=20 > Modified files: > sbin/disklabel disklabel.8 disklabel.c=20 > Log: > Drop the silly notion that i386 has two bootstrap files now that sys/bo= ot > creates a single file named just "boot". > =20 > Apart from the fact that the option "-s" is now gone and that "-b" shou= ld > be pointed at /boot/boot instead of /boot/boot1, this patch should be > a no-op. > =20 > Revision Changes Path > 1.45 +11 -25 src/sbin/disklabel/disklabel.8 > 1.75 +24 -138 src/sbin/disklabel/disklabel.c >=20 Something like this might be needed for systems with this new disklabel(8) (this is completely untested): %%% Index: doFS.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/release/scripts/doFS.sh,v retrieving revision 1.42 diff -u -r1.42 doFS.sh --- doFS.sh 4 Nov 2002 00:50:01 -0000 1.42 +++ doFS.sh 29 Jan 2003 08:17:30 -0000 @@ -26,6 +26,10 @@ # so we have to specifically specify -r when we don't have -B. # disklabel fails otherwise. # +if [ -f "${RD}/trees/base/boot/boot" ]; then + BOOT1=3D"-B -b ${RD}/trees/base/boot/boot" + BOOT2=3D"" +else if [ -f "${RD}/trees/base/boot/boot1" ]; then BOOT1=3D"-B -b ${RD}/trees/base/boot/boot1" else @@ -35,6 +39,7 @@ BOOT2=3D"-s ${RD}/trees/base/boot/boot2" else BOOT2=3D"" +fi fi =20 deadlock=3D20 %%% Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --24zk1gE8NUlDmwG9 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+N45sUkv4P6juNwoRAnvzAJ97UYbQ4O2FZc7VWZpO5U66a/FTDwCbBRZS iL5hL9NgMPG1Lj4tNWTlT20= =I6O8 -----END PGP SIGNATURE----- --24zk1gE8NUlDmwG9-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message