- Timestamp:
- 02/20/12 14:05:37 (12 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ports/net/macathena-machtype/files/patch-machtype_linux.sh
r10 r201 1 --- machtype_linux.sh.orig 20 07-12-24 21:51:18.000000000 -06002 +++ machtype_linux.sh 20 07-12-25 00:20:57.000000000 -06001 --- machtype_linux.sh.orig 2011-10-28 17:31:43.000000000 -0400 2 +++ machtype_linux.sh 2012-02-20 12:33:57.000000000 -0500 3 3 @@ -1,4 +1,4 @@ 4 4 -#!/bin/sh 5 5 +#!/bin/bash 6 # $Id: machtype_linux.sh,v 1.9 2003 /08/12 21:47:50 jweiss Exp $6 # $Id: machtype_linux.sh,v 1.9 2003-08-12 21:47:50 jweiss Exp $ 7 7 8 8 # We need to support the following options: 9 @@ - 86,7 +86,7 @@9 @@ -91,7 +91,7 @@ 10 10 fi 11 11 … … 16 16 fi 17 17 18 @@ -1 33,32 +133,31@@18 @@ -145,27 +145,26 @@ 19 19 fi 20 20 21 21 if [ $display ] ; then 22 - /sbin/lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p22 - lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p 23 23 + system_profiler SPDisplaysDataType | awk 'NR==3 { print }' | sed "s/^ *\(.*\):$/\1/" 24 24 printed=1 … … 26 26 27 27 if [ $rdsk ]; then 28 - awk '/^SCSI device/ { print; } 29 - /^hd[a-z]:/ { print; } 30 - /^Floppy/ { for (i=3; i <= NF; i += 3) print $i ": " $(i+2); }' \ 31 - /var/log/dmesg 28 - for d in /sys/block/[fhs]d*; do 29 - echo $(basename "$d"): \ 30 - $(xargs -I @ expr @ '*' 8 / 15625 < "$d/size")MB \ 31 - $(cat "$d/device/model" || 32 - cat "/proc/ide/$(basename "$d")/model") 33 - done 2>/dev/null 32 34 + disks=`ls /dev/disk* | grep 'disk[0-9]*$'` 33 35 + for disk in $disks … … 42 44 + usermem=$(($(sysctl -n hw.usermem)/1024)) 43 45 if [ $verbose ]; then 44 - awk 'BEGIN { FS="[^0-9]+" } 45 - /^Memory:/ { printf "user=%d, phys=%d (%d M)\n", 46 - $2*1.024, $3*1.024, $3/1000; }' \ 47 - /var/log/dmesg 46 - awk '/^MemTotal:/ { printf "user=%d, phys=%d (%d M)\n", 47 - $2, $2, $2/1024 }' \ 48 - /proc/meminfo 48 49 + printf "user=%d, phys=%d (%d M)\n" $usermem $physmem $((physmem/1024)) 49 50 else 50 - awk 'BEGIN { FS="[^0-9]+" } 51 - /^Memory:/ { printf "%d\n", $3*1.024; }' /var/log/dmesg 51 - awk '/^MemTotal:/ { printf "%d\n", $2 }' /proc/meminfo 52 52 + echo $physmem 53 53 fi 54 54 printed=1 55 fi 56 @@ -182,6 +181,6 @@ 55 57 fi 56 58