From owner-freebsd-bugs@FreeBSD.ORG Sat Sep 23 02:10:22 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFA6A16A49E for ; Sat, 23 Sep 2006 02:10:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D5AF43D5C for ; Sat, 23 Sep 2006 02:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8N2ALB5057887 for ; Sat, 23 Sep 2006 02:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8N2ALnD057886; Sat, 23 Sep 2006 02:10:21 GMT (envelope-from gnats) Resent-Date: Sat, 23 Sep 2006 02:10:21 GMT Resent-Message-Id: <200609230210.k8N2ALnD057886@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yoshihiro Ota Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB82C16A407 for ; Sat, 23 Sep 2006 02:05:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B2B143D46 for ; Sat, 23 Sep 2006 02:05:29 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k8N25S0m062018 for ; Sat, 23 Sep 2006 02:05:28 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k8N25SIE062017; Sat, 23 Sep 2006 02:05:28 GMT (envelope-from nobody) Message-Id: <200609230205.k8N25SIE062017@www.freebsd.org> Date: Sat, 23 Sep 2006 02:05:28 GMT From: Yoshihiro Ota To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: misc/103501: mdmfs enhancement to allow use in fstab and mount sliced/partitioned md devices X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 02:10:22 -0000 >Number: 103501 >Category: misc >Synopsis: mdmfs enhancement to allow use in fstab and mount sliced/partitioned md devices >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Sep 23 02:10:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Yoshihiro Ota >Release: 5.x and 6.x RELEASE >Organization: >Environment: FreeBSD xxx.yyy.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #23: Wed Sep 20 00:16:08 EST 2006 root@xxx.yyy.com:/usr/obj/usr/src/sys/GENERIC i386 >Description: This patch helps and enhances to mount md-based device such as uzip, slice/partitions, and so on. If mount_md is created with this patch such that we can add md-devices to fstab, possibilities of md-device will greatly expand. This is how to take advantage of this patch. These examples can be written /etc/fstab as well with mount_md. # mdmfs -P -F ports-5.4.uzip -oro md.uzip /tmp/test # df /tmp/test Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/md4.uzip 358126 277934 51542 84% /tmp/test # mdmfs -P -F ports-5.4.uzip -oro /dev/md8.uzip /tmp/test # df | grep test /dev/md4.uzip 358126 277934 51542 84% /tmp/test /dev/md8.uzip 358126 277934 51542 84% /tmp/test2 # mdmfs -P -F hd10meg.img mds1a /tmp/test3 # df /tmp/test3 Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/md9s1a 7526 4 6920 0% /tmp/test3 # mdmfs -P -F file.md md /tmp/test4 # df /tmp/test4 Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/md10 846 4 776 1% /tmp/test4 >How-To-Repeat: N/A: current mdmfs does not allow this. >Fix: --- mdmfs.c.orig Thu Feb 16 16:28:54 2006 +++ mdmfs.c Fri Apr 14 21:27:08 2006 @@ -48,6 +48,7 @@ #include #include #include +#include #include typedef enum { false, true } bool; @@ -67,6 +68,7 @@ static bool norun; /* Actually run the helper programs? */ static int unit; /* The unit we're working with. */ static const char *mdname; /* Name of memory disk device (e.g., "md"). */ +static const char *mdsuffix; /* Suffix of memory disk device (e.g., ".uzip"). */ static size_t mdnamelen; /* Length of mdname. */ static const char *path_mdconfig =_PATH_MDCONFIG; @@ -258,13 +260,16 @@ unitstr += 5; if (strncmp(unitstr, mdname, mdnamelen) == 0) unitstr += mdnamelen; - if (*unitstr == '\0') { + if (!isdigit(*unitstr)) { autounit = true; unit = -1; + mdsuffix = unitstr; } else { ul = strtoul(unitstr, &p, 10); - if (ul == ULONG_MAX || *p != '\0') + if (ul == ULONG_MAX) errx(1, "bad device unit: %s", unitstr); + if (*p != '\0') + mdsuffix = p; unit = ul; } @@ -446,8 +451,8 @@ { int rv; - rv = run(NULL, "%s%s /dev/%s%d %s", _PATH_MOUNT, args, - mdname, unit, mtpoint); + rv = run(NULL, "%s%s /dev/%s%d%s %s", _PATH_MOUNT, args, + mdname, unit, mdsuffix, mtpoint); if (rv) errx(1, "mount exited with error code %d", rv); } >Release-Note: >Audit-Trail: >Unformatted: