From fidencio at redhat.com  Mon Feb  3 17:29:45 2014
From: fidencio at redhat.com (Fabiano Fidencio)
Date: Mon, 03 Feb 2014 18:29:45 +0100
Subject: [Libosinfo] [PATCH] Add hypervisor data for newer QEMUs
In-Reply-To: <1390817538-8937-1-git-send-email-cfergeau@redhat.com>
References: <1390817538-8937-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1391448585.9374.0.camel@srv>

On Mon, 2014-01-27 at 11:12 +0100, Christophe Fergeau wrote:
> ---
>  data/hypervisors/qemu.xml.in | 72 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 72 insertions(+)
> 
> diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in
> index edfe061..03590a3 100644
> --- a/data/hypervisors/qemu.xml.in
> +++ b/data/hypervisors/qemu.xml.in
> @@ -181,4 +181,76 @@
>      <upgrades id="http://qemu.org/1.4.1"/>
>    </platform>
>  
> +  <platform id="http://qemu.org/1.5.1">
> +    <short-id>qemu-1.5.1</short-id>
> +    <_name>QEMU 1.5.1</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.5.1</version>
> +    <release-date>2013-06-26</release-date>
> +    <upgrades id="http://qemu.org/1.5.0"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.5.2">
> +    <short-id>qemu-1.5.2</short-id>
> +    <_name>QEMU 1.5.2</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.5.2</version>
> +    <release-date>2013-07-25</release-date>
> +    <upgrades id="http://qemu.org/1.5.1"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.5.3">
> +    <short-id>qemu-1.5.3</short-id>
> +    <_name>QEMU 1.5.3</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.5.3</version>
> +    <release-date>2013-08-27</release-date>
> +    <upgrades id="http://qemu.org/1.5.2"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.6.0">
> +    <short-id>qemu-1.6.0</short-id>
> +    <_name>QEMU 1.6.0</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.6.0</version>
> +    <release-date>2013-08-15</release-date>
> +    <upgrades id="http://qemu.org/1.5.2"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.6.0">
> +    <short-id>qemu-1.6.0</short-id>
> +    <_name>QEMU 1.6.0</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.6.0</version>
> +    <release-date>2013-08-15</release-date>
> +    <upgrades id="http://qemu.org/1.5.2"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.6.1">
> +    <short-id>qemu-1.6.1</short-id>
> +    <_name>QEMU 1.6.1</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.6.1</version>
> +    <release-date>2013-10-09</release-date>
> +    <upgrades id="http://qemu.org/1.6.0"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.6.2">
> +    <short-id>qemu-1.6.2</short-id>
> +    <_name>QEMU 1.6.2</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.6.2</version>
> +    <release-date>2013-12-16</release-date>
> +    <upgrades id="http://qemu.org/1.6.1"/>
> +  </platform>
> +
> +  <platform id="http://qemu.org/1.7.0">
> +    <short-id>qemu-1.7.0</short-id>
> +    <_name>QEMU 1.7.0</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.7.0</version>
> +    <release-date>2013-11-28</release-date>
> +    <upgrades id="http://qemu.org/1.6.1"/>
> +  </platform>
> +
>  </libosinfo>

ACK!

Best Regads,
--
Fabiano Fid?ncio



From fidencio at redhat.com  Fri Feb 21 15:38:26 2014
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 21 Feb 2014 16:38:26 +0100
Subject: [Libosinfo] [PATCH] win8.1: Disable unattended installation
Message-ID: <1392997106-30930-1-git-send-email-fidencio@redhat.com>

When win8.1 entry was added it was a c&p from a previous version and
the installer part is a leftover, since win8.1 unattended installation
has never been tested.
So, disable it for now and re-enable when we assure it works.
---
 data/oses/windows.xml.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 723d1dc..b7d5c21 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1013,11 +1013,6 @@
     <devices>
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
     </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
   </os>
 
 </libosinfo>
-- 
1.8.5.3



From zeeshanak at gnome.org  Fri Feb 21 15:50:10 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 21 Feb 2014 15:50:10 +0000
Subject: [Libosinfo] [PATCH] win8.1: Disable unattended installation
In-Reply-To: <1392997106-30930-1-git-send-email-fidencio@redhat.com>
References: <1392997106-30930-1-git-send-email-fidencio@redhat.com>
Message-ID: <CAAa3hFPO7LTZ-skZ+M+2DBGrhM4e5RHxw+5fGitAvKUn4mTw5g@mail.gmail.com>

On Fri, Feb 21, 2014 at 3:38 PM, Fabiano Fid?ncio <fidencio at redhat.com> wrote:
> When win8.1 entry was added it was a c&p from a previous version and
> the installer part is a leftover, since win8.1 unattended installation
> has never been tested.
> So, disable it for now and re-enable when we assure it works.
> ---

ACK. though the log could be improved:


"When win8.1 entry was added it was mostly a c&p from a previous
version and the installer part was mistakenly also copied. Since
win8.1 unattended installation has never been tested and some people
have reported it not to work, lets disable it for now and re-enable
when we assure it works."

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Wed Feb 26 14:21:52 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 26 Feb 2014 15:21:52 +0100
Subject: [Libosinfo] [PATCH v2 0/3] add Debian and Ubuntu installer scripts
Message-ID: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>

v2 adds an API "osinfo_install_script_get_supported_injection_media"
to get the list of supported media where it is possible to store the
installation script.

Fabiano Fid?ncio (1):
  ubuntu: Add jeos install-script (version >= 6.06)

Giuseppe Scrivano (2):
  install-scripts: Add get-supported-injection-media API
  debian: add installer script

 data/install-scripts/Makefile.am |   2 +
 data/install-scripts/debian.xml  |  63 ++++++++++++++++++
 data/install-scripts/ubuntu.xml  | 137 +++++++++++++++++++++++++++++++++++++++
 data/oses/debian.xml.in          |  12 ++++
 data/oses/ubuntu.xml.in          |  59 +++++++++++++++++
 data/schemas/libosinfo.rng       |  11 ++++
 osinfo/libosinfo.syms            |   4 ++
 osinfo/osinfo_install_script.c   |  16 ++++-
 osinfo/osinfo_install_script.h   |   5 +-
 osinfo/osinfo_loader.c           |  16 ++++-
 10 files changed, 321 insertions(+), 4 deletions(-)
 create mode 100644 data/install-scripts/debian.xml
 create mode 100644 data/install-scripts/ubuntu.xml

-- 
1.8.5.3



From gscrivan at redhat.com  Wed Feb 26 14:21:53 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 26 Feb 2014 15:21:53 +0100
Subject: [Libosinfo] [PATCH v2 1/3] install-scripts: Add
	get-supported-injection-media API
In-Reply-To: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393424515-17242-2-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/schemas/libosinfo.rng     | 11 +++++++++++
 osinfo/libosinfo.syms          |  4 ++++
 osinfo/osinfo_install_script.c | 16 +++++++++++++++-
 osinfo/osinfo_install_script.h |  5 ++++-
 osinfo/osinfo_loader.c         | 16 ++++++++++++++--
 5 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 0675217..a4fe2b7 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -616,6 +616,9 @@
             <ref name='driver-signing-reqs'/>
           </element>
         </optional>
+        <zeroOrMore>
+          <ref name='supported-injection-media'/>
+        </zeroOrMore>
         <element name='template'>
           <choice>
             <group>
@@ -770,4 +773,12 @@
       </data>
     </element>
   </define>
+
+  <define name='supported-injection-media'>
+    <element name='supported-injection-media'>
+      <data type="string">
+        <param name="pattern">initrd|web|cdrom</param>
+      </data>
+    </element>
+  </define>
 </grammar>
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index c3b967c..79a9683 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -495,6 +495,10 @@ LIBOSINFO_0.2.9 {
 	osinfo_release_status_get_type;
 } LIBOSINFO_0.2.8;
 
+LIBOSINFO_0.2.10 {
+	osinfo_install_script_get_supported_injection_media;
+} LIBOSINFO_0.2.9;
+
 /* Symbols in next release...
 
   LIBOSINFO_0.0.2 {
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 7444c8d..394de43 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1,7 +1,7 @@
 /*
  * libosinfo:
  *
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1309,6 +1309,20 @@ int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri
          OSINFO_DEVICE_DRIVER_SIGNING_REQ_NONE);
 }
 
+/**
+ * osinfo_install_script_get_supported_injection_media:
+ * @script: the install script
+ *
+ * Returns: (transfer container)(element-type utf8): a list of supported media
+ * for install script injection.
+ */
+GList *osinfo_install_script_get_supported_injection_media(OsinfoInstallScript *script)
+{
+    return osinfo_entity_get_param_value_list
+        (OSINFO_ENTITY(script),
+         OSINFO_INSTALL_SCRIPT_PROP_SUPPORTED_INJECTION_MEDIA);
+}
+
 
 /*
  * Local variables:
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index c39b786..e9c0dfb 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -1,7 +1,7 @@
 /*
  * libosinfo: OS installation script
  *
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -57,6 +57,7 @@ typedef struct _OsinfoInstallScriptPrivate OsinfoInstallScriptPrivate;
 #define OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS "can-post-install-drivers"
 #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_SUPPORTED_INJECTION_MEDIA "supported-injection-media"
 
 /* object */
 struct _OsinfoInstallScript
@@ -195,6 +196,8 @@ gboolean osinfo_install_script_get_can_post_install_drivers(OsinfoInstallScript
 int osinfo_install_script_get_pre_install_drivers_signing_req(OsinfoInstallScript *script);
 int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScript *script);
 
+GList *osinfo_install_script_get_supported_injection_media(OsinfoInstallScript *script);
+
 #endif /* __OSINFO_INSTALL_SCRIPT_H__ */
 /*
  * Local variables:
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index e9ce8e1..cc0c6b4 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -1,7 +1,7 @@
 /*
  * libosinfo:
  *
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -777,7 +777,7 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
     };
     gchar *value = NULL;
     xmlNodePtr *nodes = NULL;
-    int nnodes;
+    int i, nnodes;
 
     if (!id) {
         OSINFO_ERROR(err, _("Missing install script id property"));
@@ -835,6 +835,18 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
     }
     g_free(nodes);
 
+    nnodes = osinfo_loader_nodeset("./supported-injection-media", ctxt, &nodes, err);
+    if (error_is_set(err))
+        goto error;
+
+    for (i = 0 ; i < nnodes ; i++) {
+        osinfo_entity_add_param(OSINFO_ENTITY(installScript),
+                                OSINFO_INSTALL_SCRIPT_PROP_SUPPORTED_INJECTION_MEDIA,
+                                (const gchar *)nodes[i]->children->content);
+    }
+    g_free(nodes);
+
+
     osinfo_db_add_install_script(loader->priv->db, installScript);
 
     return;
-- 
1.8.5.3



From gscrivan at redhat.com  Wed Feb 26 14:21:54 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 26 Feb 2014 15:21:54 +0100
Subject: [Libosinfo] [PATCH v2 2/3] debian: add installer script
In-Reply-To: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393424515-17242-3-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/Makefile.am |  1 +
 data/install-scripts/debian.xml  | 63 ++++++++++++++++++++++++++++++++++++++++
 data/oses/debian.xml.in          | 12 ++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 data/install-scripts/debian.xml

diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index c310468..442c286 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -1,6 +1,7 @@
 
 databasedir = $(pkgdatadir)/db/install-scripts/
 database_DATA =     \
+  debian.xml        \
   fedora.xml        \
   rhel.xml          \
   windows-sif.xml   \
diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml
new file mode 100644
index 0000000..df9286f
--- /dev/null
+++ b/data/install-scripts/debian.xml
@@ -0,0 +1,63 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://debian.org/scripts/debian/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>debian.ks</expected-filename>
+    <can-pre-install-drivers>true</can-pre-install-drivers>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="l10n-language" policy="optional"/>
+    </config>
+    <supported-injection-media>initrd</supported-injection-media>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+	<xsl:template match="/install-script-config">
+d-i debian-installer/locale select <xsl:value-of select="config/l10n-language"/>
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/>
+
+d-i netcfg/choose_interface select auto
+d-i netcfg/get_hostname string localhost
+d-i netcfg/get_domain string localdomain
+d-i netcfg/disable_dhcp     boolean false
+d-i mirror/http/proxy	string
+d-i netcfg/wireless_wep string
+
+d-i clock-setup/utc boolean true
+d-i time/zone select <xsl:value-of select="config/l10n-timezone"/>
+
+d-i partman-auto/method string regular
+d-i partman-auto/choose_recipe select home
+d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i passwd/root-login boolean true
+d-i passwd/make-user boolean false
+d-i passwd/root-password password <xsl:value-of select="config/admin-password"/>
+d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/>
+
+tasksel tasksel/first multiselect standard
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+
+d-i apt-setup/security_host string
+d-i apt-setup/services-select multiselect
+d-i apt-setup/volatile_host string
+d-i apt-setup/security_host string
+
+d-i finish-install/reboot_in_progress note
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+
+</libosinfo>
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 51a4034..a5a1136 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -136,6 +136,10 @@
         <storage>5368709120</storage>
       </recommended>
     </resources>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
   </os>
 
   <os id="http://debian.org/debian/6">
@@ -202,6 +206,10 @@
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
     </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
   </os>
 
   <os id="http://debian.org/debian/7">
@@ -249,6 +257,10 @@
       <kernel>install.amd/vmlinuz</kernel>
       <initrd>install.amd/initrd.gz</initrd>
     </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
   </os>
 
 </libosinfo>
-- 
1.8.5.3



From gscrivan at redhat.com  Wed Feb 26 14:21:55 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 26 Feb 2014 15:21:55 +0100
Subject: [Libosinfo] [PATCH v2 3/3] ubuntu: Add jeos install-script (version
	>= 6.06)
In-Reply-To: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393424515-17242-4-git-send-email-gscrivan@redhat.com>

From: Fabiano Fid?ncio <fabiano at fidencio.org>

script base on: https://github.com/clalancette/oz/tree/master/oz/auto

gscrivan: add ubuntu 13.04
---
 data/install-scripts/Makefile.am |   1 +
 data/install-scripts/ubuntu.xml  | 137 +++++++++++++++++++++++++++++++++++++++
 data/oses/ubuntu.xml.in          |  59 +++++++++++++++++
 3 files changed, 197 insertions(+)
 create mode 100644 data/install-scripts/ubuntu.xml

diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 442c286..78decc2 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -4,6 +4,7 @@ database_DATA =     \
   debian.xml        \
   fedora.xml        \
   rhel.xml          \
+  ubuntu.xml        \
   windows-sif.xml   \
   windows-cmd.xml   \
   windows-reg.xml   \
diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu.xml
new file mode 100644
index 0000000..d58deb8
--- /dev/null
+++ b/data/install-scripts/ubuntu.xml
@@ -0,0 +1,137 @@
+<libosinfo version="0.0.1">
+  <!-- JEOS PROFILE -->
+  <install-script id='http://fedoraproject.org/scripts/ubuntu/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>preseed.cfg</expected-filename>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="l10n-language" policy="optional"/>
+      <param name="target-disk" policy="optional"/>
+      <param name="hostname" policy="optional"/>
+    </config>
+    <supported-injection-media>initrd</supported-injection-media>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template name="target-disk">
+          <xsl:choose>
+            <xsl:when test="config/target-disk != ''">
+              <xsl:value-of select="config/target-disk"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- IDE -->
+              <xsl:text>/dev/hda</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template match="/install-script-config">
+# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
+d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/>
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/>
+
+d-i netcfg/choose_interface select auto
+d-i netcfg/get_hostname string <xsl:value-of select="config/hostname"/>
+d-i netcfg/get_domain string unassigned-domain
+d-i netcfg/wireless_wep string
+
+d-i clock-setup/utc boolean true
+d-i time/zone string <xsl:value-of select="config/l10n-timezone"/>
+
+<xsl:if test="os/version &lt; 7.04">
+d-i partman-auto/disk string <xsl:call-template name="target-disk"/>
+</xsl:if>
+<xsl:if test="os/version = 7.04">
+d-i partman-auto/init_automatically_partition select Use the largest continuous free space
+</xsl:if>
+d-i partman-auto/method string regular
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7.10">
+d-i partman-auto/choose_recipe select Separate /home partition
+  </xsl:when>
+  <xsl:otherwise>
+d-i partman-auto/choose_recipe select home
+  </xsl:otherwise>
+</xsl:choose>
+d-i partman/confirm_write_new_label boolean true
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7.10">
+d-i partman/choose_partition select Finish partitioning and write changes to disk
+  </xsl:when>
+  <xsl:otherwise>
+d-i partman/choose_partition select finish
+  </xsl:otherwise>
+</xsl:choose>
+d-i partman/confirm boolean true
+<xsl:if test="os/version &gt; 9.10">
+d-i partman/confirm_nooverwrite boolean true
+</xsl:if>
+
+d-i passwd/root-login boolean true
+d-i passwd/make-user boolean false
+d-i passwd/root-password password <xsl:value-of select="config/admin-password"/>
+d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/>
+
+<xsl:if test="os/version &lt; 6.10">
+d-i pkgsel/install-language-support boolean false
+</xsl:if>
+
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7.10">
+tasksel tasksel/first multiselect ubuntu-standard, ubuntu-desktop
+  </xsl:when>
+  <xsl:otherwise>
+tasksel tasksel/first multiselect standard
+  </xsl:otherwise>
+</xsl:choose>
+<xsl:choose>
+  <xsl:when test="os/version &lt; 8.04">
+d-i mirror/http/proxy string
+  </xsl:when>
+  <xsl:when test="os/version = 10.04">
+d-i pkgsel/include/install-recommends boolean true
+d-i pkgsel/include string ltsp-server-standalone openssh-server python-software-properties
+d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys
+  </xsl:when>
+  <xsl:when test="os/version = 11.04">
+d-i pkgsel/include/install-recommends boolean true
+d-i pkgsel/include string openssh-server
+  </xsl:when>
+  <xsl:when test="os/version &gt; 11.04">
+d-i pkgsel/include/install-recommends boolean true
+d-i pkgsel/include string openssh-server python-software-properties
+  </xsl:when>
+</xsl:choose>
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+
+d-i apt-setup/security_host string
+base-config apt-setup/security-updates boolean false
+
+<xsl:if test="os/version &gt; 7.04">
+ubiquity ubiquity/summary note
+ubiquity ubiquity/reboot boolean true
+</xsl:if>
+
+d-i finish-install/reboot_in_progress note
+<xsl:if test="os/version &lt; 6.10">
+d-i prebaseconfig/reboot_in_progress note
+</xsl:if>
+
+<xsl:if test="os/version = 13.04">
+ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper
+</xsl:if>
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+
+</libosinfo>
diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
index 4e4cbf5..0a21fa4 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -362,6 +362,9 @@
       <initrd>casper/initrd.img</initrd>
     </media>
 
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/6.10">
@@ -443,6 +446,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/7.04">
@@ -506,6 +513,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/7.10">
@@ -569,6 +580,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/8.04">
@@ -645,6 +660,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/8.10">
@@ -699,6 +718,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/9.04">
@@ -757,6 +780,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/9.10">
@@ -811,6 +838,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/10.04">
@@ -858,6 +889,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/10.10">
@@ -925,6 +960,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/11.04">
@@ -992,6 +1031,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/11.10">
@@ -1055,6 +1098,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.04">
@@ -1116,6 +1163,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.10">
@@ -1177,6 +1228,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.04">
@@ -1299,5 +1354,9 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 </libosinfo>
-- 
1.8.5.3



From zeeshanak at gnome.org  Wed Feb 26 14:52:35 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 26 Feb 2014 14:52:35 +0000
Subject: [Libosinfo] [PATCH v2 1/3] install-scripts: Add
 get-supported-injection-media API
In-Reply-To: <1393424515-17242-2-git-send-email-gscrivan@redhat.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
	<1393424515-17242-2-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMnFmUpuPb7H4UQ71EfWCrxZ9WmiSCxwYGmXrt-53VoZw@mail.gmail.com>

On Wed, Feb 26, 2014 at 2:21 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---
>  data/schemas/libosinfo.rng     | 11 +++++++++++
>  osinfo/libosinfo.syms          |  4 ++++
>  osinfo/osinfo_install_script.c | 16 +++++++++++++++-
>  osinfo/osinfo_install_script.h |  5 ++++-
>  osinfo/osinfo_loader.c         | 16 ++++++++++++++--
>  5 files changed, 48 insertions(+), 4 deletions(-)
>
> diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
> index 0675217..a4fe2b7 100644
> --- a/data/schemas/libosinfo.rng
> +++ b/data/schemas/libosinfo.rng
> @@ -616,6 +616,9 @@
>              <ref name='driver-signing-reqs'/>
>            </element>
>          </optional>
> +        <zeroOrMore>
> +          <ref name='supported-injection-media'/>

In case of initrd, its not exactly a media so I'd call it
'supported-injection-method' or something such. Maybe in future we can
also support 'network' method.

> +        </zeroOrMore>
>          <element name='template'>
>            <choice>
>              <group>
> @@ -770,4 +773,12 @@
>        </data>
>      </element>
>    </define>
> +
> +  <define name='supported-injection-media'>
> +    <element name='supported-injection-media'>
> +      <data type="string">
> +        <param name="pattern">initrd|web|cdrom</param>

There is also the case of floppy, which is the only option for windows atm.

That reminds me, you want to add this info to all existing install
scripts. preferably in this series.

> + * Returns: (transfer container)(element-type utf8): a list of supported media
> + * for install script injection.

* I'd provide a bit more description here.
* This should be an enum, not strings on API level.




-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Feb 26 15:49:18 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 26 Feb 2014 15:49:18 +0000
Subject: [Libosinfo] [PATCH v2 1/3] install-scripts: Add
 get-supported-injection-media API
In-Reply-To: <CAAa3hFMnFmUpuPb7H4UQ71EfWCrxZ9WmiSCxwYGmXrt-53VoZw@mail.gmail.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
	<1393424515-17242-2-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMnFmUpuPb7H4UQ71EfWCrxZ9WmiSCxwYGmXrt-53VoZw@mail.gmail.com>
Message-ID: <CAAa3hFNtRUmZdZDy22ie-_V9SKYkvY7h7ErMwkOs_U-8CpcFcw@mail.gmail.com>

On Wed, Feb 26, 2014 at 2:52 PM, Zeeshan Ali (Khattak)
<zeeshanak at gnome.org> wrote:
> On Wed, Feb 26, 2014 at 2:21 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>>  data/schemas/libosinfo.rng     | 11 +++++++++++
>>  osinfo/libosinfo.syms          |  4 ++++
>>  osinfo/osinfo_install_script.c | 16 +++++++++++++++-
>>  osinfo/osinfo_install_script.h |  5 ++++-
>>  osinfo/osinfo_loader.c         | 16 ++++++++++++++--
>>  5 files changed, 48 insertions(+), 4 deletions(-)
>>
>> diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
>> index 0675217..a4fe2b7 100644
>> --- a/data/schemas/libosinfo.rng
>> +++ b/data/schemas/libosinfo.rng
>> @@ -616,6 +616,9 @@
>>              <ref name='driver-signing-reqs'/>
>>            </element>
>>          </optional>
>> +        <zeroOrMore>
>> +          <ref name='supported-injection-media'/>
>
> In case of initrd, its not exactly a media so I'd call it
> 'supported-injection-method' or something such. Maybe in future we can
> also support 'network' method.
>
>> +        </zeroOrMore>
>>          <element name='template'>
>>            <choice>
>>              <group>
>> @@ -770,4 +773,12 @@
>>        </data>
>>      </element>
>>    </define>
>> +
>> +  <define name='supported-injection-media'>
>> +    <element name='supported-injection-media'>
>> +      <data type="string">
>> +        <param name="pattern">initrd|web|cdrom</param>
>
> There is also the case of floppy, which is the only option for windows atm.
>
> That reminds me, you want to add this info to all existing install
> scripts. preferably in this series.
>
>> + * Returns: (transfer container)(element-type utf8): a list of supported media
>> + * for install script injection.
>
> * I'd provide a bit more description here.
> * This should be an enum, not strings on API level.

Actually perhaps even better if its exposed as a flags enum, which
would simplify the API a bit: app gets a simple type that they dont
need to free.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From cfergeau at redhat.com  Thu Feb 27 08:59:23 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 27 Feb 2014 09:59:23 +0100
Subject: [Libosinfo] [PATCH v2 3/3] ubuntu: Add jeos install-script
 (version >= 6.06)
In-Reply-To: <1393424515-17242-4-git-send-email-gscrivan@redhat.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
	<1393424515-17242-4-git-send-email-gscrivan@redhat.com>
Message-ID: <20140227085922.GD23431@teriyaki.cdg.redhat.com>

On Wed, Feb 26, 2014 at 03:21:55PM +0100, Giuseppe Scrivano wrote:
> From: Fabiano Fid?ncio <fabiano at fidencio.org>
> 
> script base on: https://github.com/clalancette/oz/tree/master/oz/auto

'based'


> gscrivan: add ubuntu 13.04

I don't think this needs to be in the commit log ? (or turn this into a
full sentence like "Ubuntu 13.04 support added by Giuseppe Scrivano")

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20140227/f2536054/attachment.sig>

From gscrivan at redhat.com  Thu Feb 27 16:07:03 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 27 Feb 2014 17:07:03 +0100
Subject: [Libosinfo] [PATCH v2 1/3] install-scripts: Add
	get-supported-injection-media API
In-Reply-To: <CAAa3hFMnFmUpuPb7H4UQ71EfWCrxZ9WmiSCxwYGmXrt-53VoZw@mail.gmail.com>
	(Zeeshan Ali's message of "Wed, 26 Feb 2014 14:52:35 +0000")
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
	<1393424515-17242-2-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMnFmUpuPb7H4UQ71EfWCrxZ9WmiSCxwYGmXrt-53VoZw@mail.gmail.com>
Message-ID: <87lhwwo7yw.fsf@redhat.com>

"Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:

> There is also the case of floppy, which is the only option for windows atm.
>
> That reminds me, you want to add this info to all existing install
> scripts. preferably in this series.

thanks for the comments.

A question before I send v3: is it fine to list "floppy" for
windows-{cmd,reg,sif,unattend}cmd.xml and "floppy", "initrd", "web",
"cdrom" for Fedora/RHEL?

Giuseppe



From zeeshanak at gnome.org  Thu Feb 27 18:57:47 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 27 Feb 2014 18:57:47 +0000
Subject: [Libosinfo] [PATCH v2 1/3] install-scripts: Add
 get-supported-injection-media API
In-Reply-To: <87lhwwo7yw.fsf@redhat.com>
References: <1393424515-17242-1-git-send-email-gscrivan@redhat.com>
	<1393424515-17242-2-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMnFmUpuPb7H4UQ71EfWCrxZ9WmiSCxwYGmXrt-53VoZw@mail.gmail.com>
	<87lhwwo7yw.fsf@redhat.com>
Message-ID: <CAAa3hFPLFEvUn7uNe96AD=TVaTDXWWaQfSNnivK_u3TCwCzWhA@mail.gmail.com>

On Thu, Feb 27, 2014 at 4:07 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> There is also the case of floppy, which is the only option for windows atm.
>>
>> That reminds me, you want to add this info to all existing install
>> scripts. preferably in this series.
>
> thanks for the comments.
>
> A question before I send v3: is it fine to list "floppy" for
> windows-{cmd,reg,sif,unattend}cmd.xml and "floppy", "initrd", "web",
> "cdrom" for Fedora/RHEL?

Sounds right. I just got reminded that we also have to see how this
relates/affects 'command-line' and update that too if needed.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Fri Feb 28 13:05:18 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:18 +0100
Subject: [Libosinfo] [PATCH v3 0/7] Add get-supported-injection-method API
Message-ID: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>

v3 changes:

* rename API to get-supported-injection-method
* change its return type to a bitwise-or of supported methods
* tag the scripts for RHEL, Fedora, Windows
* Add --list-injection-methods to osinfo-install-script
* Fixed other issues reported for v2

Fabiano Fid?ncio (1):
  ubuntu: Add jeos install-script (version >= 6.06)

Giuseppe Scrivano (6):
  install-scripts: Add get-supported-injection-method API
  osinfo-install-script: support argument --list-injection-methods
  debian: add installer script
  get-supported-injection-method: update Windows install scripts
  get-supported-injection-method: update Fedora install scripts
  get-supported-injection-method: update RHEL install scripts

 data/install-scripts/Makefile.am          |   2 +
 data/install-scripts/debian.xml           |  63 ++++++++++++++
 data/install-scripts/fedora.xml           |   8 ++
 data/install-scripts/rhel.xml             |   8 ++
 data/install-scripts/ubuntu.xml           | 137 ++++++++++++++++++++++++++++++
 data/install-scripts/windows-cmd.xml      |   1 +
 data/install-scripts/windows-reg.xml      |   1 +
 data/install-scripts/windows-sif.xml      |   2 +
 data/install-scripts/windows-unattend.xml |   2 +
 data/oses/debian.xml.in                   |  12 +++
 data/oses/ubuntu.xml.in                   |  59 +++++++++++++
 data/schemas/libosinfo.rng                |  11 +++
 osinfo/libosinfo.syms                     |   5 ++
 osinfo/osinfo_install_script.c            |  20 ++++-
 osinfo/osinfo_install_script.h            |  24 +++++-
 osinfo/osinfo_loader.c                    |  23 ++++-
 tools/osinfo-install-script.c             |  46 +++++++++-
 17 files changed, 417 insertions(+), 7 deletions(-)
 create mode 100644 data/install-scripts/debian.xml
 create mode 100644 data/install-scripts/ubuntu.xml

-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:19 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:19 +0100
Subject: [Libosinfo] [PATCH v3 1/7] install-scripts: Add
	get-supported-injection-method API
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-2-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/schemas/libosinfo.rng     | 11 +++++++++++
 osinfo/libosinfo.syms          |  5 +++++
 osinfo/osinfo_install_script.c | 20 +++++++++++++++++++-
 osinfo/osinfo_install_script.h | 24 +++++++++++++++++++++++-
 osinfo/osinfo_loader.c         | 23 +++++++++++++++++++++--
 5 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 0675217..778a972 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -616,6 +616,9 @@
             <ref name='driver-signing-reqs'/>
           </element>
         </optional>
+        <zeroOrMore>
+          <ref name='supported-injection-method'/>
+        </zeroOrMore>
         <element name='template'>
           <choice>
             <group>
@@ -770,4 +773,12 @@
       </data>
     </element>
   </define>
+
+  <define name='supported-injection-method'>
+    <element name='supported-injection-method'>
+      <data type="string">
+        <param name="pattern">cdrom|floppy|initrd|web</param>
+      </data>
+    </element>
+  </define>
 </grammar>
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index c3b967c..cdcfc28 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -495,6 +495,11 @@ LIBOSINFO_0.2.9 {
 	osinfo_release_status_get_type;
 } LIBOSINFO_0.2.8;
 
+LIBOSINFO_0.2.10 {
+	osinfo_install_script_get_supported_injection_method;
+	osinfo_install_script_supported_injection_method_get_type;
+} LIBOSINFO_0.2.9;
+
 /* Symbols in next release...
 
   LIBOSINFO_0.0.2 {
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 7444c8d..de508f4 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1,7 +1,7 @@
 /*
  * libosinfo:
  *
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1309,6 +1309,24 @@ int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri
          OSINFO_DEVICE_DRIVER_SIGNING_REQ_NONE);
 }
 
+/**
+ * osinfo_install_script_get_supported_injection_method:
+ * @script: the install script
+ *
+ * Retrieve how it is possible to inject the script in the installation process.
+ *
+ * Returns: (type OsinfoInstallScriptSupportedInjectionMethod): bitwise-or of
+ * supported methods(#OsinfoInstallScriptSupportedInjectionMethod) for install
+ * script injection.
+ */
+unsigned int osinfo_install_script_get_supported_injection_method(OsinfoInstallScript *script)
+{
+    return osinfo_entity_get_param_value_int64_with_default
+        (OSINFO_ENTITY(script),
+         OSINFO_INSTALL_SCRIPT_PROP_SUPPORTED_INJECTION_METHOD,
+         0);
+}
+
 
 /*
  * Local variables:
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index c39b786..2db30e8 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -1,7 +1,7 @@
 /*
  * libosinfo: OS installation script
  *
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -57,6 +57,7 @@ typedef struct _OsinfoInstallScriptPrivate OsinfoInstallScriptPrivate;
 #define OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS "can-post-install-drivers"
 #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_SUPPORTED_INJECTION_METHOD "supported-injection-method"
 
 /* object */
 struct _OsinfoInstallScript
@@ -113,6 +114,25 @@ typedef enum {
     OSINFO_DEVICE_DRIVER_SIGNING_REQ_WARN
 } OsinfoDeviceDriverSigningReq;
 
+/**
+ * OsinfoInstallScriptSupportedInjectionMethod:
+ *
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_CDROM: Support injection of the
+ * installation script to a CD-ROM.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY: Support injection of the
+ * installation script to a floppy disk.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD: Support injection of the
+ * installation script to the initrd.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_WEB: Support injection of the
+ * installation script from the web.
+ */
+typedef enum {
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_CDROM  = 1 << 0,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY = 1 << 1,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD = 1 << 2,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_WEB    = 1 << 3,
+} OsinfoInstallScriptSupportedInjectionMethod;
+
 GType osinfo_install_script_get_type(void);
 
 OsinfoInstallScript *osinfo_install_script_new(const gchar *id);
@@ -195,6 +215,8 @@ gboolean osinfo_install_script_get_can_post_install_drivers(OsinfoInstallScript
 int osinfo_install_script_get_pre_install_drivers_signing_req(OsinfoInstallScript *script);
 int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScript *script);
 
+unsigned int osinfo_install_script_get_supported_injection_method(OsinfoInstallScript *script);
+
 #endif /* __OSINFO_INSTALL_SCRIPT_H__ */
 /*
  * Local variables:
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index e9ce8e1..047882d 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -1,7 +1,7 @@
 /*
  * libosinfo:
  *
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -777,7 +777,9 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
     };
     gchar *value = NULL;
     xmlNodePtr *nodes = NULL;
-    int nnodes;
+    int i, nnodes;
+    unsigned int injection_methods = 0;
+    GFlagsClass *flags_class;
 
     if (!id) {
         OSINFO_ERROR(err, _("Missing install script id property"));
@@ -835,6 +837,23 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
     }
     g_free(nodes);
 
+    nnodes = osinfo_loader_nodeset("./supported-injection-method", ctxt, &nodes, err);
+    if (error_is_set(err))
+        goto error;
+
+    flags_class = g_type_class_ref(OSINFO_TYPE_INSTALL_SCRIPT_SUPPORTED_INJECTION_METHOD);
+    for (i = 0 ; i < nnodes ; i++) {
+        const gchar *nick = (const gchar *) nodes[i]->children->content;
+        injection_methods |= g_flags_get_value_by_nick(flags_class, nick)->value;
+    }
+    osinfo_entity_set_param_int64(OSINFO_ENTITY(installScript),
+                                  OSINFO_INSTALL_SCRIPT_PROP_SUPPORTED_INJECTION_METHOD,
+                                  injection_methods);
+
+    g_type_class_unref(flags_class);
+    g_free(nodes);
+
+
     osinfo_db_add_install_script(loader->priv->db, installScript);
 
     return;
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:20 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:20 +0100
Subject: [Libosinfo] [PATCH v3 2/7] osinfo-install-script: support argument
	--list-injection-methods
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-3-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 tools/osinfo-install-script.c | 46 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/tools/osinfo-install-script.c b/tools/osinfo-install-script.c
index 0b25ded..e8b7e61 100644
--- a/tools/osinfo-install-script.c
+++ b/tools/osinfo-install-script.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright (C) 2011, 2014 Red Hat, Inc.
  *
  * osinfo-install-script: generate an install script
  *
@@ -34,6 +34,7 @@ static const gchar *prefix;
 
 static gboolean list_config = FALSE;
 static gboolean list_profile = FALSE;
+static gboolean list_inj_method = FALSE;
 static gboolean quiet = FALSE;
 
 static OsinfoInstallConfig *config;
@@ -79,6 +80,8 @@ static GOptionEntry entries[] =
       N_("List configuration parameters"), NULL },
     { "list-profiles", '\0', 0, G_OPTION_ARG_NONE, (void*)&list_profile,
       N_("List install script profiles"), NULL },
+    { "list-injection-methods", '\0', 0, G_OPTION_ARG_NONE,
+      (void*)&list_inj_method, N_("List supported injection methods"), NULL },
     { "quiet", 'q', 0, G_OPTION_ARG_NONE, (void*)&quiet,
       N_("Do not display output filenames"), NULL },
     { NULL }
@@ -187,6 +190,35 @@ static gboolean list_script_profile(OsinfoOs *os)
     return ret;
 }
 
+static gboolean list_script_inj_method(OsinfoOs *os)
+{
+    OsinfoInstallScriptList *scripts = osinfo_os_get_install_script_list(os);
+    GList *l, *tmp;
+    gboolean ret = FALSE;
+    GFlagsClass *f;
+
+    f = g_type_class_ref(OSINFO_TYPE_INSTALL_SCRIPT_SUPPORTED_INJECTION_METHOD);
+    l = osinfo_list_get_elements(OSINFO_LIST(scripts));
+
+    for (tmp = l; tmp != NULL; tmp = tmp->next) {
+        OsinfoInstallScript *script = tmp->data;
+        unsigned int methods, i;
+        methods = osinfo_install_script_get_supported_injection_method(script);
+
+        g_print("%s:", osinfo_install_script_get_profile(script));
+        for (i = 0; i < f->n_values; i++)
+            if (f->values[i].value & methods)
+                g_print(" %s", f->values[i].value_nick);
+        g_print("\n");
+    }
+    ret = TRUE;
+
+    g_list_free(l);
+    g_type_class_unref(f);
+    g_object_unref(scripts);
+    return ret;
+}
+
 
 static gboolean generate_script(OsinfoOs *os)
 {
@@ -285,9 +317,12 @@ gint main(gint argc, gchar **argv)
         goto EXIT;
     }
 
-    if (list_profile && list_config) {
+    if ((list_profile     ? 1 : 0) +
+        (list_config      ? 1 : 0) +
+        (list_inj_method  ? 1 : 0) > 1) {
         g_printerr("%s",
-                   _("Only one of --list-profile and --list-config can be requested"));
+                   _("Only one of --list-profile, --list-config and "
+                     "--list-injection-methods can be requested"));
         ret = -2;
         goto EXIT;
     }
@@ -320,6 +355,11 @@ gint main(gint argc, gchar **argv)
             ret = -5;
             goto EXIT;
         }
+    } else if (list_inj_method) {
+        if (!list_script_inj_method(os)) {
+            ret = -5;
+            goto EXIT;
+        }
     } else {
         if (!generate_script(os)) {
             ret = -5;
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:21 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:21 +0100
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-4-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/Makefile.am |  1 +
 data/install-scripts/debian.xml  | 63 ++++++++++++++++++++++++++++++++++++++++
 data/oses/debian.xml.in          | 12 ++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 data/install-scripts/debian.xml

diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index c310468..442c286 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -1,6 +1,7 @@
 
 databasedir = $(pkgdatadir)/db/install-scripts/
 database_DATA =     \
+  debian.xml        \
   fedora.xml        \
   rhel.xml          \
   windows-sif.xml   \
diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml
new file mode 100644
index 0000000..b0aa290
--- /dev/null
+++ b/data/install-scripts/debian.xml
@@ -0,0 +1,63 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://debian.org/scripts/debian/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>debian.ks</expected-filename>
+    <can-pre-install-drivers>true</can-pre-install-drivers>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="l10n-language" policy="optional"/>
+    </config>
+    <supported-injection-method>initrd</supported-injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+	<xsl:template match="/install-script-config">
+d-i debian-installer/locale select <xsl:value-of select="config/l10n-language"/>
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/>
+
+d-i netcfg/choose_interface select auto
+d-i netcfg/get_hostname string localhost
+d-i netcfg/get_domain string localdomain
+d-i netcfg/disable_dhcp     boolean false
+d-i mirror/http/proxy	string
+d-i netcfg/wireless_wep string
+
+d-i clock-setup/utc boolean true
+d-i time/zone select <xsl:value-of select="config/l10n-timezone"/>
+
+d-i partman-auto/method string regular
+d-i partman-auto/choose_recipe select home
+d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i passwd/root-login boolean true
+d-i passwd/make-user boolean false
+d-i passwd/root-password password <xsl:value-of select="config/admin-password"/>
+d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/>
+
+tasksel tasksel/first multiselect standard
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+
+d-i apt-setup/security_host string
+d-i apt-setup/services-select multiselect
+d-i apt-setup/volatile_host string
+d-i apt-setup/security_host string
+
+d-i finish-install/reboot_in_progress note
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+
+</libosinfo>
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 51a4034..a5a1136 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -136,6 +136,10 @@
         <storage>5368709120</storage>
       </recommended>
     </resources>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
   </os>
 
   <os id="http://debian.org/debian/6">
@@ -202,6 +206,10 @@
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
     </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
   </os>
 
   <os id="http://debian.org/debian/7">
@@ -249,6 +257,10 @@
       <kernel>install.amd/vmlinuz</kernel>
       <initrd>install.amd/initrd.gz</initrd>
     </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
   </os>
 
 </libosinfo>
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:22 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:22 +0100
Subject: [Libosinfo] [PATCH v3 4/7] ubuntu: Add jeos install-script (version
	>= 6.06)
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-5-git-send-email-gscrivan@redhat.com>

From: Fabiano Fid?ncio <fabiano at fidencio.org>

script based on: https://github.com/clalancette/oz/tree/master/oz/auto
---
 data/install-scripts/Makefile.am |   1 +
 data/install-scripts/ubuntu.xml  | 137 +++++++++++++++++++++++++++++++++++++++
 data/oses/ubuntu.xml.in          |  59 +++++++++++++++++
 3 files changed, 197 insertions(+)
 create mode 100644 data/install-scripts/ubuntu.xml

diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 442c286..78decc2 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -4,6 +4,7 @@ database_DATA =     \
   debian.xml        \
   fedora.xml        \
   rhel.xml          \
+  ubuntu.xml        \
   windows-sif.xml   \
   windows-cmd.xml   \
   windows-reg.xml   \
diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu.xml
new file mode 100644
index 0000000..6f12a0c
--- /dev/null
+++ b/data/install-scripts/ubuntu.xml
@@ -0,0 +1,137 @@
+<libosinfo version="0.0.1">
+  <!-- JEOS PROFILE -->
+  <install-script id='http://fedoraproject.org/scripts/ubuntu/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>preseed.cfg</expected-filename>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="l10n-language" policy="optional"/>
+      <param name="target-disk" policy="optional"/>
+      <param name="hostname" policy="optional"/>
+    </config>
+    <supported-injection-method>initrd</supported-injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template name="target-disk">
+          <xsl:choose>
+            <xsl:when test="config/target-disk != ''">
+              <xsl:value-of select="config/target-disk"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- IDE -->
+              <xsl:text>/dev/hda</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template match="/install-script-config">
+# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
+d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/>
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/>
+
+d-i netcfg/choose_interface select auto
+d-i netcfg/get_hostname string <xsl:value-of select="config/hostname"/>
+d-i netcfg/get_domain string unassigned-domain
+d-i netcfg/wireless_wep string
+
+d-i clock-setup/utc boolean true
+d-i time/zone string <xsl:value-of select="config/l10n-timezone"/>
+
+<xsl:if test="os/version &lt; 7.04">
+d-i partman-auto/disk string <xsl:call-template name="target-disk"/>
+</xsl:if>
+<xsl:if test="os/version = 7.04">
+d-i partman-auto/init_automatically_partition select Use the largest continuous free space
+</xsl:if>
+d-i partman-auto/method string regular
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7.10">
+d-i partman-auto/choose_recipe select Separate /home partition
+  </xsl:when>
+  <xsl:otherwise>
+d-i partman-auto/choose_recipe select home
+  </xsl:otherwise>
+</xsl:choose>
+d-i partman/confirm_write_new_label boolean true
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7.10">
+d-i partman/choose_partition select Finish partitioning and write changes to disk
+  </xsl:when>
+  <xsl:otherwise>
+d-i partman/choose_partition select finish
+  </xsl:otherwise>
+</xsl:choose>
+d-i partman/confirm boolean true
+<xsl:if test="os/version &gt; 9.10">
+d-i partman/confirm_nooverwrite boolean true
+</xsl:if>
+
+d-i passwd/root-login boolean true
+d-i passwd/make-user boolean false
+d-i passwd/root-password password <xsl:value-of select="config/admin-password"/>
+d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/>
+
+<xsl:if test="os/version &lt; 6.10">
+d-i pkgsel/install-language-support boolean false
+</xsl:if>
+
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7.10">
+tasksel tasksel/first multiselect ubuntu-standard, ubuntu-desktop
+  </xsl:when>
+  <xsl:otherwise>
+tasksel tasksel/first multiselect standard
+  </xsl:otherwise>
+</xsl:choose>
+<xsl:choose>
+  <xsl:when test="os/version &lt; 8.04">
+d-i mirror/http/proxy string
+  </xsl:when>
+  <xsl:when test="os/version = 10.04">
+d-i pkgsel/include/install-recommends boolean true
+d-i pkgsel/include string ltsp-server-standalone openssh-server python-software-properties
+d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys
+  </xsl:when>
+  <xsl:when test="os/version = 11.04">
+d-i pkgsel/include/install-recommends boolean true
+d-i pkgsel/include string openssh-server
+  </xsl:when>
+  <xsl:when test="os/version &gt; 11.04">
+d-i pkgsel/include/install-recommends boolean true
+d-i pkgsel/include string openssh-server python-software-properties
+  </xsl:when>
+</xsl:choose>
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+
+d-i apt-setup/security_host string
+base-config apt-setup/security-updates boolean false
+
+<xsl:if test="os/version &gt; 7.04">
+ubiquity ubiquity/summary note
+ubiquity ubiquity/reboot boolean true
+</xsl:if>
+
+d-i finish-install/reboot_in_progress note
+<xsl:if test="os/version &lt; 6.10">
+d-i prebaseconfig/reboot_in_progress note
+</xsl:if>
+
+<xsl:if test="os/version = 13.04">
+ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper
+</xsl:if>
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+
+</libosinfo>
diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
index 4e4cbf5..0a21fa4 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -362,6 +362,9 @@
       <initrd>casper/initrd.img</initrd>
     </media>
 
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/6.10">
@@ -443,6 +446,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/7.04">
@@ -506,6 +513,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/7.10">
@@ -569,6 +580,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/8.04">
@@ -645,6 +660,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/8.10">
@@ -699,6 +718,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/9.04">
@@ -757,6 +780,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/9.10">
@@ -811,6 +838,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/10.04">
@@ -858,6 +889,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/10.10">
@@ -925,6 +960,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/11.04">
@@ -992,6 +1031,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/11.10">
@@ -1055,6 +1098,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.04">
@@ -1116,6 +1163,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.10">
@@ -1177,6 +1228,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.04">
@@ -1299,5 +1354,9 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 </libosinfo>
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:23 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:23 +0100
Subject: [Libosinfo] [PATCH v3 5/7] get-supported-injection-method: update
	Windows install scripts
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-6-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/windows-cmd.xml      | 1 +
 data/install-scripts/windows-reg.xml      | 1 +
 data/install-scripts/windows-sif.xml      | 2 ++
 data/install-scripts/windows-unattend.xml | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml
index 04ffb23..6d247f5 100644
--- a/data/install-scripts/windows-cmd.xml
+++ b/data/install-scripts/windows-cmd.xml
@@ -17,6 +17,7 @@
       <param name="post-install-drivers-location" policy="optional"/>
       <param name="driver-signing" policy="optional"/>
     </config>
+    <supported-injection-method>floppy</supported-injection-method>
     <avatar-format>
       <mime-type>image/bmp</mime-type>
       <width>48</width>
diff --git a/data/install-scripts/windows-reg.xml b/data/install-scripts/windows-reg.xml
index df38188..e4d4b64 100644
--- a/data/install-scripts/windows-reg.xml
+++ b/data/install-scripts/windows-reg.xml
@@ -8,6 +8,7 @@
       <param name="admin-password" policy="optional"/>
       <param name="user-realname" policy="required"/>
     </config>
+    <supported-injection-method>floppy</supported-injection-method>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/data/install-scripts/windows-sif.xml b/data/install-scripts/windows-sif.xml
index b45f154..2ddcc08 100644
--- a/data/install-scripts/windows-sif.xml
+++ b/data/install-scripts/windows-sif.xml
@@ -12,6 +12,7 @@
       <param name="user-realname" policy="required"/>
       <param name="driver-signing" policy="optional"/>
     </config>
+    <supported-injection-method>floppy</supported-injection-method>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -84,6 +85,7 @@
       <param name="script-disk" policy="optional"/>
       <param name="driver-signing" policy="optional"/>
     </config>
+    <supported-injection-method>floppy</supported-injection-method>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml
index 37fefdb..b312d0d 100644
--- a/data/install-scripts/windows-unattend.xml
+++ b/data/install-scripts/windows-unattend.xml
@@ -17,6 +17,7 @@
       <param name="pre-install-drivers-disk" policy="optional"/>
       <param name="pre-install-drivers-location" policy="optional"/>
     </config>
+    <supported-injection-method>floppy</supported-injection-method>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -231,6 +232,7 @@
     <param name="pre-install-drivers-location" policy="optional"/>
     <param name="script-disk" policy="optional"/>
    </config>
+    <supported-injection-method>floppy</supported-injection-method>
     <template>
      <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:24 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:24 +0100
Subject: [Libosinfo] [PATCH v3 6/7] get-supported-injection-method: update
	Fedora install scripts
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-7-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/fedora.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml
index 0a5de10..4507e77 100644
--- a/data/install-scripts/fedora.xml
+++ b/data/install-scripts/fedora.xml
@@ -11,6 +11,10 @@
       <param name="target-disk" policy="optional"/>
       <param name="script-disk" policy="required"/>
     </config>
+    <supported-injection-method>cdrom</supported-injection-method>
+    <supported-injection-method>floppy</supported-injection-method>
+    <supported-injection-method>initrd</supported-injection-method>
+    <supported-injection-method>web</supported-injection-method>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -161,6 +165,10 @@ reboot
         <param name="target-disk" policy="optional"/>
         <param name="script-disk" policy="required"/>
     </config>
+    <supported-injection-method>cdrom</supported-injection-method>
+    <supported-injection-method>floppy</supported-injection-method>
+    <supported-injection-method>initrd</supported-injection-method>
+    <supported-injection-method>web</supported-injection-method>
     <avatar-format>
       <mime-type>image/png</mime-type>
     </avatar-format>
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 13:05:25 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 14:05:25 +0100
Subject: [Libosinfo] [PATCH v3 7/7] get-supported-injection-method: update
	RHEL install scripts
In-Reply-To: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1393592725-17667-8-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/rhel.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel.xml
index 840344b..509ad2c 100644
--- a/data/install-scripts/rhel.xml
+++ b/data/install-scripts/rhel.xml
@@ -11,6 +11,10 @@
       <param name="target-disk" policy="optional"/>
       <param name="script-disk" policy="required"/>
     </config>
+    <supported-injection-method>cdrom</supported-injection-method>
+    <supported-injection-method>floppy</supported-injection-method>
+    <supported-injection-method>initrd</supported-injection-method>
+    <supported-injection-method>web</supported-injection-method>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -110,6 +114,10 @@ reboot
         <param name="target-disk" policy="optional"/>
         <param name="script-disk" policy="required"/>
     </config>
+    <supported-injection-method>cdrom</supported-injection-method>
+    <supported-injection-method>floppy</supported-injection-method>
+    <supported-injection-method>initrd</supported-injection-method>
+    <supported-injection-method>web</supported-injection-method>
     <avatar-format>
       <mime-type>image/png</mime-type>
     </avatar-format>
-- 
1.8.5.3



From gscrivan at redhat.com  Fri Feb 28 17:43:14 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 18:43:14 +0100
Subject: [Libosinfo] [PATCH] README: fix mailing list URL
Message-ID: <1393609394-23815-1-git-send-email-gscrivan@redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 3e361cd..a1a8d39 100644
--- a/README
+++ b/README
@@ -33,10 +33,10 @@ Patches sumissions
 ==================
 
 Patch submissions are welcomed from any interested contributor. Please
-use the virt-tools-list for any patch submissions, or discussions
-about the code:
+use the libosinfo list for any patch submissions, or discussions about
+the code:
 
-    https://www.redhat.com/mailman/listinfo/virt-tools-list
+    https://www.redhat.com/mailman/listinfo/libosinfo
 
 For further information about libosinfo please consult the project
 homepage
-- 
1.8.5.3



From berrange at redhat.com  Fri Feb 28 17:45:26 2014
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 28 Feb 2014 17:45:26 +0000
Subject: [Libosinfo] [PATCH] README: fix mailing list URL
In-Reply-To: <1393609394-23815-1-git-send-email-gscrivan@redhat.com>
References: <1393609394-23815-1-git-send-email-gscrivan@redhat.com>
Message-ID: <20140228174526.GI17909@redhat.com>

On Fri, Feb 28, 2014 at 06:43:14PM +0100, Giuseppe Scrivano wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---
>  README | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/README b/README
> index 3e361cd..a1a8d39 100644
> --- a/README
> +++ b/README
> @@ -33,10 +33,10 @@ Patches sumissions
>  ==================
>  
>  Patch submissions are welcomed from any interested contributor. Please
> -use the virt-tools-list for any patch submissions, or discussions
> -about the code:
> +use the libosinfo list for any patch submissions, or discussions about
> +the code:
>  
> -    https://www.redhat.com/mailman/listinfo/virt-tools-list
> +    https://www.redhat.com/mailman/listinfo/libosinfo
>  
>  For further information about libosinfo please consult the project
>  homepage

ACK, trivial

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From gscrivan at redhat.com  Fri Feb 28 18:59:02 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Fri, 28 Feb 2014 19:59:02 +0100
Subject: [Libosinfo] [PATCH] README: fix mailing list URL
In-Reply-To: <20140228174526.GI17909@redhat.com> (Daniel P. Berrange's message
	of "Fri, 28 Feb 2014 17:45:26 +0000")
References: <1393609394-23815-1-git-send-email-gscrivan@redhat.com>
	<20140228174526.GI17909@redhat.com>
Message-ID: <87d2i7njwp.fsf@redhat.com>

"Daniel P. Berrange" <berrange at redhat.com> writes:

> On Fri, Feb 28, 2014 at 06:43:14PM +0100, Giuseppe Scrivano wrote:
>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>>  README | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
> ACK, trivial

Can someone please push it?  I have no write access to the repo.

Thanks,
Giuseppe



From fidencio at redhat.com  Fri Feb 28 20:39:58 2014
From: fidencio at redhat.com (Fabiano Fidencio)
Date: Fri, 28 Feb 2014 21:39:58 +0100
Subject: [Libosinfo] [PATCH] README: fix mailing list URL
In-Reply-To: <87d2i7njwp.fsf@redhat.com>
References: <1393609394-23815-1-git-send-email-gscrivan@redhat.com>
	<20140228174526.GI17909@redhat.com> <87d2i7njwp.fsf@redhat.com>
Message-ID: <1393619998.15587.0.camel@srv>

On Fri, 2014-02-28 at 19:59 +0100, Giuseppe Scrivano wrote:
> "Daniel P. Berrange" <berrange at redhat.com> writes:
> 
> > On Fri, Feb 28, 2014 at 06:43:14PM +0100, Giuseppe Scrivano wrote:
> >> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> >> ---
> >>  README | 6 +++---
> >>  1 file changed, 3 insertions(+), 3 deletions(-)
> >> 
> > ACK, trivial
> 
> Can someone please push it?  I have no write access to the repo.

Done!

Best Regards,
--
Fabiano Fid?ncio