From owner-freebsd-current@FreeBSD.ORG  Thu Oct 18 15:33:17 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 317844F7;
 Thu, 18 Oct 2012 15:33:17 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
 by mx1.freebsd.org (Postfix) with ESMTP id 4D7E98FC17;
 Thu, 18 Oct 2012 15:33:15 +0000 (UTC)
Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua
 [212.40.38.101])
 by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id SAA20262;
 Thu, 18 Oct 2012 18:33:13 +0300 (EEST)
 (envelope-from avg@FreeBSD.org)
Message-ID: <50802138.8020604@FreeBSD.org>
Date: Thu, 18 Oct 2012 18:33:12 +0300
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:16.0) Gecko/20121014 Thunderbird/16.0.1
MIME-Version: 1.0
To: Alexander Yerenkow <yerenkow@gmail.com>
Subject: Re: A little question about safe mode
References: <CAPJF9wm-dvUwgQzZzijakD=FBM9HTBQ+F4jC510KX+UOG-SfgA@mail.gmail.com>
 <507FB6C7.50402@FreeBSD.org>
 <CAPJF9wku0MiuLv=s2NG7F3zpKFq94_NcUZ_F9TXhBssWE7bFeg@mail.gmail.com>
 <507FEC7F.4030306@FreeBSD.org>
 <CAPJF9wm9DxZxr5GDCxkoedG+dppJsLEN=zYmEEXByaATM4pE3A@mail.gmail.com>
 <50801E32.80309@FreeBSD.org>
In-Reply-To: <50801E32.80309@FreeBSD.org>
X-Enigmail-Version: 1.4.5
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: freebsd-current <freebsd-current@FreeBSD.org>
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Oct 2012 15:33:17 -0000

on 18/10/2012 18:20 Andriy Gapon said the following:
> My guess is that the easiest way to avoid this ambiguity and the confusion that it
> causes (like the problem you described above) is to prepend "/dev/", if it's
> missing, right in vfs_mountroot.c before calling kernel_mount().

A patch (not tested):

--- a/sys/kern/vfs_mountroot.c
+++ b/sys/kern/vfs_mountroot.c
@@ -676,6 +676,7 @@ static int
 parse_mount(char **conf)
 {
 	char errmsg[255];
+	char devbuf[MNAMELEN];
 	struct mntarg *ma;
 	char *dev, *fs, *opts, *tok;
 	int delay, error, timeout;
@@ -693,6 +694,11 @@ parse_mount(char **conf)
 	parse_advance(&tok);
 	dev = tok;

+	if (dev[0] != '\0' && strncmp(dev, "/dev/", 5) != 0) {
+		snprintf(devbuf, sizeof(devbuf), "/dev/%s", dev);
+		dev = devbuf;
+	}
+
 	if (root_mount_mddev != -1) {
 		/* Handle substitution for the md unit number. */
 		tok = strstr(dev, "md#");


-- 
Andriy Gapon