Hi,

in regress/etc/MAKEDEV I see this "wd0: unknown device" error in
riscv64 ramdisk.

==== run-riscv64-ramdisk ====
rm -rf -- riscv64-ramdisk.dir
mkdir -m 700 riscv64-ramdisk.dir
cp /usr/src/regress/etc/MAKEDEV/../../../etc/etc.riscv64/MAKEDEV 
riscv64-ramdisk.dir/
chown root:wheel riscv64-ramdisk.dir
time sh -c 'cd riscv64-ramdisk.dir && sh ./MAKEDEV ramdisk'
wd0: unknown device
    0m00.27s real     0m00.06s user     0m00.21s system
ls -ln riscv64-ramdisk.dir/ |  awk '/^[bcps]/ {printf "%s %x.%x 
%x,%x%s\n",$1,$3,$4,$5,$6,$10}  /^l/      {printf "%s 
%s.%s%s>%s\n",$1,$3,$4,$9,$11}' |  sort +5 -n |  sed -e 
's/rwx/7/g;s/rw-/6/g;s/r-x/5/g;s/r--/4/g'  -e 
's/-wx/3/g;s/-w-/2/g;s/--x/1/g;s/---/0/g'  -e 's/^\([bcpsl]\)\([0-9][0-9]*\) 
/\2\1/'  >riscv64-ramdisk.out

If we have no wd(4) on riscv64, we should also remove it from ramdisk.

ok?

bluhm

Index: etc/etc.riscv64/MAKEDEV
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/etc/etc.riscv64/MAKEDEV,v
retrieving revision 1.2
diff -u -p -r1.2 MAKEDEV
--- etc/etc.riscv64/MAKEDEV     26 Jun 2021 00:48:28 -0000      1.2
+++ etc/etc.riscv64/MAKEDEV     28 Sep 2021 15:39:22 -0000
@@ -213,7 +213,7 @@ U=`unt $i`
 
 case $i in
 ramdisk)
-       R std bpf wd0 sd0 tty00 tty01 rd0 bio diskmap
+       R std bpf sd0 tty00 tty01 rd0 bio diskmap
        R cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
        ;;
 
Index: etc/etc.riscv64/MAKEDEV.md
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/etc/etc.riscv64/MAKEDEV.md,v
retrieving revision 1.2
diff -u -p -r1.2 MAKEDEV.md
--- etc/etc.riscv64/MAKEDEV.md  26 Jun 2021 00:38:38 -0000      1.2
+++ etc/etc.riscv64/MAKEDEV.md  28 Sep 2021 15:39:16 -0000
@@ -86,7 +86,7 @@ dnl
 divert(__mddivert)dnl
 dnl
 ramdisk)
-       _recurse std bpf wd0 sd0 tty00 tty01 rd0 bio diskmap
+       _recurse std bpf sd0 tty00 tty01 rd0 bio diskmap
        _recurse cd0 ttyC0 wskbd0 wskbd1 wskbd2 random
        ;;
 

Reply via email to