From 70a3cb12c79f1d82bc1e0291aeb731d945e93563 Mon Sep 17 00:00:00 2001
From: jj <>
Date: Wed, 3 Jun 2009 14:45:45 +0000
Subject: [PATCH] Arla client rename from xfs to nnpfs for later upgrades.
 Tested on various arches. ok todd@ beck@

---
 src/etc/MAKEDEV.common         |  6 +++---
 src/etc/etc.alpha/MAKEDEV      |  8 ++++----
 src/etc/etc.alpha/MAKEDEV.md   |  6 +++---
 src/etc/etc.amd64/MAKEDEV      |  8 ++++----
 src/etc/etc.amd64/MAKEDEV.md   |  6 +++---
 src/etc/etc.armish/MAKEDEV     |  8 ++++----
 src/etc/etc.armish/MAKEDEV.md  |  6 +++---
 src/etc/etc.aviion/MAKEDEV     |  8 ++++----
 src/etc/etc.aviion/MAKEDEV.md  |  6 +++---
 src/etc/etc.hp300/MAKEDEV      |  8 ++++----
 src/etc/etc.hp300/MAKEDEV.md   |  6 +++---
 src/etc/etc.hppa/MAKEDEV       |  8 ++++----
 src/etc/etc.hppa/MAKEDEV.md    |  6 +++---
 src/etc/etc.hppa64/MAKEDEV     |  8 ++++----
 src/etc/etc.hppa64/MAKEDEV.md  |  6 +++---
 src/etc/etc.i386/MAKEDEV       |  8 ++++----
 src/etc/etc.i386/MAKEDEV.md    |  6 +++---
 src/etc/etc.landisk/MAKEDEV    |  8 ++++----
 src/etc/etc.landisk/MAKEDEV.md |  6 +++---
 src/etc/etc.luna88k/MAKEDEV    |  8 ++++----
 src/etc/etc.luna88k/MAKEDEV.md |  6 +++---
 src/etc/etc.mac68k/MAKEDEV     |  8 ++++----
 src/etc/etc.mac68k/MAKEDEV.md  |  6 +++---
 src/etc/etc.macppc/MAKEDEV     |  8 ++++----
 src/etc/etc.macppc/MAKEDEV.md  |  6 +++---
 src/etc/etc.mvme68k/MAKEDEV    |  8 ++++----
 src/etc/etc.mvme68k/MAKEDEV.md |  6 +++---
 src/etc/etc.mvme88k/MAKEDEV    |  8 ++++----
 src/etc/etc.mvme88k/MAKEDEV.md |  6 +++---
 src/etc/etc.mvmeppc/MAKEDEV    | 14 +++++++-------
 src/etc/etc.mvmeppc/MAKEDEV.md | 14 +++++++-------
 src/etc/etc.sgi/MAKEDEV        |  8 ++++----
 src/etc/etc.sgi/MAKEDEV.md     |  6 +++---
 src/etc/etc.socppc/MAKEDEV     |  8 ++++----
 src/etc/etc.socppc/MAKEDEV.md  |  6 +++---
 src/etc/etc.sparc/MAKEDEV      |  8 ++++----
 src/etc/etc.sparc/MAKEDEV.md   |  6 +++---
 src/etc/etc.sparc64/MAKEDEV    |  8 ++++----
 src/etc/etc.sparc64/MAKEDEV.md |  6 +++---
 src/etc/etc.vax/MAKEDEV        |  8 ++++----
 src/etc/etc.vax/MAKEDEV.md     |  6 +++---
 src/etc/etc.zaurus/MAKEDEV     |  8 ++++----
 src/etc/etc.zaurus/MAKEDEV.md  |  6 +++---
 src/etc/rc                     |  6 +++---
 src/etc/security               |  4 ++--
 src/include/Makefile           |  4 ++--
 46 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common
index 03f86df5..96089f88 100644
--- a/src/etc/MAKEDEV.common
+++ b/src/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.42 2009/04/05 17:49:14 jmc Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -554,8 +554,8 @@ _mkdev(spif, spif*, {-case $U in
 	M bpp${nam}0 c major_bppsp_c Add($offset, 0) 600-})dnl
 __devitem(bpp, bpp*, Parallel port)dnl
 _mkdev(bpp, {-bpp*-}, {-M bpp$U c major_bpp_c $U 600-}, 600)dnl
-__devitem(xfs, xfs*, XFS filesystem node, mount_xfs 8)dnl
-_mcdev(xfs, xfs*, xfs, {-major_xfs_c-}, 600)dnl
+__devitem(nnpfs, nnpfs*, NNPFS filesystem node, mount_nnpfs 8)dnl
+_mcdev(nnpfs, nnpfs*, nnpfs, {-major_nnpfs_c-}, 600)dnl
 __devitem(rmidi, rmidi*, Raw MIDI devices,midi)dnl
 _mcdev(rmidi, rmidi*, rmidi, {-major_rmidi_c-}, 666)dnl
 __devtitle(plat, Platform-specific devices)dnl
diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index b05925c8..116c8b6e 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -89,7 +89,7 @@
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -245,8 +245,8 @@ ttyB*|ttyc*)
 	M cua$type$U c $major $(($minor+128)) 660 dialer uucp
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -539,7 +539,7 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H xfs0 ss0 ss1 ch0 bio hotplug ptm local wscons pci0
+	R fd0G fd0H nnpfs0 ss0 ss1 ch0 bio hotplug ptm local wscons pci0
 	R pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3
 	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker
 	R video0 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0
diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md
index 2f803aff..36eccb27 100644
--- a/src/etc/etc.alpha/MAKEDEV.md
+++ b/src/etc/etc.alpha/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,alpha)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.42 2009/04/17 15:52:04 deraadt Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.43 2009/06/03 14:45:39 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -83,7 +83,7 @@ _DEV(tun, 7)
 _DEV(tuner, 58)
 _DEV(uk, 33)
 _DEV(vi, 44)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -111,7 +111,7 @@ dnl
 target(all, bio)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 48f31762..13885e6b 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -97,7 +97,7 @@
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -248,8 +248,8 @@ ttyc*)
 	M cuac$U c 38 $(($U+128)) 660 dialer uucp
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -580,7 +580,7 @@ all)
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
 	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D fd1E
-	R fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0
+	R fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H nnpfs0
 	R ss0 ss1 ch0 hotplug ptm gpr0 local wscons pci0 pci1 pci2
 	R pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
 	R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker video0
diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md
index 6b340ac6..a5b89596 100644
--- a/src/etc/etc.amd64/MAKEDEV.md
+++ b/src/etc/etc.amd64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,amd64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.35 2009/03/25 19:30:26 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.36 2009/06/03 14:45:39 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -99,7 +99,7 @@ _DEV(tun, 40)
 _DEV(tuner, 49)
 _DEV(uk, 20)
 _DEV(vi, 44)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -121,7 +121,7 @@ dnl amd64 specific targets
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index feb3316a..40620c7e 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -82,7 +82,7 @@
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -227,8 +227,8 @@ std)
 	M klog		c 6 0 600
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -479,7 +479,7 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
 	R ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
 	R iop1 uall tuner0 radio0 video0 audio0 audio1 audio2 uk0
 	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
diff --git a/src/etc/etc.armish/MAKEDEV.md b/src/etc/etc.armish/MAKEDEV.md
index fdaaaf27..b9f31b19 100644
--- a/src/etc/etc.armish/MAKEDEV.md
+++ b/src/etc/etc.armish/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,armish)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.12 2009/02/06 21:17:14 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.13 2009/06/03 14:45:39 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -87,7 +87,7 @@ _DEV(ss, 29)
 _DEV(systrace, 50)
 _DEV(tuner, 75)
 _DEV(vi, 38)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -103,7 +103,7 @@ dnl *** armish specific targets
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV
index 30ac93b4..54f7edc2 100644
--- a/src/etc/etc.aviion/MAKEDEV
+++ b/src/etc/etc.aviion/MAKEDEV
@@ -56,7 +56,7 @@
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -197,8 +197,8 @@ std)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 uk*)
@@ -337,7 +337,7 @@ ramdisk)
 all)
 	R ttya ttyb ttyc ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
 	R ch0 nvram0 ptm local uk0 random lkm pf systrace std st0 st1
 	R fd
 	;;
diff --git a/src/etc/etc.aviion/MAKEDEV.md b/src/etc/etc.aviion/MAKEDEV.md
index 7b996fe7..d2b1ce92 100644
--- a/src/etc/etc.aviion/MAKEDEV.md
+++ b/src/etc/etc.aviion/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,aviion)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.7 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.8 2009/06/03 14:45:39 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -47,7 +47,7 @@ target(all, nvram, 0)dnl
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
@@ -98,7 +98,7 @@ _DEV(ss, 42)
 _DEV(systrace, 50)
 _DEV(tun, 23)
 _DEV(uk, 41)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 3c3302b3..ca598aac 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -69,7 +69,7 @@
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -277,8 +277,8 @@ ppi*)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 uk*)
@@ -454,7 +454,7 @@ all)
 	R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 ccd0 ccd1
 	R ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1
 	R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
-	R bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0 ptm local ppi0 apci0
+	R bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ch0 ptm local ppi0 apci0
 	R wscons uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.hp300/MAKEDEV.md b/src/etc/etc.hp300/MAKEDEV.md
index 83d8b3ac..982c9e72 100644
--- a/src/etc/etc.hp300/MAKEDEV.md
+++ b/src/etc/etc.hp300/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,hp300)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.34 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.35 2009/06/03 14:45:39 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -90,7 +90,7 @@ _DEV(ss, 38)
 _DEV(systrace, 50)
 _DEV(tun, 23)
 _DEV(uk, 37)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -167,7 +167,7 @@ ppi*)
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 64ec9546..ed542514 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -81,7 +81,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -227,8 +227,8 @@ std)
 	M pdc		c 22 0 640 operator
 	;;
 
-xfs*)
-	M xfs$U c 32 $U 600
+nnpfs*)
+	M nnpfs$U c 32 $U 600
 	;;
 
 video*)
@@ -497,7 +497,7 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H xfs0 ss0 ss1 bio ch0 hotplug ptm local wscons pci0
+	R fd0G fd0H nnpfs0 ss0 ss1 bio ch0 hotplug ptm local wscons pci0
 	R pci1 pci2 pci3 uall video0 audio0 audio1 audio2 uk0 random
 	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
 	R crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
diff --git a/src/etc/etc.hppa/MAKEDEV.md b/src/etc/etc.hppa/MAKEDEV.md
index fafe7b52..02ed558b 100644
--- a/src/etc/etc.hppa/MAKEDEV.md
+++ b/src/etc/etc.hppa/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,hppa)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.37 2009/02/06 21:17:14 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.38 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -76,7 +76,7 @@ _DEV(systrace, 34)
 _DEV(tun, 18)
 _DEV(uk, 15)
 _DEV(vi, 33)
-_DEV(xfs, 32)
+_DEV(nnpfs, 32)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -94,7 +94,7 @@ dnl
 target(all, ch, 0)dnl
 target(all, bio)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index e02d77a3..178fd31d 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -72,7 +72,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -218,8 +218,8 @@ std)
 	M pdc		c 22 0 640 operator
 	;;
 
-xfs*)
-	M xfs$U c 32 $U 600
+nnpfs*)
+	M nnpfs$U c 32 $U 600
 	;;
 
 video*)
@@ -443,7 +443,7 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H xfs0 ss0 ss1 ch0 ptm local wscons pci0 pci1 pci2
+	R fd0G fd0H nnpfs0 ss0 ss1 ch0 ptm local wscons pci0 pci1 pci2
 	R pci3 video0 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2
 	R lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf
 	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
diff --git a/src/etc/etc.hppa64/MAKEDEV.md b/src/etc/etc.hppa64/MAKEDEV.md
index dcfeb819..eb638ace 100644
--- a/src/etc/etc.hppa64/MAKEDEV.md
+++ b/src/etc/etc.hppa64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,hppa64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.14 2009/02/06 21:17:14 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.15 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -67,7 +67,7 @@ _DEV(systrace, 34)
 _DEV(tun, 18)
 _DEV(uk, 15)
 _DEV(vi, 33)
-_DEV(xfs, 32)
+_DEV(nnpfs, 32)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -84,7 +84,7 @@ dnl *** hppa64 specific devices
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index a2067676..b1d2517b 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -101,7 +101,7 @@
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -252,8 +252,8 @@ ttyc*)
 	M cuac$U c 38 $(($U+128)) 660 dialer uucp
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -601,7 +601,7 @@ all)
 	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
-	R fd0D fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 hotplug ptm gpr0
+	R fd0D fd0E fd0F fd0G fd0H nnpfs0 ss0 ss1 ch0 hotplug ptm gpr0
 	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
 	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
 	R radio0 music0 speaker video0 audio0 audio1 audio2 uk0 random
diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md
index be9b008e..cfc10455 100644
--- a/src/etc/etc.i386/MAKEDEV.md
+++ b/src/etc/etc.i386/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,i386)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.51 2009/03/25 19:30:28 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.52 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -103,7 +103,7 @@ _DEV(tun, 40)
 _DEV(tuner, 49)
 _DEV(uk, 20)
 _DEV(vi, 44)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -125,7 +125,7 @@ dnl i386 specific targets
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 91548cf6..e0fab104 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -78,7 +78,7 @@
 #	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -223,8 +223,8 @@ std)
 	M klog		c 6 0 600
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -455,7 +455,7 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
 	R ss1 ch0 ttya hotplug ptm local wscons pci0 pci1 pci2 pci3
 	R uall radio0 video0 audio0 audio1 audio2 uk0 random lkm
 	R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
diff --git a/src/etc/etc.landisk/MAKEDEV.md b/src/etc/etc.landisk/MAKEDEV.md
index 35069178..35b7be78 100644
--- a/src/etc/etc.landisk/MAKEDEV.md
+++ b/src/etc/etc.landisk/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,landisk)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.14 2009/02/06 21:17:14 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.15 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -91,7 +91,7 @@ _DEV(ss, 29)
 _DEV(systrace, 50)
 dnl _DEV(tuner, 75)
 _DEV(vi, 77)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -108,7 +108,7 @@ dnl
 twrget(all, scif, tty, a)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index 21e0fe2a..ce051029 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -63,7 +63,7 @@
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -204,8 +204,8 @@ std)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 uk*)
@@ -371,7 +371,7 @@ ramdisk)
 all)
 	R lcd ttya ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
 	R sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
-	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0
+	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ch0
 	R ptm local wscons uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.luna88k/MAKEDEV.md b/src/etc/etc.luna88k/MAKEDEV.md
index 0b4f5457..18242ec9 100644
--- a/src/etc/etc.luna88k/MAKEDEV.md
+++ b/src/etc/etc.luna88k/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,luna88k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.10 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.11 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -37,7 +37,7 @@ dnl
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
@@ -96,7 +96,7 @@ _DEV(ss, 42)
 _DEV(systrace, 50)
 _DEV(tun, 23)
 _DEV(uk, 41)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 8b95e8b3..2baf9a49 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -63,7 +63,7 @@
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -229,8 +229,8 @@ asc*)
 	M asc$U c 36 $U
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 uk*)
@@ -390,7 +390,7 @@ ramdisk)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
 	R ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 bio ptm
 	R local wscons asc0 uk0 random lkm tty00 tty01 pf systrace std
 	R st0 st1 fd
diff --git a/src/etc/etc.mac68k/MAKEDEV.md b/src/etc/etc.mac68k/MAKEDEV.md
index 7672b3df..aa687997 100644
--- a/src/etc/etc.mac68k/MAKEDEV.md
+++ b/src/etc/etc.mac68k/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,mac68k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.28 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.29 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -62,7 +62,7 @@ _DEV(ss, 33)
 _DEV(systrace, 50)
 _DEV(tun, 24)
 _DEV(uk, 34)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -102,7 +102,7 @@ target(all, sd, 0, 1, 2, 3, 4)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 75b21a0f..0630b0b4 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -87,7 +87,7 @@
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -230,8 +230,8 @@ std)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -516,7 +516,7 @@ all)
 	R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
 	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 cuaa cuab
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ss1 ch0 cuaa cuab
 	R ttya ttyb hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
 	R iop1 uall tuner0 radio0 video0 audio0 audio1 audio2 uk0
 	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
diff --git a/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md
index f18f5a96..d68ec729 100644
--- a/src/etc/etc.macppc/MAKEDEV.md
+++ b/src/etc/etc.macppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.38 2009/02/06 21:17:15 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.39 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -98,7 +98,7 @@ _DEV(tun, 23)
 _DEV(tuner, 75)
 _DEV(uk, 41)
 _DEV(vi, 45)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -114,7 +114,7 @@ twrget(all, s64_tzs, tty, a, b)dnl
 twrget(all, s64_czs, cua, a, b)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index 8cb173e8..7155820a 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -66,7 +66,7 @@
 #	uk*	Unknown SCSI devices
 #	vmel0	VMEbus D32 space
 #	vmes0	VMEbus D16 space
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -207,8 +207,8 @@ std)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 vmes0)
@@ -422,7 +422,7 @@ all)
 	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd ccd0 ccd1 ccd2 ccd3
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0
 	R tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 vmel0 vmes0 flash0 nvram0
+	R bpf8 bpf9 pty0 nnpfs0 ss0 ss1 ch0 vmel0 vmes0 flash0 nvram0
 	R sram0 ptm local uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.mvme68k/MAKEDEV.md b/src/etc/etc.mvme68k/MAKEDEV.md
index 83d871d0..d9db5551 100644
--- a/src/etc/etc.mvme68k/MAKEDEV.md
+++ b/src/etc/etc.mvme68k/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,mvme68k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.23 2009/03/01 21:40:49 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.24 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -106,7 +106,7 @@ target(all, vmel, 0)dnl
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
@@ -172,7 +172,7 @@ _DEV(tun, 23)
 _DEV(uk, 41)
 _DEV(vmel, 31)
 _DEV(vmes, 32)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index 4ea1869c..4c2d51cd 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -61,7 +61,7 @@
 #	vmel0	VMEbus D32 space
 #	vmes0	VMEbus D16 space
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -202,8 +202,8 @@ std)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 uk*)
@@ -377,7 +377,7 @@ all)
 	R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0
 	R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0 vmel0 vmes0 nvram0 sram0
+	R bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ch0 vmel0 vmes0 nvram0 sram0
 	R ptm local uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.mvme88k/MAKEDEV.md b/src/etc/etc.mvme88k/MAKEDEV.md
index 3fdeb1e9..4fdf179e 100644
--- a/src/etc/etc.mvme88k/MAKEDEV.md
+++ b/src/etc/etc.mvme88k/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,mvme88k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.22 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.23 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -73,7 +73,7 @@ target(all, vmel, 0)dnl
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
@@ -132,7 +132,7 @@ _DEV(tun, 23)
 _DEV(vmel, 31)
 _DEV(vmes, 32)
 _DEV(uk, 41)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
diff --git a/src/etc/etc.mvmeppc/MAKEDEV b/src/etc/etc.mvmeppc/MAKEDEV
index c2689a00..2a4bff6a 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV
+++ b/src/etc/etc.mvmeppc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.12 2005/08/01 19:44:53 jmc Exp $
+#	$OpenBSD: MAKEDEV,v 1.13 2009/06/03 14:45:40 jj Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -161,7 +161,7 @@ all)
 	sh $this random uk0 uk1 ss0 ss1
 	sh $this wscons
 	sh $this pci
-	sh $this lkm xfs0
+	sh $this lkm nnpfs0
 	sh $this usbs
 	;;
 
@@ -625,11 +625,11 @@ wsmouse*)
 	chown root.wheel wsmouse${unit}
 	;;
 
-xfs*)
-	rm -f xfs$unit
-	mknod xfs$unit c 51 $unit
-	chmod 600 xfs$unit
-	chown root.wheel xfs$unit
+nnpfs*)
+	rm -f nnpfs$unit
+	mknod nnpfs$unit c 51 $unit
+	chmod 600 nnpfs$unit
+	chown root.wheel nnpfs$unit
 	;;
 
 *)
diff --git a/src/etc/etc.mvmeppc/MAKEDEV.md b/src/etc/etc.mvmeppc/MAKEDEV.md
index 12a2f603..8cbbceec 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV.md
+++ b/src/etc/etc.mvmeppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.28 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.29 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -475,11 +475,11 @@ wsmouse*)
 	chown root:wheel wsmouse${unit}
 	;;
 
-xfs*)
-	rm -f xfs$unit
-	mknod xfs$unit c 51 $unit
-	chmod 600 xfs$unit
-	chown root:wheel xfs$unit
+nnpfs*)
+	rm -f nnpfs$unit
+	mknod nnpfs$unit c 51 $unit
+	chmod 600 nnpfs$unit
+	chown root:wheel nnpfs$unit
 	;;
 
 altq)
@@ -504,7 +504,7 @@ dnl *** mvmeppc specific devices
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 16fc806b..3c0d5114 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -74,7 +74,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -214,8 +214,8 @@ std)
 	M klog		c 6 0 600
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -438,7 +438,7 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
-	R xfs0 ss0 ss1 ch0 ptm local wscons pci0 pci1 pci2 pci3 uall
+	R nnpfs0 ss0 ss1 ch0 ptm local wscons pci0 pci1 pci2 pci3 uall
 	R video0 audio0 audio1 audio2 uk0 random tty00 tty01 tty02
 	R tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
diff --git a/src/etc/etc.sgi/MAKEDEV.md b/src/etc/etc.sgi/MAKEDEV.md
index b571cdfe..c1853fc7 100644
--- a/src/etc/etc.sgi/MAKEDEV.md
+++ b/src/etc/etc.sgi/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,sgi)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.23 2009/02/06 21:17:15 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.24 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -77,7 +77,7 @@ _DEV(systrace, 50)
 _DEV(tun, 13)
 _DEV(uk, 32)
 _DEV(vi, 45)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -88,7 +88,7 @@ dnl *** sgi specific targets
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 dnl twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0, 1, 2)dnl
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index 59e7630a..a78a0964 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -83,7 +83,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -224,8 +224,8 @@ std)
 	;;
 
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -482,7 +482,7 @@ all)
 	R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
 	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 hotplug ptm
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ss1 ch0 hotplug ptm
 	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall radio0
 	R video0 audio0 audio1 audio2 uk0 random lkm tty00 tty01 tty02
 	R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
diff --git a/src/etc/etc.socppc/MAKEDEV.md b/src/etc/etc.socppc/MAKEDEV.md
index 595e3c2a..8beb3832 100644
--- a/src/etc/etc.socppc/MAKEDEV.md
+++ b/src/etc/etc.socppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,socppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.6 2009/02/06 21:17:15 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.7 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -80,7 +80,7 @@ _DEV(tun, 23)
 dnl _DEV(tuner, 75)
 _DEV(uk, 41)
 _DEV(vi, 44)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -92,7 +92,7 @@ dnl *** socppc specific targets
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 54a8d226..f0a7973c 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -78,7 +78,7 @@
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -225,8 +225,8 @@ std)
 	M openprom	c 70 0	640 kmem
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 uk*)
@@ -514,7 +514,7 @@ all)
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2
 	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 bio cuaa cuab cuac cuad
+	R fd0E fd0F fd0G fd0H nnpfs0 ss0 ss1 ch0 bio cuaa cuab cuac cuad
 	R ttya ttyb ttyc ttyd ptm local wscons audio0 audio1 audio2
 	R uk0 random lkm tty00 tty01 tty02 tty03 apm pf systrace xd0
 	R xd1 xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1 fd
diff --git a/src/etc/etc.sparc/MAKEDEV.md b/src/etc/etc.sparc/MAKEDEV.md
index a0e9c7f4..d145701c 100644
--- a/src/etc/etc.sparc/MAKEDEV.md
+++ b/src/etc/etc.sparc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,sparc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.38 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.39 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -105,7 +105,7 @@ _DEV(ss, 121)
 _DEV(systrace, 50)
 _DEV(tun, 111)
 _DEV(uk, 120)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -126,7 +126,7 @@ twrget(all, s64_czs, cua, a, b, c, d)dnl
 target(all, bio)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 62207e85..d2e4ca49 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -94,7 +94,7 @@
 #	uk*	Unknown SCSI devices
 #	uperf	Performance counters
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -241,8 +241,8 @@ std)
 	M mdesc		c 70 1 640 kmem
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -605,7 +605,7 @@ all)
 	R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C
 	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
-	R fd0H xfs0 ss0 ss1 ch0 ccd0 ccd1 ccd2 ccd3 hotplug ptm local
+	R fd0H nnpfs0 ss0 ss1 ch0 ccd0 ccd1 ccd2 ccd3 hotplug ptm local
 	R wscons pci0 pci1 pci2 pci3 uall video0 audio0 audio1 audio2
 	R uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01
 	R tty02 tty03 ttyh0 ttyh1 crypto pf systrace wd0 wd1 wd2 wd3
diff --git a/src/etc/etc.sparc64/MAKEDEV.md b/src/etc/etc.sparc64/MAKEDEV.md
index 78289231..d089bbd4 100644
--- a/src/etc/etc.sparc64/MAKEDEV.md
+++ b/src/etc/etc.sparc64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,sparc64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.53 2009/05/12 20:15:21 kettenis Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.54 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -116,7 +116,7 @@ _DEV(tun, 111)
 _DEV(uk, 60)
 _DEV(uperf, 25)
 _DEV(vi, 44)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -142,7 +142,7 @@ twrget(wscons, wscons, ttyJ, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
 target(all, ccd, 0, 1, 2, 3)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index d75af786..a6d983df 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -79,7 +79,7 @@
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -273,8 +273,8 @@ ht*|tm*|mt*|ts*|ut*)
 	umask 77
 	;;
 
-xfs*)
-	M xfs$U c 74 $U 600
+nnpfs*)
+	M nnpfs$U c 74 $U 600
 	;;
 
 uk*)
@@ -515,7 +515,7 @@ local)
 all)
 	R dl0 dz0 dhu0 ts0 ts1 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0 sd1
 	R sd2 sd3 cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 pty0 xfs0 ss0 ptm local wscons uk0 random lkm pf
+	R bpf7 pty0 nnpfs0 ss0 ptm local wscons uk0 random lkm pf
 	R systrace rx0 rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 raid0 raid1
 	R raid2 raid3 std st0 st1 fd
 	;;
diff --git a/src/etc/etc.vax/MAKEDEV.md b/src/etc/etc.vax/MAKEDEV.md
index 2cc4d14f..02c46a10 100644
--- a/src/etc/etc.vax/MAKEDEV.md
+++ b/src/etc/etc.vax/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,vax)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.36 2009/01/25 17:30:48 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.37 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -139,7 +139,7 @@ _DEV(ss, 64)
 _DEV(systrace, 49)
 _DEV(tun, 57)
 _DEV(uk, 65)
-_DEV(xfs, 74)
+_DEV(nnpfs, 74)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -205,7 +205,7 @@ dnl
 dnl target(all, ut, 0)dnl
 dnl target(all, ch, 0)dnl
 target(all, ss, 0)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 target(all, bio)dnl
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index f3f4c209..6e309941 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -80,7 +80,7 @@
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
-#	xfs*	XFS filesystem node
+#	nnpfs*	NNPFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -225,8 +225,8 @@ std)
 	M klog		c 6 0 600
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+nnpfs*)
+	M nnpfs$U c 51 $U 600
 	;;
 
 video*)
@@ -468,7 +468,7 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio xfs0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio nnpfs0
 	R ss0 ss1 ch0 hotplug ptm local wscons uall tuner0 radio0
 	R video0 audio0 audio1 audio2 uk0 random lkm tty00 tty01 tty02
 	R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
diff --git a/src/etc/etc.zaurus/MAKEDEV.md b/src/etc/etc.zaurus/MAKEDEV.md
index 78c8c968..4fb81cab 100644
--- a/src/etc/etc.zaurus/MAKEDEV.md
+++ b/src/etc/etc.zaurus/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,zaurus)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.19 2009/02/06 21:17:15 grange Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.20 2009/06/03 14:45:40 jj Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -85,7 +85,7 @@ _DEV(ss, 29)
 _DEV(systrace, 50)
 _DEV(tuner, 75)
 _DEV(vi, 38)
-_DEV(xfs, 51)
+_DEV(nnpfs, 51)
 dnl
 divert(__mddivert)dnl
 dnl
@@ -101,7 +101,7 @@ dnl *** zaurus specific targets
 dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
+target(all, nnpfs, 0)dnl
 target(all, bio)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
diff --git a/src/etc/rc b/src/etc/rc
index dca9f8f3..e6412e78 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.325 2009/05/31 20:57:12 halex Exp $
+#	$OpenBSD: rc,v 1.326 2009/06/03 14:45:39 jj Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -467,10 +467,10 @@ if [ -d /var/crash ]; then
 	savecore ${savecore_flags} /var/crash
 fi
 
-if [ X"${afs}" = X"YES" -a -c /dev/xfs0 ]; then
+if [ X"${afs}" = X"YES" -a -c /dev/nnpfs0 ]; then
 	echo -n 'mounting afs:'
 	mkdir -p -m 0755 /afs
-	mount -t xfs /dev/xfs0 /afs
+	mount -t nnpfs /dev/nnpfs0 /afs
 	/usr/libexec/afsd ${afsd_flags}
 	echo ' done.'
 fi
diff --git a/src/etc/security b/src/etc/security
index 4b53e645..d767a1c9 100644
--- a/src/etc/security
+++ b/src/etc/security
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: security,v 1.87 2009/05/24 22:25:12 schwarze Exp $
+#	$OpenBSD: security,v 1.88 2009/06/03 14:45:39 jj Exp $
 #	from: @(#)security	8.1 (Berkeley) 6/9/93
 #
 
@@ -422,7 +422,7 @@ fi
 next_part "Setuid/device find errors:"
 ( set -o noglob
   find / \
-	\( ! -fstype local -o -fstype procfs -o -fstype afs -o -fstype xfs \
+	\( ! -fstype local -o -fstype procfs -o -fstype afs -o -fstype nnpfs \
 	   `for f in $SUIDSKIP; do echo -o -path $f; done` \
 	\) -a -prune -o \
 	-type f -a \( -perm -u+s -o -perm -g+s \) -print0 -o \
diff --git a/src/include/Makefile b/src/include/Makefile
index 2c5b2ac3..d249bc7e 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.149 2009/04/21 19:14:33 ratchov Exp $
+#	$OpenBSD: Makefile,v 1.150 2009/06/03 14:45:45 jj Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -36,7 +36,7 @@ LFILES=	fcntl.h syslog.h termios.h stdarg.h stdint.h varargs.h
 
 DIRS=	arpa protocols rpc rpcsvc
 LDIRS=	altq crypto ddb dev isofs miscfs net netatalk netinet netinet6 \
-	netmpls netnatm net80211 netbt nfs scsi sys ufs uvm xfs
+	netmpls netnatm net80211 netbt nfs nnpfs scsi sys ufs uvm
 
 # Directories with an includes target
 RDIRS=	../lib/libpthread ../lib/libcompat ../lib/libcurses \