From nobody@FreeBSD.org  Tue Aug 17 19:31:55 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8578C1065693
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Aug 2010 19:31:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A66A8FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Aug 2010 19:31:55 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o7HJVtv5003879
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Aug 2010 19:31:55 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o7HJVt8m003878;
	Tue, 17 Aug 2010 19:31:55 GMT
	(envelope-from nobody)
Message-Id: <201008171931.o7HJVt8m003878@www.freebsd.org>
Date: Tue, 17 Aug 2010 19:31:55 GMT
From: John Hixson <john@ixsystems.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: pc-sysinstall patch to add support for install to memory disks
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         149749
>Category:       bin
>Synopsis:       [patch] pc-sysinstall(8) patch to add support for install to memory disks
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 17 19:40:05 UTC 2010
>Closed-Date:    Thu Aug 19 00:08:15 MDT 2010
>Last-Modified:  Thu Aug 19 06:20:01 UTC 2010
>Originator:     John Hixson
>Release:        9.0-CURRENT
>Organization:
iXsystems
>Environment:
FreeBSD thinkbsd 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Tue Jul 13 09:31:39 PDT 2010     john@thinkbsd:/usr/src/sys/amd64/compile/THINKBSD  amd64
>Description:
Added "-m" option to "disk-list" to list memory disks along with standard disks.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN usr.sbin/pc-sysinstall.zpool/backend-query/disk-info.sh usr.sbin/pc-sysinstall/backend-query/disk-info.sh
--- usr.sbin/pc-sysinstall.zpool/backend-query/disk-info.sh	2010-06-27 09:46:11.000000000 -0700
+++ usr.sbin/pc-sysinstall/backend-query/disk-info.sh	2010-08-16 19:06:18.000000000 -0700
@@ -54,15 +54,18 @@
 get_disk_sectors "${DISK}"
 SECS="${VAL}"
 
-echo "cylinders=${CYLS}"
-echo "heads=${HEADS}"
-echo "sectors=${SECS}"
 
 # Now get the disks size in MB
 KB="`diskinfo -v ${1} | grep 'bytes' | cut -d '#' -f 1 | tr -s '\t' ' ' | tr -d ' '`"
 MB=$(convert_byte_to_megabyte ${KB})
-echo "size=$MB"
 
 # Now get the Controller Type
 CTYPE="`dmesg | grep "^${1}:" | grep "B <" | cut -d '>' -f 2 | cut -d ' ' -f 3-10`"
+
+
+echo "cylinders=${CYLS}"
+echo "heads=${HEADS}"
+echo "sectors=${SECS}"
+echo "size=$MB"
 echo "type=$CTYPE"
+
diff -urN usr.sbin/pc-sysinstall.zpool/backend-query/disk-list.sh usr.sbin/pc-sysinstall/backend-query/disk-list.sh
--- usr.sbin/pc-sysinstall.zpool/backend-query/disk-list.sh	2010-06-27 09:46:11.000000000 -0700
+++ usr.sbin/pc-sysinstall/backend-query/disk-list.sh	2010-08-17 12:27:39.000000000 -0700
@@ -25,8 +25,18 @@
 #
 # $FreeBSD: src/usr.sbin/pc-sysinstall/backend-query/disk-list.sh,v 1.2 2010/06/27 16:46:11 imp Exp $
 
+ARGS=$1
+
 # Create our device listing
 SYSDISK=$(sysctl -n kern.disks)
+if [ "${ARGS}" = "-m" ]
+then
+	MDS=`mdconfig -l`
+	if [ -n "${MDS}" ]
+	then
+		SYSDISK="${SYSDISK} ${MDS}"
+	fi
+fi
 
 # Now loop through these devices, and list the disk drives
 for i in ${SYSDISK}
@@ -45,6 +55,10 @@
   if [ -z "$NEWLINE" ]; then
     NEWLINE=" <Unknown Device>"
   fi
+  if echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null 2>/dev/null
+  then
+	NEWLINE=" <Memory Disk>"
+  fi
 
   # Save the disk list
   if [ ! -z "$DLIST" ]
diff -urN usr.sbin/pc-sysinstall.zpool/pc-sysinstall/pc-sysinstall.sh usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
--- usr.sbin/pc-sysinstall.zpool/pc-sysinstall/pc-sysinstall.sh	2010-07-19 16:16:12.000000000 -0700
+++ usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh	2010-08-16 18:52:27.000000000 -0700
@@ -143,7 +143,7 @@
   ;;
 
   # The user is wanting to query which disks are available
-  disk-list) ${QUERYDIR}/disk-list.sh
+  disk-list) ${QUERYDIR}/disk-list.sh "${2}"
   ;;
   
   # The user is wanting to query a disk's partitions


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Aug 17 22:47:32 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149749 
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Thu Aug 19 00:07:59 MDT 2010 
State-Changed-Why:  
committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149749 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/149749: commit references a PR
Date: Thu, 19 Aug 2010 06:12:55 +0000 (UTC)

 Author: imp
 Date: Thu Aug 19 06:07:49 2010
 New Revision: 211489
 URL: http://svn.freebsd.org/changeset/base/211489
 
 Log:
   Added "-m" option to "disk-list" to list memory disks along with
   standard disks.
   
   PR:		149749
   Submitted by:	John Hixson
 
 Modified:
   head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
   head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
   head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
 
 Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh	Thu Aug 19 06:05:05 2010	(r211488)
 +++ head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh	Thu Aug 19 06:07:49 2010	(r211489)
 @@ -54,15 +54,18 @@ HEADS="${VAL}"
  get_disk_sectors "${DISK}"
  SECS="${VAL}"
  
 -echo "cylinders=${CYLS}"
 -echo "heads=${HEADS}"
 -echo "sectors=${SECS}"
  
  # Now get the disks size in MB
  KB="`diskinfo -v ${1} | grep 'bytes' | cut -d '#' -f 1 | tr -s '\t' ' ' | tr -d ' '`"
  MB=$(convert_byte_to_megabyte ${KB})
 -echo "size=$MB"
  
  # Now get the Controller Type
  CTYPE="`dmesg | grep "^${1}:" | grep "B <" | cut -d '>' -f 2 | cut -d ' ' -f 3-10`"
 +
 +
 +echo "cylinders=${CYLS}"
 +echo "heads=${HEADS}"
 +echo "sectors=${SECS}"
 +echo "size=$MB"
  echo "type=$CTYPE"
 +
 
 Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Thu Aug 19 06:05:05 2010	(r211488)
 +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Thu Aug 19 06:07:49 2010	(r211489)
 @@ -25,8 +25,18 @@
  #
  # $FreeBSD$
  
 +ARGS=$1
 +
  # Create our device listing
  SYSDISK=$(sysctl -n kern.disks)
 +if [ "${ARGS}" = "-m" ]
 +then
 +	MDS=`mdconfig -l`
 +	if [ -n "${MDS}" ]
 +	then
 +		SYSDISK="${SYSDISK} ${MDS}"
 +	fi
 +fi
  
  # Now loop through these devices, and list the disk drives
  for i in ${SYSDISK}
 @@ -45,6 +55,10 @@ do
    if [ -z "$NEWLINE" ]; then
      NEWLINE=" <Unknown Device>"
    fi
 +  if echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null 2>/dev/null
 +  then
 +	NEWLINE=" <Memory Disk>"
 +  fi
  
    # Save the disk list
    if [ ! -z "$DLIST" ]
 
 Modified: head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
 ==============================================================================
 --- head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh	Thu Aug 19 06:05:05 2010	(r211488)
 +++ head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh	Thu Aug 19 06:07:49 2010	(r211489)
 @@ -143,7 +143,7 @@ case $1 in
    ;;
  
    # The user is wanting to query which disks are available
 -  disk-list) ${QUERYDIR}/disk-list.sh
 +  disk-list) ${QUERYDIR}/disk-list.sh "${2}"
    ;;
    
    # The user is wanting to query a disk's partitions
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
