--- old	2012-07-21 13:17:08.000000000 -0400
+++ new	2012-07-21 13:17:15.000000000 -0400
@@ -4,10 +4,10 @@
 Copyright (c) 1982, 1986, 1989, 1991, 1993
    The Regents of the University of California.  All rights reserved.
 
-NetBSD 6.99.8 (QUASAR) #217: Wed Jun 20 11:37:10 EDT 2012
+NetBSD 6.99.9 (QUASAR) #221: Thu Jul 19 22:20:27 EDT 2012
 	christos@quasar.astron.com:/usr/src/sys/arch/amd64/compile/QUASAR
 total memory = 8189 MB
-avail memory = 7942 MB
+avail memory = 7941 MB
 timecounter: Timecounters tick every 10.000 msec
 cprng kernel: WARNING insufficient entropy at creation.
 RTC BIOS diagnostic error 0x11<memory_size>
@@ -277,7 +277,7 @@
 pci8: i/o space, memory space enabled, rd/line, wr/inv ok
 bge0 at pci8 dev 0 function 0: Broadcom BCM5754 Gigabit Ethernet
 bge0: interrupting at ioapic0 pin 16
-bge0: adjust device control 0x112006 -> 0x115006
+bge0: adjust device control 0x102006 -> 0x105006
 bge0: ASIC BCM5754/5787 A2 (0xb002), Ethernet address 00:21:9b:3f:dc:ae
 bge0: setting short Tx thresholds
 brgphy0 at bge0 phy 1: BCM5754/5787 1000BASE-T media interface, rev. 0
@@ -339,106 +339,86 @@
 acpicpu3 at cpu3: ACPI CPU
 coretemp3 at cpu3: thermal sensor, 1 C resolution
 timecounter: Timecounter "clockinterrupt" frequency 100 Hz quality 0
-atapibus0 at atabus0: 2 targets
-cd0 at atapibus0 drive 1: <PLDS DVD-ROM DH-16D3S, , SD11> cdrom removable
-cd0: 32-bit data port
 uhub0 at usb0: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
 uhub0: 2 ports with 2 removable, self powered
-uhub1 at usb1: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
+uhub1 at usb2: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
 uhub1: 2 ports with 2 removable, self powered
-uhub2 at usb2: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
+uhub2 at usb3: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
 uhub2: 2 ports with 2 removable, self powered
-uhub3 at usb3: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
+uhub3 at usb1: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
 uhub3: 2 ports with 2 removable, self powered
 uhub4 at usb4: Intel EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
 uhub4: 8 ports with 8 removable, self powered
-cd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 5 (Ultra/100)
-wd0 at atabus0 drive 0
-wd0: <WDC WD2500SD-01KCB0>
-wd0: drive supports 16-sector PIO transfers, LBA48 addressing
-wd0: 232 GB, 484521 cyl, 16 head, 63 sec, 512 bytes/sect x 488397168 sectors
+atapibus0 at atabus0: 2 targets
 IPsec: Initialized Security Association Processing.
-dk0 at wd0: wd0a
-dk0: 488397105 blocks at 63, type: raidframe
-wd0: 32-bit data port
-wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 6 (Ultra/133)
-wd0(piixide1:0:0): using PIO mode 4, Ultra-DMA mode 6 (Ultra/133) (using DMA)
+cd0 at atapibus0 drive 1: <PLDS DVD-ROM DH-16D3S, , SD11> cdrom removable
+cd0: 32-bit data port
+cd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 5 (Ultra/100)
 cd0(piixide1:0:1): using PIO mode 4, Ultra-DMA mode 5 (Ultra/100) (using DMA)
 ehci0: handing over low speed device on port 6 to uhci2
 umass0 at uhub4 port 7 configuration 1 interface 0
 umass0: Eaglebit 0M9AT00, rev 2.00/1.06, addr 2
 umass0: using SCSI over Bulk-Only
 scsibus0 at umass0: 2 targets, 1 lun per target
-wd1 at atabus1 drive 0
-wd1: <WDC WD2500SD-01KCB0>
-wd1: drive supports 16-sector PIO transfers, LBA48 addressing
-wd1: 232 GB, 484521 cyl, 16 head, 63 sec, 512 bytes/sect x 488397168 sectors
-uhidev0 at uhub2 port 2 configuration 1 interface 0
+wd0 at atabus1 drive 0
+wd0: <WDC WD2500SD-01KCB0>
+wd0: drive supports 16-sector PIO transfers, LBA48 addressing
+wd0: 232 GB, 484521 cyl, 16 head, 63 sec, 512 bytes/sect x 488397168 sectors
+uhidev0 at uhub1 port 2 configuration 1 interface 0
 uhidev0: Dell Dell USB Keyboard, rev 1.10/3.52, addr 2, iclass 3/1
 ukbd0 at uhidev0: 8 modifier keys, 6 key codes
-dk1 at wd1: wd1a
-dk1: 488397105 blocks at 63, type: raidframe
-wd1: 32-bit data port
-wd1: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 6 (Ultra/133)
-wd1(piixide1:1:0): using PIO mode 4, Ultra-DMA mode 6 (Ultra/133) (using DMA)
+dk0 at wd0: wd0a
+dk0: 488397105 blocks at 63, type: raidframe
+wd0: 32-bit data port
+wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 6 (Ultra/133)
+wd0(piixide1:1:0): using PIO mode 4, Ultra-DMA mode 6 (Ultra/133) (using DMA)
 wskbd0 at ukbd0: console keyboard, using wsdisplay0
 sd0 at scsibus0 target 0 lun 0: <Eaglebit, 0M9AT00, 1.06> disk fixed
 sd0: 57231 MB, 16383 cyl, 16 head, 63 sec, 512 bytes/sect x 117210240 sectors
-dk2 at sd0: sd0a
-dk2: 117210177 blocks at 63, type: ffs
+dk1 at sd0: sd0a
+dk1: 117210177 blocks at 63, type: ffs
 Kernelized RAIDframe activated
 swwdog0: software watchdog initialized
 pad0: outputs: 44100Hz, 16-bit, stereo
 audio1 at pad0: half duplex, playback, capture
 Component on: dk0: 488397105
-  Row: 0 Column: 1 Num Rows: 1 Num Columns: 2
-  Version: 2 Serial Number: 2006040301 Mod Counter: 7322
-  Clean: Yes Status: 0
-  sectPerSU: 128 SUsPerPU: 1 SUsPerRU: 1
-  RAID Level: 1  blocksize: 512 numBlocks: 488396928
-  Autoconfig: Yes
-  Contains root partition: Yes
-  Last configured as: raid0
-Component on: dk1: 488397105
   Row: 0 Column: 0 Num Rows: 1 Num Columns: 2
-  Version: 2 Serial Number: 2006040301 Mod Counter: 7322
+   Version: 2 Serial Number: 2006040301 Mod Counter: 7588
   Clean: Yes Status: 0
   sectPerSU: 128 SUsPerPU: 1 SUsPerRU: 1
   RAID Level: 1  blocksize: 512 numBlocks: 488396928
   Autoconfig: Yes
   Contains root partition: Yes
   Last configured as: raid0
-Found: dk1 at 0
-Found: dk0 at 1
+Found: dk0 at 0
 RAID autoconfigure
 Configuring raid0:
 Starting autoconfiguration of RAID set...
 Looking for 0 in autoconfig
-Found: dk1 at 0
+Found: dk0 at 0
 Looking for 1 in autoconfig
-Found: dk0 at 1
 raid0: allocating 20 buffers of 65536 bytes.
 raid0: RAID Level 1
-raid0: Components: /dev/dk1 /dev/dk0
+raid0: Components: /dev/dk0 component1[**FAILED**]
 raid0: Total Sectors: 488396928 (238475 MB)
-dk3 at raid0: raid0a
-dk3: 204800 blocks at 0, type: ffs
-dk4 at raid0: raid0b
-dk4: 921600 blocks at 204800, type: swap
-dk5 at raid0: raid0e
-dk5: 2097152 blocks at 1126400, type: ffs
-dk6 at raid0: raid0f
-dk6: 16777216 blocks at 3223552, type: ffs
-dk7 at raid0: raid0g
-dk7: 16777216 blocks at 20000768, type: ffs
-dk8 at raid0: raid0h
-dk8: 67108864 blocks at 36777984, type: ffs
-dk9 at raid0: raid0i
-dk9: 67108864 blocks at 103886848, type: ffs
+dk2 at raid0: raid0a
+dk2: 204800 blocks at 0, type: ffs
+dk3 at raid0: raid0b
+dk3: 921600 blocks at 204800, type: swap
+dk4 at raid0: raid0e
+dk4: 2097152 blocks at 1126400, type: ffs
+dk5 at raid0: raid0f
+dk5: 16777216 blocks at 3223552, type: ffs
+dk6 at raid0: raid0g
+dk6: 16777216 blocks at 20000768, type: ffs
+dk7 at raid0: raid0h
+dk7: 67108864 blocks at 36777984, type: ffs
+dk8 at raid0: raid0i
+dk8: 67108864 blocks at 103886848, type: ffs
 cprng sysctl: WARNING insufficient entropy at creation.
-boot device: dk3
-root on dk3 dumps on dk4
-root on dk3 dumps on dk4
+boot device: dk2
+root on dk2 dumps on dk3
+root on dk2 dumps on dk3
 dump_misc_init: max_paddr = 0x220000000
 mountroot: trying nfs...
 mountroot: trying ffs...
@@ -449,3 +429,13 @@
 wsdisplay0: screen 2 added (80x25, vt100 emulation)
 wsdisplay0: screen 3 added (80x25, vt100 emulation)
 wsdisplay0: screen 4 added (80x25, vt100 emulation)
+umass1 at uhub4 port 8 configuration 1 interface 0
+umass1: Apple Inc. iPod, rev 2.00/0.01, addr 3
+umass1: using SCSI over Bulk-Only
+scsibus1 at umass1: 2 targets, 1 lun per target
+sd1 at scsibus1 target 0 lun 0: <Apple, iPod, 1.70> disk removable
+sd1: fabricating a geometry
+sd1: 15239 MB, 1904 cyl, 64 head, 32 sec, 4096 bytes/sect x 3901376 sectors
+sd1: fabricating a geometry
+dk9 at sd1: disk
+dk9: 3901311 blocks at 64, type: hfs