disk devices vs. wedges and wrong FS type

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

So after some hiatus, I have one of my PowerMacs back online.  It's a
PowerMac G4 (AGP Graphics), a.k.a. "Sawtooth" IIRC.

I built a recent -current (7.99.4) but kept the toolchain rolled back to
gcc45, just in case.  I updated the machine's NFS root filesystem and it
proceeded to boot just fine over the network.

I set about also updating the installation on the machine's local disk.
The previous install was a 6.99.41 vintage.  I set about updating just
the modules and the kernel (boot from HFS partition) and figured to
reboot and update the rest.

When the machine wasn't reachable via SSH after a reasonable period of
time, I went to inspect the console.  I found messages like the
following:

  mount: no match for `wd0a': No such process

and

  fsck: exec /usr/sbin/fsck_sysv for /dev/rdk1: No such file or directory

So, first it appears that -current insists on using wedges and can't
cope with my existing "/etc/fstab" that uses device paths and partitions.
Second, it gets the filesystem on the wedges wrong.  Looking through
'dmesg' revealed:

[...]
wd0 at atabus0 drive 0
wd0: <Hitachi HDS721680PLAT80>
wd0: drive supports 16-sector PIO transfers, LBA48 addressing
wd0: 76319 MB, 155061 cyl, 16 head, 63 sec, 512 bytes/sect x 156301488 sectors
dk0 at wd0: Boot
dk0: 21105 blocks at 64, type: hfs
dk1 at wd0: Root
dk1: 20972448 blocks at 21169, type: sysv
dk2 at wd0: Swap
dk2: 4195296 blocks at 20993617, type: sysv
dk3 at wd0: tmp
dk3: 2097648 blocks at 25188913, type: sysv
dk4 at wd0: var
dk4: 8389584 blocks at 27286561, type: sysv
dk5 at wd0: d0
dk5: 120625343 blocks at 35676145, type: sysv
wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 6 (Ultra/133)
wd0(wdc0:0:0): using PIO mode 4, DMA mode 2, Ultra-DMA mode 4 (Ultra/66) (using DMA)
[...]

So, the wedges think the filesysem type is "sysv" instead of "ffs".
I can check and mount the disk partitions if I add "-t ffs" to the
'fsck' and 'mount' command lines, respectively.

The startup scripts expect correct automatic detection of filesystem type,
so the machine cannot currently boot past single-user mode when booting
from disk.

The partitions were established long ago and the instructions about the
type to use haven't changed.

$ pdisk -l /dev/rwd0c

Partition map (with 512 byte blocks) on '/dev/rwd0c'
 #:                type name      length   base      ( size )
 1: Apple_partition_map Apple         63 @ 1        
 2:           Apple_HFS Boot       21105 @ 64        ( 10.3M)
 3:     Apple_UNIX_SVR2 Root    20972448 @ 21169     ( 10.0G) S0 RUFS k0  /
 4:     Apple_UNIX_SVR2 Swap     4195296 @ 20993617  (  2.0G) S1  SFS k0  (swap)
 5:     Apple_UNIX_SVR2 tmp      2097648 @ 25188913  (  1.0G) S2  UFS k0  /usr
 6:     Apple_UNIX_SVR2 var      8389584 @ 27286561  (  4.0G) S2  UFS k0  /usr
 7:     Apple_UNIX_SVR2 d0     120625343 @ 35676145  ( 57.5G) S2  UFS k0  /usr

Device block size=512, Number of Blocks=156301488 (74.5G)
DeviceType=0x0, DeviceId=0x0

Please advise.

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645