From 50b30395c0f76ca42c09a58235324b2d79c61c50 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 12 Jul 2019 11:34:01 +0200
Subject: [PATCH] Replace rump_fs with vfs_rump in VirtualBox scripts

Ref #3447
---
 repos/ports/run/virtualbox_auto.inc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index ea9b18d79..ddf4c2507 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -36,7 +36,8 @@ append build_components {
 	drivers/framebuffer
 }
 
-lappend_if [expr $use_rumpfs] build_components server/rump_fs
+lappend_if [expr $use_rumpfs] build_components lib/vfs/rump
+lappend_if [expr $use_rumpfs] build_components server/vfs
 lappend_if [expr $use_vbox5]  build_components virtualbox5
 lappend_if [expr $use_ps2]    build_components drivers/input
 lappend_if [expr $use_usb]    build_components drivers/usb
@@ -130,9 +131,11 @@ append_if [have_spec nova] config {
 
 append_if [expr $use_rumpfs] config {
 	<start name="rump_fs" priority="-1" caps="200">
+		<binary name="vfs"/>
 		<resource name="RAM" quantum="32M"/>
 		<provides><service name="File_system"/></provides>
-		<config ld_verbose="yes" fs="ext2fs">}
+		<config ld_verbose="yes">
+			<vfs> <rump fs="ext2fs" ram="24M" writeable="yes"/> </vfs>}
 
 append_if [expr $use_rumpfs && $use_ram_fs && $use_overlay_from_disk] config {
 			<policy label_prefix="overlay_from_disk" root="/ram" writeable="no"/>}
@@ -363,7 +366,8 @@ append boot_modules {
 
 lappend_if [expr $use_rumpfs] boot_modules rump.lib.so
 lappend_if [expr $use_rumpfs] boot_modules rump_fs.lib.so
-lappend_if [expr $use_rumpfs] boot_modules rump_fs
+lappend_if [expr $use_rumpfs] boot_modules vfs
+lappend_if [expr $use_rumpfs] boot_modules vfs_rump.lib.so
 lappend_if [expr $use_vbox5] boot_modules $virtualbox5_binary
 lappend_if [expr $use_ram_fs || $use_usb] boot_modules ram_fs
 lappend_if [expr $use_ram_fs && !$use_overlay_from_disk] boot_modules $overlay_image