Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
hannken 2023-05-28 08:17:00 +00:00
parent d7488b2d05
commit b3a4996943
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/fs/nfs/t_rquotad.sh
View File

@ -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 # Copyright (c) 2011 Manuel Bouyer
# All rights reserved. # All rights reserved.
@ -110,7 +110,8 @@ get_nfs_quota()
/bin/echo "/export -noresvport -noresvmnt 10.1.1.100" | \ /bin/echo "/export -noresvport -noresvmnt 10.1.1.100" | \
dd of=/rump/etc/exports 2> /dev/null 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) #set a quota limit (and check that we can read it back)
for q in ${expect} ; do for q in ${expect} ; do

5
tests/lib/librumphijack/t_tcpip.sh
View File

@ -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. # Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved. # 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 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" atf_check -s exit:0 -x "echo ${magicstr} > /rump/export/im_alive"
# start rpcbind. we want /var/run/rpcbind.sock # start rpcbind. we want /var/run/rpcbind.sock

5
tests/lib/librumphijack/t_vfs.sh
View File

@ -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. # Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved. # All rights reserved.
@ -35,7 +35,8 @@ domount()
mntdir=$1 mntdir=$1
[ $# -eq 0 ] && mntdir=/rump/mnt [ $# -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() dounmount()