[PATCH 2/3] install-script: Add needs-internet-connection prop

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 data/schemas/libosinfo.rng     |  5 +++++
 osinfo/libosinfo.syms          | 10 ++++------
 osinfo/osinfo_install_script.c |  8 ++++++++
 osinfo/osinfo_install_script.h |  3 +++
 osinfo/osinfo_loader.c         |  1 +
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 4f4edac..07defbd 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -597,6 +597,11 @@
           </element>
         </optional>
         <optional>
+          <element name='needs-internet-connection'>
+            <ref name='bool'/>
+          </element>
+        </optional>
+        <optional>
           <element name='can-pre-install-drivers'>
             <ref name='bool'/>
           </element>
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index abcc8bb..b387a21 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -500,11 +500,9 @@ LIBOSINFO_0.2.10 {
 	osinfo_install_script_injection_method_get_type;
 } LIBOSINFO_0.2.9;
 
-/* Symbols in next release...
-
-  LIBOSINFO_0.0.2 {
+/* Symbols in next release... */
+  LIBOSINFO_0.2.11 {
     global:
+	osinfo_install_script_get_needs_internet_connection;
+  } LIBOSINFO_0.2.10;
 
-  } LIBOSINFO_0.0.1;
-
-*/
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index b6fe1ab..7bfb006 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1326,6 +1326,14 @@ unsigned int osinfo_install_script_get_injection_methods(OsinfoInstallScript *sc
          0);
 }
 
+gboolean osinfo_install_script_get_needs_internet_connection(OsinfoInstallScript *script)
+{
+    return osinfo_entity_get_param_value_boolean_with_default
+        (OSINFO_ENTITY(script),
+         OSINFO_INSTALL_SCRIPT_PROP_NEEDS_INTERNET_CONNECTION,
+         FALSE);
+}
+
 
 /*
  * Local variables:
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index d328a96..878a2d7 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -55,6 +55,7 @@ typedef struct _OsinfoInstallScriptPrivate OsinfoInstallScriptPrivate;
 #define OSINFO_INSTALL_SCRIPT_PROP_PATH_FORMAT        "path-format"
 #define OSINFO_INSTALL_SCRIPT_PROP_CAN_PRE_INSTALL_DRIVERS "can-pre-install-drivers"
 #define OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS "can-post-install-drivers"
+#define OSINFO_INSTALL_SCRIPT_PROP_NEEDS_INTERNET_CONNECTION "needs-internet-connection"
 #define OSINFO_INSTALL_SCRIPT_PROP_PRE_INSTALL_DRIVERS_SIGNING_REQ "pre-install-drivers-signing-req"
 #define OSINFO_INSTALL_SCRIPT_PROP_POST_INSTALL_DRIVERS_SIGNING_REQ "post-install-drivers-signing-req"
 #define OSINFO_INSTALL_SCRIPT_PROP_INJECTION_METHOD "injection-method"
@@ -220,6 +221,8 @@ int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri
 
 unsigned int osinfo_install_script_get_injection_methods(OsinfoInstallScript *script);
 
+gboolean osinfo_install_script_get_needs_internet_connection(OsinfoInstallScript *script);
+
 #endif /* __OSINFO_INSTALL_SCRIPT_H__ */
 /*
  * Local variables:
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index aa5e48f..dd6e76d 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -769,6 +769,7 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
         { OSINFO_INSTALL_SCRIPT_PROP_PRODUCT_KEY_FORMAT, G_TYPE_STRING },
         { OSINFO_INSTALL_SCRIPT_PROP_PATH_FORMAT, G_TYPE_STRING },
         { OSINFO_INSTALL_SCRIPT_PROP_EXPECTED_FILENAME, G_TYPE_STRING },
+        { OSINFO_INSTALL_SCRIPT_PROP_NEEDS_INTERNET_CONNECTION, G_TYPE_BOOLEAN },
         { OSINFO_INSTALL_SCRIPT_PROP_CAN_PRE_INSTALL_DRIVERS, G_TYPE_BOOLEAN },
         { OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS, G_TYPE_BOOLEAN },
         { OSINFO_INSTALL_SCRIPT_PROP_PRE_INSTALL_DRIVERS_SIGNING_REQ, G_TYPE_STRING },
-- 
2.0.0

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux