From owner-cvs-all@FreeBSD.ORG  Tue Jun  5 19:06:03 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2D09A16A421;
	Tue,  5 Jun 2007 19:06:03 +0000 (UTC)
	(envelope-from ceri@submonkey.net)
Received: from shrike.submonkey.net (cpc3-cdif2-0-0-cust64.cdif.cable.ntl.com
	[81.106.128.65])
	by mx1.freebsd.org (Postfix) with ESMTP id D149313C45E;
	Tue,  5 Jun 2007 19:06:02 +0000 (UTC)
	(envelope-from ceri@submonkey.net)
Received: from ceri by shrike.submonkey.net with local (Exim 4.67 (FreeBSD))
	(envelope-from <ceri@submonkey.net>)
	id 1HveLx-0006cO-Hc; Tue, 05 Jun 2007 20:06:01 +0100
Date: Tue, 5 Jun 2007 20:06:01 +0100
From: Ceri Davies <ceri@submonkey.net>
To: Xin LI <delphij@FreeBSD.org>
Message-ID: <20070605190601.GC1834@submonkey.net>
References: <200706050544.l555ifKp014690@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+"
Content-Disposition: inline
In-Reply-To: <200706050544.l555ifKp014690@repoman.freebsd.org>
X-PGP: finger ceri@FreeBSD.org
User-Agent: Mutt/1.5.15 (2007-04-06)
Sender: Ceri Davies <ceri@submonkey.net>
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/usr.sbin/sysinstall installUpgrade.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jun 2007 19:06:03 -0000


--NMuMz9nt05w80d4+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jun 05, 2007 at 05:44:41AM +0000, Xin LI wrote:
> delphij     2007-06-05 05:44:41 UTC
>=20
>   FreeBSD src repository
>=20
>   Modified files:
>     usr.sbin/sysinstall  installUpgrade.c=20
>   Log:
>   Write to slice name instead of directly to the disk device.
>   This fixes writing boot code upon upgrade.

> | @@ -363,7 +363,7 @@ media:
> |      }
> | =20
> |      if (extractingBin)
> | -	vsystem("disklabel -B `awk '$2~/\\/$/ {print substr($1, 6, 3)}' /etc/=
fstab`");
> | +	vsystem("disklabel -B `awk '$2~/\\/$/ {print substr($1, 6, 5)}' /etc/=
fstab`");
> |      msgNotify("First stage of upgrade completed successfully!\n\n"
> |  	       "Next comes stage 2, where we attempt to resurrect your /etc\n"
> |  	       "directory!");

Well it doesn't fix anything actually; what if my root partition is ad12s2a=
 ?
(which is not contrived; it is).

We actually need something more like:

       vsystem("disklabel -B `awk \
          '$1~/\\dev\\/(aacd|ad|afd|amrd|ar|da|idad|ipsd|mfid|mlxd|twed)/ &=
& \
           $2~/\\/$/ {print substr($1, 1, index($1, \"s\") - 1)}' /etc/fsta=
b`");

where the regex is built from every device name in device_names (which
even then doesn't cater for GEOM where devices might be called
anything).  This is something that would require a build tool, which is
why I haven't done it yet.

Ceri
--=20
That must be wonderful!  I don't understand it at all.
                                                  -- Moliere

--NMuMz9nt05w80d4+
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)

iD8DBQFGZbQZocfcwTS3JF8RApPRAJ0dqAE+de6wB0paWL3bt6ujoRuzKwCgg5Xn
f+s3KOi97Z2eeEx/5wcQvTE=
=YNDo
-----END PGP SIGNATURE-----

--NMuMz9nt05w80d4+--