From 3175333fbdc95f423a2fd43fa49d0d03c20e2963 Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Sun, 8 Dec 2019 03:27:20 -0500
Subject: [PATCH] okay, i think i actually need *imports*

---
 schema/aif.xsd   | 11 ++++++-----
 schema/linux.xsd |  8 +++++---
 schema/net.xsd   |  4 +++-
 schema/std.xsd   |  1 +
 schema/sys.xsd   |  1 +
 schema/unix.xsd  |  6 ++++--
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/schema/aif.xsd b/schema/aif.xsd
index b6cf78e..cb89b39 100644
--- a/schema/aif.xsd
+++ b/schema/aif.xsd
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/aif.xsd"
+           xmlns="http://schema.xml.r00t2.io/aif.xsd"
            xmlns:aif="http://schema.xml.r00t2.io/aif.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="qualified">
 
-    <xs:include schemaLocation="http://schema.xml.r00t2.io/linux.xsd"/>
-    <xs:include schemaLocation="http://schema.xml.r00t2.io/net.xsd"/>
-    <xs:include schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
-    <xs:include schemaLocation="http://schema.xml.r00t2.io/sys.xsd"/>
-    <xs:include schemaLocation="http://schema.xml.r00t2.io/unix.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/linux.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/net.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/sys.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/unix.xsd"/>
 
     <xs:simpleType name="t_auto_ip6">
         <xs:union memberTypes="net:t_auto_ip6">
diff --git a/schema/linux.xsd b/schema/linux.xsd
index 1f868ae..4ab08da 100644
--- a/schema/linux.xsd
+++ b/schema/linux.xsd
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/linux.xsd"
+           xmlns="http://schema.xml.r00t2.io/linux.xsd"
            xmlns:linux="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:sys="http://schema.xml.r00t2.io/sys.xsd"
-           xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="qualified">
 
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/sys.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/unix.xsd"/>
+
     <xs:simpleType name="t_console_pageformats">
         <xs:restriction base="xs:positiveInteger">
             <xs:enumeration value="8"/>
diff --git a/schema/net.xsd b/schema/net.xsd
index 9e45072..4a0df44 100644
--- a/schema/net.xsd
+++ b/schema/net.xsd
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/net.xsd"
+           xmlns="http://schema.xml.r00t2.io/net.xsd"
            xmlns:net="http://schema.xml.r00t2.io/net.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="qualified">
 
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
+
     <xs:simpleType name="t_addr_ip4">
         <xs:restriction base="xs:string">
             <!-- This is a REALLY LAZY regex. Matching IPv4 in regex is ugly as heck, so we do that in-code.
diff --git a/schema/std.xsd b/schema/std.xsd
index 60fa0e8..3cb6a3c 100644
--- a/schema/std.xsd
+++ b/schema/std.xsd
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/std.xsd"
+           xmlns="http://schema.xml.r00t2.io/std.xsd"
            xmlns:std="http://schema.xml.r00t2.io/std.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
diff --git a/schema/sys.xsd b/schema/sys.xsd
index b8581ce..c48217c 100644
--- a/schema/sys.xsd
+++ b/schema/sys.xsd
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/sys.xsd"
+           xmlns="http://schema.xml.r00t2.io/sys.xsd"
            xmlns:sys="http://schema.xml.r00t2.io/sys.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
diff --git a/schema/unix.xsd b/schema/unix.xsd
index 6ee98c5..48d475d 100644
--- a/schema/unix.xsd
+++ b/schema/unix.xsd
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema targetNamespace="http://schema.xml.r00t2.io/unix.xsd"
+           xmlns="http://schema.xml.r00t2.io/unix.xsd"
            xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="qualified">
 
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/linux.xsd"/>
+
     <xs:simpleType name="t_filepath">
         <xs:restriction base="xs:string">
             <xs:pattern value="(/[^/]+)+/?"/>
@@ -37,8 +40,7 @@
 
     <xs:complexType name="t_user">
         <xs:sequence>
-            <xs:element name="password" minOccurs="0" maxOccurs="1"
-                        type="aif:t_nixpass"/>
+            <xs:element name="password" minOccurs="0" maxOccurs="1" type="linux:t_nixpass"/>
             <xs:element name="xGroup" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:attribute name="name" type="unix:t_posixUserGroup"