Author: sparky
Date: Tue Feb 28 20:20:07 2006
New Revision: 7047
Modified:
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect
Log:
- detect pc partitions before mac ones (like kernel does)
- more colors
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect Tue Feb 28 20:20:07 2006
@@ -9,7 +9,7 @@
verbose 1 -G "Autodetecting PCI hardware"
# SCSI #######################################################################
-verbose 2 " +-Checking scsi controllers"
+verbose 2 -B " +-Checking scsi controllers"
COUNT=0
for scsi in $(/usr/bin/pcidev /m scsi); do
verbose 3 " +-Found scsi ${COUNT}: ${scsi}"
@@ -21,7 +21,7 @@
# IDE ########################################################################
-verbose 2 " +-Checking ide controllers"
+verbose 2 -B " +-Checking ide controllers"
for ide in `/usr/bin/pcidev /m ide`; do
verbose 3 " +-Found IDE: $ide"
modprobe $ide
@@ -29,7 +29,7 @@
# USB ########################################################################
-verbose 2 " +-Checking usb controllers"
+verbose 2 -B " +-Checking usb controllers"
/sbin/lspci -v | awk '
/USB Controller:.*prog-if 00/ { print "alias usb-controller uhci-hcd" }
/USB Controller:.*prog-if 10/ { print "alias usb-controller ohci-hcd" }
@@ -42,11 +42,11 @@
echo -e "\n# autogenerated" >> /etc/fstab
# Searching for cdroms #######################################################
-verbose 2 " +-Searching CDROMs"
+verbose 2 -B " +-Searching CDROMs"
modprobe ide-cd
cddevs=$(grep /media/ppcrcd /etc/fstab | awk '{print $1}')
[ -n "$cddevs" ] && cddevs=$(lastlink $cddevs)
-cddevs=" $cddev "
+cddevs=" $cddevs "
for cdrom in /dev/{dvd,cdwriter,cdrom} /dev/{dvd,cdwriter,cdrom}*; do
verbose 4 " +-Checking cdrom: $cdrom"
@@ -63,7 +63,7 @@
echo >> /etc/fstab
# Searching for partitions ###################################################
-verbose 2 " +-Checking partitions"
+verbose 2 -B " +-Checking partitions"
mac-fdisk -l 2>/dev/null | egrep "^/dev/[a-z]+[0-9]+" > /tmp/parts.mac
fdisk -l 2>/dev/null | egrep "^/dev/[a-z]+[0-9]+" > /tmp/parts.pc
@@ -72,40 +72,7 @@
[ -r $dev ] || continue
verbose 4 " +-Checking $dev"
mnt="/mnt/$(basename $dev)"
- if egrep -q "^$dev[ ]" /tmp/parts.mac; then # mac
partitions
- verbose 4 -n " +-Mac partition, "
- line="$(egrep "^$dev[ ]" /tmp/parts.mac)"
- type="$(echo $line | sed 's/^.*)//')"
- mnt="${mnt}_$(echo $line | awk '{print $3}')"
- case "$(tl $type)" in
- *linux*swap*)
- mnt=
- echo "#$dev swap swap defaults 0 0" >>
/etc/fstab
- verbose 4 "type: swap (not activating)"
- ;;
- *linux*)
- echo "$dev $mnt auto defaults,noauto,noatime 0
0" >> /etc/fstab
- verbose 4 "type: linux"
- ;;
- *bootblock*)
- echo "$dev $mnt hfs,hfsplus
defaults,noauto,noatime 0 0" >> /etc/fstab
- verbose 4 "type: bootblock"
- ;;
- *hfs*)
- echo "$dev $mnt hfsplus,hfs
defaults,noauto,noatime 0 0" >> /etc/fstab
- verbose 4 "type: hfs"
- ;;
- *dos*) #PRODOS - fat ?
- echo "$dev $mnt fat,vfat,msdos
defaults,noauto,noatime 0 0" >> /etc/fstab
- verbose 4 "type: dos"
- ;;
- #MFS - not supported
- *)
- mnt=
- verbose 4 "type: unknown"
- ;;
- esac
- elif egrep -q "^$dev[ ]" /tmp/parts.pc; then # pc
partitions
+ if egrep -q "^$dev[ ]" /tmp/parts.pc; then # pc
partitions
verbose 4 -n " +-PC partition, "
type="$(egrep "^$dev[ ]" /tmp/parts.pc | cut -c 56-)"
case "$(tl $type)" in
@@ -154,9 +121,42 @@
verbose 4 "type: unknown"
;;
esac
+ elif egrep -q "^$dev[ ]" /tmp/parts.mac; then # mac
partitions
+ verbose 4 -n " +-Mac partition, "
+ line="$(egrep "^$dev[ ]" /tmp/parts.mac)"
+ type="$(echo $line | sed 's/^.*)//')"
+ mnt="${mnt}_$(echo $line | awk '{print $3}')"
+ case "$(tl $type)" in
+ *linux*swap*)
+ mnt=
+ echo "#$dev swap swap defaults 0 0" >>
/etc/fstab
+ verbose 4 "type: swap (not activating)"
+ ;;
+ *linux*)
+ echo "$dev $mnt auto defaults,noauto,noatime 0
0" >> /etc/fstab
+ verbose 4 "type: linux"
+ ;;
+ *bootblock*)
+ echo "$dev $mnt hfs,hfsplus
defaults,noauto,noatime 0 0" >> /etc/fstab
+ verbose 4 "type: bootblock"
+ ;;
+ *hfs*)
+ echo "$dev $mnt hfsplus,hfs
defaults,noauto,noatime 0 0" >> /etc/fstab
+ verbose 4 "type: hfs"
+ ;;
+ *dos*) #PRODOS - fat ?
+ echo "$dev $mnt fat,vfat,msdos
defaults,noauto,noatime 0 0" >> /etc/fstab
+ verbose 4 "type: dos"
+ ;;
+ #MFS - not supported
+ *)
+ mnt=
+ verbose 4 "type: unknown"
+ ;;
+ esac
else
mnt=
- verbose 2 " +-Partition '$dev' has unrecognized
partition type. BSD slice ?"
+ verbose 2 -R " +-Partition '$dev' has unrecognized
partition type. BSD slice ?"
fi
if [ -n "$mnt" ]; then
mkdir -p $mnt
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
