Module Name: src
Committed By: hannken
Date: Sun May 28 08:17:00 UTC 2023
Modified Files:
src/tests/fs/nfs: t_rquotad.sh
src/tests/lib/librumphijack: t_tcpip.sh t_vfs.sh
Log Message:
Add RUMPHIJACK option "blanket=/DEV" so mount_ffs may canonicalise
and mount the device path. Cannot use "/rump/DEV" here as the device
path is embedded in "struct ufs_args" where it doesnt get hijacked.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/nfs/t_rquotad.sh
cvs rdiff -u -r1.21 -r1.22 src/tests/lib/librumphijack/t_tcpip.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumphijack/t_vfs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/t_rquotad.sh
diff -u src/tests/fs/nfs/t_rquotad.sh:1.9 src/tests/fs/nfs/t_rquotad.sh:1.10
--- src/tests/fs/nfs/t_rquotad.sh:1.9 Thu Aug 20 13:58:30 2020
+++ src/tests/fs/nfs/t_rquotad.sh Sun May 28 08:17:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_rquotad.sh,v 1.9 2020/08/20 13:58:30 riastradh Exp $
+# $NetBSD: t_rquotad.sh,v 1.10 2023/05/28 08:17:00 hannken Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -110,7 +110,8 @@ get_nfs_quota()
/bin/echo "/export -noresvport -noresvmnt 10.1.1.100" | \
dd of=/rump/etc/exports 2> /dev/null
- atf_check -s exit:0 -e ignore mount_ffs /dk /rump/export
+ atf_check -s exit:0 -e ignore env RUMPHIJACK='path=/rump,blanket=/dk' \
+ mount_ffs /dk /rump/export
#set a quota limit (and check that we can read it back)
for q in ${expect} ; do
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.21 src/tests/lib/librumphijack/t_tcpip.sh:1.22
--- src/tests/lib/librumphijack/t_tcpip.sh:1.21 Thu Nov 11 07:38:21 2021
+++ src/tests/lib/librumphijack/t_tcpip.sh Sun May 28 08:17:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_tcpip.sh,v 1.21 2021/11/11 07:38:21 gson Exp $
+# $NetBSD: t_tcpip.sh,v 1.22 2023/05/28 08:17:00 hannken Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -182,7 +182,8 @@ test_nfs()
atf_check -s exit:0 rump.sysctl -q -w kern.module.autoload=1
- atf_check -s exit:0 -e ignore mount_ffs /dk /rump/export
+ atf_check -s exit:0 -e ignore env RUMPHIJACK='path=/rump,blanket=/dk' \
+ mount_ffs /dk /rump/export
atf_check -s exit:0 -x "echo ${magicstr} > /rump/export/im_alive"
# start rpcbind. we want /var/run/rpcbind.sock
Index: src/tests/lib/librumphijack/t_vfs.sh
diff -u src/tests/lib/librumphijack/t_vfs.sh:1.6 src/tests/lib/librumphijack/t_vfs.sh:1.7
--- src/tests/lib/librumphijack/t_vfs.sh:1.6 Sat Aug 4 03:56:47 2012
+++ src/tests/lib/librumphijack/t_vfs.sh Sun May 28 08:17:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_vfs.sh,v 1.6 2012/08/04 03:56:47 riastradh Exp $
+# $NetBSD: t_vfs.sh,v 1.7 2023/05/28 08:17:00 hannken Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,7 +35,8 @@ domount()
mntdir=$1
[ $# -eq 0 ] && mntdir=/rump/mnt
- atf_check -s exit:0 -e ignore mount_ffs /img ${mntdir}
+ atf_check -s exit:0 -e ignore env RUMPHIJACK='path=/rump,blanket=/img' \
+ mount_ffs /img ${mntdir}
}
dounmount()
