Date: Wed, 6 Jun 2007 08:38:00 +0100 From: Ceri Davies <ceri@submonkey.net> To: "M. Warner Losh" <imp@bsdimp.com> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, delphij@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/sysinstall installUpgrade.c Message-ID: <20070606073800.GD1834@submonkey.net> In-Reply-To: <20070605.161442.1723940823.imp@bsdimp.com> References: <200706050544.l555ifKp014690@repoman.freebsd.org> <20070605190601.GC1834@submonkey.net> <20070605.161442.1723940823.imp@bsdimp.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Tue, Jun 05, 2007 at 04:14:42PM -0600, M. Warner Losh wrote:
> In message: <20070605190601.GC1834@submonkey.net>
> Ceri Davies <ceri@submonkey.net> writes:
> : On Tue, Jun 05, 2007 at 05:44:41AM +0000, Xin LI wrote:
> : > delphij 2007-06-05 05:44:41 UTC
> : >
> : > FreeBSD src repository
> : >
> : > Modified files:
> : > usr.sbin/sysinstall installUpgrade.c
> : > Log:
> : > Write to slice name instead of directly to the disk device.
> : > This fixes writing boot code upon upgrade.
> :
> : > | @@ -363,7 +363,7 @@ media:
> : > | }
> : > |
> : > | 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/fstab`");
> :
> : 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.
>
> "mmcsd" is also a disk.
It should be added to the device_names array in sysinstall/devices.c.
Ceri
--
That must be wonderful! I don't understand it at all.
-- Moliere
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)
iD8DBQFGZmRYocfcwTS3JF8RAlt6AJ0YMmSWIJELDB9UHWsQfEKpy9XqRwCgvFDj
Hdk84vg7l15UPr1ehwn2m4E=
=SHiM
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070606073800.GD1834>