From 9ba584579d818bdcb9948c441b0490d296ab789c Mon Sep 17 00:00:00 2001
From: icex2 <djh.icex2@gmail.com>
Date: Mon, 19 Feb 2024 21:52:41 +0100
Subject: [PATCH] fix(dist/iidx): Use modern mounttable in avs config override

Default configuration files use this already instead of the
old style specific nvram and raw nodes. Required to make
overriding these work.
---
 dist/iidx/launcher-27.xml | 17 ++++++-----------
 dist/iidx/launcher-28.xml | 17 ++++++-----------
 dist/iidx/launcher-29.xml | 17 ++++++-----------
 dist/iidx/launcher-30.xml | 17 ++++++-----------
 4 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/dist/iidx/launcher-27.xml b/dist/iidx/launcher-27.xml
index f903fa6..736ee63 100644
--- a/dist/iidx/launcher-27.xml
+++ b/dist/iidx/launcher-27.xml
@@ -41,16 +41,11 @@
                 <root>
                     <device __type="str">.</device>
                 </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
+                <mounttable_selector __type="str">boot</mounttable_selector>
+                <mounttable>
+                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
+                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
+                </mounttable>
             </fs>
         </config>
     </config>
@@ -60,9 +55,9 @@
   </eamuse>
   <hook>
     <hook_dlls>
-        <dll __type="str">iidxhook9.dll</dll>
     </hook_dlls>
     <before_hook_dlls>
+      <dll __type="str">iidxhook9.dll</dll>
     </before_hook_dlls>
     <iat_hook_dlls>
     </iat_hook_dlls>
diff --git a/dist/iidx/launcher-28.xml b/dist/iidx/launcher-28.xml
index f903fa6..736ee63 100644
--- a/dist/iidx/launcher-28.xml
+++ b/dist/iidx/launcher-28.xml
@@ -41,16 +41,11 @@
                 <root>
                     <device __type="str">.</device>
                 </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
+                <mounttable_selector __type="str">boot</mounttable_selector>
+                <mounttable>
+                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
+                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
+                </mounttable>
             </fs>
         </config>
     </config>
@@ -60,9 +55,9 @@
   </eamuse>
   <hook>
     <hook_dlls>
-        <dll __type="str">iidxhook9.dll</dll>
     </hook_dlls>
     <before_hook_dlls>
+      <dll __type="str">iidxhook9.dll</dll>
     </before_hook_dlls>
     <iat_hook_dlls>
     </iat_hook_dlls>
diff --git a/dist/iidx/launcher-29.xml b/dist/iidx/launcher-29.xml
index f903fa6..736ee63 100644
--- a/dist/iidx/launcher-29.xml
+++ b/dist/iidx/launcher-29.xml
@@ -41,16 +41,11 @@
                 <root>
                     <device __type="str">.</device>
                 </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
+                <mounttable_selector __type="str">boot</mounttable_selector>
+                <mounttable>
+                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
+                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
+                </mounttable>
             </fs>
         </config>
     </config>
@@ -60,9 +55,9 @@
   </eamuse>
   <hook>
     <hook_dlls>
-        <dll __type="str">iidxhook9.dll</dll>
     </hook_dlls>
     <before_hook_dlls>
+      <dll __type="str">iidxhook9.dll</dll>
     </before_hook_dlls>
     <iat_hook_dlls>
     </iat_hook_dlls>
diff --git a/dist/iidx/launcher-30.xml b/dist/iidx/launcher-30.xml
index f903fa6..736ee63 100644
--- a/dist/iidx/launcher-30.xml
+++ b/dist/iidx/launcher-30.xml
@@ -41,16 +41,11 @@
                 <root>
                     <device __type="str">.</device>
                 </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
+                <mounttable_selector __type="str">boot</mounttable_selector>
+                <mounttable>
+                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
+                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
+                </mounttable>
             </fs>
         </config>
     </config>
@@ -60,9 +55,9 @@
   </eamuse>
   <hook>
     <hook_dlls>
-        <dll __type="str">iidxhook9.dll</dll>
     </hook_dlls>
     <before_hook_dlls>
+      <dll __type="str">iidxhook9.dll</dll>
     </before_hook_dlls>
     <iat_hook_dlls>
     </iat_hook_dlls>