Added "-m" option to "disk-list" to list memory disks along with
standard disks. PR: 149749 Submitted by: John Hixson
This commit is contained in:
parent
a13642d62d
commit
924a3731d3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=211489
@ -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"
|
||||
|
||||
|
@ -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" ]
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user