From: Jeff Layton <jlayton@kernel.org>
To: Luis Chamberlain <mcgrof@kernel.org>
Cc: kdevops@lists.linux.dev, Jeff Layton <jlayton@kernel.org>
Subject: [PATCH kdevops v2 2/4] nfsd: key off of LIBVIRT instead of VAGRANT for storage config
Date: Fri, 08 Dec 2023 10:01:33 -0500 [thread overview]
Message-ID: <20231208-guestfs-v2-2-082c11a3a0af@kernel.org> (raw)
In-Reply-To: <20231208-guestfs-v2-0-082c11a3a0af@kernel.org>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
kconfigs/Kconfig.nfsd | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kconfigs/Kconfig.nfsd b/kconfigs/Kconfig.nfsd
index ceed06ad42a0..0dd28e90ee45 100644
--- a/kconfigs/Kconfig.nfsd
+++ b/kconfigs/Kconfig.nfsd
@@ -1,9 +1,9 @@
# FIXME: need defaults for terraform hosts
config NFSD_EXPORT_DEVICE_0
string "First device to be exported"
- default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops2" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
- default "/dev/disk/by-id/virtio-kdevops2" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
- default "/dev/disk/by-id/ide-kdevops2" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+ default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ default "/dev/disk/by-id/virtio-kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ default "/dev/disk/by-id/ide-kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
default ""
help
To set up nfsd for testing, we give it filesystems to export. This
@@ -11,9 +11,9 @@ config NFSD_EXPORT_DEVICE_0
config NFSD_EXPORT_DEVICE_1
string "Second device to be exported"
- default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops3" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
- default "/dev/disk/by-id/virtio-kdevops3" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
- default "/dev/disk/by-id/ide-kdevops3" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+ default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ default "/dev/disk/by-id/virtio-kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ default "/dev/disk/by-id/ide-kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
help
To set up nfsd for testing, we give it filesystems to export. This
block device is used as a PV for LVM, and volumes are provisioned from it.
--
2.43.0
next prev parent reply other threads:[~2023-12-08 15:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Jeff Layton
2023-12-09 2:05 ` Luis Chamberlain
2023-12-09 2:06 ` Luis Chamberlain
2023-12-09 2:08 ` Luis Chamberlain
2023-12-09 12:07 ` Jeff Layton
2023-12-08 15:01 ` Jeff Layton [this message]
2023-12-08 15:01 ` [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings Jeff Layton
2023-12-08 15:23 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant Jeff Layton
2023-12-09 2:14 ` Luis Chamberlain
2023-12-09 12:25 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231208-guestfs-v2-2-082c11a3a0af@kernel.org \
--to=jlayton@kernel.org \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox