diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-10-22 16:45:24 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-10-22 16:45:24 +0000 |
| commit | 29d9fdbadf1f96f31d7129b05b7a0217680a7268 (patch) | |
| tree | dd7236c603dc651b863fc60abf2c6ddb3f469fe4 | |
| parent | unveil support is a bit amusing. /etc/sensorsd.conf with "r", and (diff) | |
| download | wireguard-openbsd-29d9fdbadf1f96f31d7129b05b7a0217680a7268.tar.xz wireguard-openbsd-29d9fdbadf1f96f31d7129b05b7a0217680a7268.zip | |
The recent switch to realpath(3) for the boot string in vmd(8) broke
vmd-fail-boot-name-too-long regress. Use a relative existing path
for this test. Print the error message in vmd config parser.
OK ccardenas@ reyk@
| -rw-r--r-- | regress/usr.sbin/vmd/config/Makefile | 9 | ||||
| -rw-r--r-- | regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/parse.y | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/regress/usr.sbin/vmd/config/Makefile b/regress/usr.sbin/vmd/config/Makefile index c829731e3be..52508059c53 100644 --- a/regress/usr.sbin/vmd/config/Makefile +++ b/regress/usr.sbin/vmd/config/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2018/09/09 04:11:55 ccardenas Exp $ +# $OpenBSD: Makefile,v 1.7 2018/10/22 16:45:24 bluhm Exp $ VMD ?= /usr/sbin/vmd @@ -30,11 +30,14 @@ vmd-fail-${n}: diff -u ${.CURDIR}/vmd-fail-${n}.ok /dev/stdin .endfor -DISK_PATH_LONG = some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/bsd.img +PATH_LONG = some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789 +BOOT_PATH_LONG = ${PATH_LONG}/bsd.rd +DISK_PATH_LONG = ${PATH_LONG}/bsd.img +vmd-fail-boot-path-too-long: ${BOOT_PATH_LONG} vmd-fail-disk-path-too-long: ${DISK_PATH_LONG} -${DISK_PATH_LONG}: +${BOOT_PATH_LONG} ${DISK_PATH_LONG}: mkdir -p ${@:H} touch $@ diff --git a/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf b/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf index fffbb360882..209be7cf36f 100644 --- a/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf +++ b/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf @@ -1,6 +1,6 @@ -# $OpenBSD: vmd-fail-boot-name-too-long.conf,v 1.1.1.1 2017/10/11 12:01:20 bluhm Exp $ +# $OpenBSD: vmd-fail-boot-name-too-long.conf,v 1.2 2018/10/22 16:45:24 bluhm Exp $ # Fail on boot path (> 128) -ramdisk="/some/absolutepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/bsd.rd" +ramdisk="some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/bsd.rd" vm "x" { boot $ramdisk } diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y index 5afa28b8f08..ef2ed38e400 100644 --- a/usr.sbin/vmd/parse.y +++ b/usr.sbin/vmd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.46 2018/10/18 08:36:11 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.47 2018/10/22 16:45:24 bluhm Exp $ */ /* * Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org> @@ -425,7 +425,8 @@ vm_opts : disable { } if (realpath($2, path) == NULL) { - yyerror("kernel path not found"); + yyerror("kernel path not found: %s", + strerror(errno)); free($2); YYERROR; } |