From zeeshanak at gnome.org  Mon Mar  3 13:48:16 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 13:48:16 +0000
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <1393592725-17667-4-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

I'm guessing that this doesn't need passing of any commandlines to
kernel? If so, ACK.

>  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
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Mon Mar  3 14:02:17 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 14:02:17 +0000
Subject: [Libosinfo] [PATCH v3 1/7] install-scripts: Add
 get-supported-injection-method API
In-Reply-To: <1393592725-17667-2-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-2-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFOC32uaGhVKJBS_=bVLUm7v5JCVV3NwDRgDFfpLMk1KnA@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

The name of method is get_supported_injection_method, contrary to what
shortlog is saying. Also, would be nice to have some more description
here about this change.

One small comment below but otherwise look good, although I would have
divided this patch a bit more but thats just my perfectionism. :)

> @@ -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.

'to' -> 'through' in all three sentences above.


-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Mon Mar  3 14:05:58 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 14:05:58 +0000
Subject: [Libosinfo] [PATCH v3 2/7] osinfo-install-script: support
 argument --list-injection-methods
In-Reply-To: <1393592725-17667-3-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-3-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMzrvTiQ9=dsVFX8gB3S9-u5ROryJhTDzvzA1QsHtFbnw@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK. I'd remove the 'argument' in shortlog to keep it under 50 chars.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Mon Mar  3 14:09:41 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 14:09:41 +0000
Subject: [Libosinfo] [PATCH v3 5/7] get-supported-injection-method:
 update Windows install scripts
In-Reply-To: <1393592725-17667-6-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-6-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFPWVCQ2CkRg23aO47hVyDcixCONLYQrhdqXMPEfbcokNw@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK, though for keeping the commit logs consistent, I'd recommend:
"installer,windows: Add injection method info"

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Mon Mar  3 14:14:13 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 14:14:13 +0000
Subject: [Libosinfo] [PATCH v3 4/7] ubuntu: Add jeos install-script
 (version >= 6.06)
In-Reply-To: <1393592725-17667-5-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-5-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFN0EearxJRepJhqxTV6hBcjD-zMHOLyUuVaLwLvR=2Q0w@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>
> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
> ---

ACK, though same question as for debian patch about kernel
commandline. Kudos for giving proper credits but I would suggest
appending this line to commit log:

Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Mon Mar  3 14:19:57 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 14:19:57 +0000
Subject: [Libosinfo] [PATCH v3 6/7] get-supported-injection-method:
 update Fedora install scripts
In-Reply-To: <1393592725-17667-7-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-7-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFP6dPyQ7-00FKESMxNH8C7bJj94M3JfLSYz1Ysm47Varg@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

Same comment about short log as for windows patch.

>  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>

You never answered my question about how this affects commandline
generation. The one we have right now assumes the script to be a disk,
rather than initrd or web so at least currently I'd say these two
methods are not supported and therefore should not be listed here.



From zeeshanak at gnome.org  Mon Mar  3 14:20:58 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 3 Mar 2014 14:20:58 +0000
Subject: [Libosinfo] [PATCH v3 7/7] get-supported-injection-method:
 update RHEL install scripts
In-Reply-To: <1393592725-17667-8-git-send-email-gscrivan@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-8-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMwN22zWsOwuPO1mAUKjfNVStyQpR1Jz7XWsi9HKBBpKg@mail.gmail.com>

On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

Same two comments as for Fedora patch.



From gscrivan at redhat.com  Mon Mar  3 16:02:31 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Mon, 03 Mar 2014 17:02:31 +0100
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
	(Zeeshan Ali's message of "Mon, 3 Mar 2014 13:48:16 +0000")
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
Message-ID: <87k3cbl17s.fsf@redhat.com>

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

> On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>
> I'm guessing that this doesn't need passing of any commandlines to
> kernel? If so, ACK.

unfortunately not.  I have used the following arguments to virt-install:

virt-install --connect qemu:///system --name debian_tmp \
  --initrd-inject=debian.ks --ram 1024 --hvm --disk=debian_tmp.img,size=10 \
  --location='http://ftp.debian.org/debian/dists/stable/main/installer-amd64/' \
  --extra="file=/debian.ks auto-install/enable \
  keyboard-configuration/xkb-keymap=us debian-installer/keymap=us \
  debian-installer/locale=en_US.UTF-8 console-setup/ask_detect=false \
  console-keymaps-at/keymap=us console-setup/layoutcode=en_US \
  debconf/priority=critical netcfg/choose_interface=auto"

Regards,
Giuseppe



From gscrivan at redhat.com  Mon Mar  3 16:03:43 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Mon, 03 Mar 2014 17:03:43 +0100
Subject: [Libosinfo] [PATCH v3 4/7] ubuntu: Add jeos install-script
	(version >= 6.06)
In-Reply-To: <CAAa3hFN0EearxJRepJhqxTV6hBcjD-zMHOLyUuVaLwLvR=2Q0w@mail.gmail.com>
	(Zeeshan Ali's message of "Mon, 3 Mar 2014 14:14:13 +0000")
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-5-git-send-email-gscrivan@redhat.com>
	<CAAa3hFN0EearxJRepJhqxTV6hBcjD-zMHOLyUuVaLwLvR=2Q0w@mail.gmail.com>
Message-ID: <87fvmzl15s.fsf@redhat.com>

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

> On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>>
>> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
>> ---
>
> ACK, though same question as for debian patch about kernel
> commandline. Kudos for giving proper credits but I would suggest
> appending this line to commit log:
>
> Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>

same as for Debian, I had to use something like in this thread:

https://www.redhat.com/archives/libosinfo/2013-November/msg00051.html

Regards,
Giuseppe



From gscrivan at redhat.com  Mon Mar  3 16:12:29 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Mon, 03 Mar 2014 17:12:29 +0100
Subject: [Libosinfo] [PATCH v3 6/7] get-supported-injection-method:
	update Fedora install scripts
In-Reply-To: <CAAa3hFP6dPyQ7-00FKESMxNH8C7bJj94M3JfLSYz1Ysm47Varg@mail.gmail.com>
	(Zeeshan Ali's message of "Mon, 3 Mar 2014 14:19:57 +0000")
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-7-git-send-email-gscrivan@redhat.com>
	<CAAa3hFP6dPyQ7-00FKESMxNH8C7bJj94M3JfLSYz1Ysm47Varg@mail.gmail.com>
Message-ID: <87bnxnl0r6.fsf@redhat.com>

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

> On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>
> Same comment about short log as for windows patch.
>
>>  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>
>
> You never answered my question about how this affects commandline
> generation. The one we have right now assumes the script to be a disk,
> rather than initrd or web so at least currently I'd say these two
> methods are not supported and therefore should not be listed here.

ops, sorry, now I understand what you mean with "commandline
generation".  I've missed this part, and as I commented for Debian and
Ubuntu patches, they need a command line to work.

Giuseppe



From zeeshanak at gnome.org  Tue Mar  4 13:04:27 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Tue, 4 Mar 2014 13:04:27 +0000
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <87k3cbl17s.fsf@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
	<87k3cbl17s.fsf@redhat.com>
Message-ID: <CAAa3hFOgji_89+pE=mSEv0rUeV5KPCJV6_yiw9vqfXfJm2YKkw@mail.gmail.com>

On Mon, Mar 3, 2014 at 4:02 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>>> ---
>>
>> I'm guessing that this doesn't need passing of any commandlines to
>> kernel? If so, ACK.
>
> unfortunately not.  I have used the following arguments to virt-install:

I'm confused now, 'not' here means we do or do not need commandline?
Since you said "unfortunately", i guess we *do* need it. In that case,
you need to provide the comamndline template in your script.

> virt-install --connect qemu:///system --name debian_tmp \
>   --initrd-inject=debian.ks --ram 1024 --hvm --disk=debian_tmp.img,size=10 \
>   --location='http://ftp.debian.org/debian/dists/stable/main/installer-amd64/' \
>   --extra="file=/debian.ks auto-install/enable \
>   keyboard-configuration/xkb-keymap=us debian-installer/keymap=us \
>   debian-installer/locale=en_US.UTF-8 console-setup/ask_detect=false \
>   console-keymaps-at/keymap=us console-setup/layoutcode=en_US \
>   debconf/priority=critical netcfg/choose_interface=auto"

Sorry but I don't know much about virt-install. :(

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Tue Mar  4 13:10:57 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Tue, 4 Mar 2014 13:10:57 +0000
Subject: [Libosinfo] [PATCH v3 4/7] ubuntu: Add jeos install-script
 (version >= 6.06)
In-Reply-To: <87fvmzl15s.fsf@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-5-git-send-email-gscrivan@redhat.com>
	<CAAa3hFN0EearxJRepJhqxTV6hBcjD-zMHOLyUuVaLwLvR=2Q0w@mail.gmail.com>
	<87fvmzl15s.fsf@redhat.com>
Message-ID: <CAAa3hFNB5Lvz+hdbB7G3Z9-sgkrb8xeHmH5D05Lq_uE=p8MX3g@mail.gmail.com>

On Mon, Mar 3, 2014 at 4:03 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> On Fri, Feb 28, 2014 at 1:05 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>>>
>>> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
>>> ---
>>
>> ACK, though same question as for debian patch about kernel
>> commandline. Kudos for giving proper credits but I would suggest
>> appending this line to commit log:
>>
>> Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
>
> same as for Debian, I had to use something like in this thread:
>
> https://www.redhat.com/archives/libosinfo/2013-November/msg00051.html

I'm beginning to think virt-install isn't the best way to test this as
there is good chances of *unintentional* cheating as its all in your
control. I don't know of what else to suggest but Boxes, an app that
relies (almost) completely on info it gets from libosinfo to decide
which API/params of libsoinfo to use for scripts generation. i-e its
almost completely automated. Then again, you'll have to add support
for making use of these new API. :(

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Tue Mar  4 15:31:05 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Tue, 04 Mar 2014 16:31:05 +0100
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <CAAa3hFOgji_89+pE=mSEv0rUeV5KPCJV6_yiw9vqfXfJm2YKkw@mail.gmail.com>
	(Zeeshan Ali's message of "Tue, 4 Mar 2014 13:04:27 +0000")
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
	<87k3cbl17s.fsf@redhat.com>
	<CAAa3hFOgji_89+pE=mSEv0rUeV5KPCJV6_yiw9vqfXfJm2YKkw@mail.gmail.com>
Message-ID: <87r46ihtfq.fsf@redhat.com>

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

>> unfortunately not.  I have used the following arguments to virt-install:
>
> I'm confused now, 'not' here means we do or do not need commandline?
> Since you said "unfortunately", i guess we *do* need it. In that case,
> you need to provide the comamndline template in your script.

yes, it means we need a commandline :-)

>
>> virt-install --connect qemu:///system --name debian_tmp \
>>   --initrd-inject=debian.ks --ram 1024 --hvm --disk=debian_tmp.img,size=10 \
>>   --location='http://ftp.debian.org/debian/dists/stable/main/installer-amd64/' \
>>   --extra="file=/debian.ks auto-install/enable \
>>   keyboard-configuration/xkb-keymap=us debian-installer/keymap=us \
>>   debian-installer/locale=en_US.UTF-8 console-setup/ask_detect=false \
>>   console-keymaps-at/keymap=us console-setup/layoutcode=en_US \
>>   debconf/priority=critical netcfg/choose_interface=auto"
>
> Sorry but I don't know much about virt-install. :(

the --extra argument is the actual commandline.  I have changed the
installation script to include this information.  I will test my changes
and post v4 later.

Thanks,
Giuseppe



From zeeshanak at gnome.org  Tue Mar  4 17:05:40 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Tue, 4 Mar 2014 17:05:40 +0000
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <87r46ihtfq.fsf@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
	<87k3cbl17s.fsf@redhat.com>
	<CAAa3hFOgji_89+pE=mSEv0rUeV5KPCJV6_yiw9vqfXfJm2YKkw@mail.gmail.com>
	<87r46ihtfq.fsf@redhat.com>
Message-ID: <CAAa3hFNqX2pV2zt40zAEQ5BUs+EZsFWXDD+adnyyi8MRnQq+aQ@mail.gmail.com>

On Tue, Mar 4, 2014 at 3:31 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>>> unfortunately not.  I have used the following arguments to virt-install:
>>
>> I'm confused now, 'not' here means we do or do not need commandline?
>> Since you said "unfortunately", i guess we *do* need it. In that case,
>> you need to provide the comamndline template in your script.
>
> yes, it means we need a commandline :-)
>
>>
>>> virt-install --connect qemu:///system --name debian_tmp \
>>>   --initrd-inject=debian.ks --ram 1024 --hvm --disk=debian_tmp.img,size=10 \
>>>   --location='http://ftp.debian.org/debian/dists/stable/main/installer-amd64/' \
>>>   --extra="file=/debian.ks auto-install/enable \
>>>   keyboard-configuration/xkb-keymap=us debian-installer/keymap=us \
>>>   debian-installer/locale=en_US.UTF-8 console-setup/ask_detect=false \
>>>   console-keymaps-at/keymap=us console-setup/layoutcode=en_US \
>>>   debconf/priority=critical netcfg/choose_interface=auto"
>>
>> Sorry but I don't know much about virt-install. :(
>
> the --extra argument is the actual commandline.  I have changed the
> installation script to include this information.  I will test my changes
> and post v4 later.

Cool, in this case its easy as app doesn't have any other choice but
initrd so you can basically just hardcode the commandline but how
would it work for fedora? As I pointed out before, the commandlines
are assuming the script to be on disk pointed out by 'script-disk'
parameter.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Tue Mar  4 17:23:26 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Tue, 04 Mar 2014 18:23:26 +0100
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <CAAa3hFNqX2pV2zt40zAEQ5BUs+EZsFWXDD+adnyyi8MRnQq+aQ@mail.gmail.com>
	(Zeeshan Ali's message of "Tue, 4 Mar 2014 17:05:40 +0000")
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
	<87k3cbl17s.fsf@redhat.com>
	<CAAa3hFOgji_89+pE=mSEv0rUeV5KPCJV6_yiw9vqfXfJm2YKkw@mail.gmail.com>
	<87r46ihtfq.fsf@redhat.com>
	<CAAa3hFNqX2pV2zt40zAEQ5BUs+EZsFWXDD+adnyyi8MRnQq+aQ@mail.gmail.com>
Message-ID: <87fvmxj2sx.fsf@redhat.com>

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

> Cool, in this case its easy as app doesn't have any other choice but
> initrd so you can basically just hardcode the commandline but how
> would it work for fedora? As I pointed out before, the commandlines
> are assuming the script to be on disk pointed out by 'script-disk'
> parameter.

will it be sufficient to support only disk and floppy for now?  That are
the supports that were tested IIUC.

Giuseppe



From zeeshanak at gnome.org  Tue Mar  4 17:28:13 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Tue, 4 Mar 2014 17:28:13 +0000
Subject: [Libosinfo] [PATCH v3 3/7] debian: add installer script
In-Reply-To: <87fvmxj2sx.fsf@redhat.com>
References: <1393592725-17667-1-git-send-email-gscrivan@redhat.com>
	<1393592725-17667-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFMSUqqTjg1RM3VnJ+B2iN-aUVHfUh1NcfEbMLVgFNtZow@mail.gmail.com>
	<87k3cbl17s.fsf@redhat.com>
	<CAAa3hFOgji_89+pE=mSEv0rUeV5KPCJV6_yiw9vqfXfJm2YKkw@mail.gmail.com>
	<87r46ihtfq.fsf@redhat.com>
	<CAAa3hFNqX2pV2zt40zAEQ5BUs+EZsFWXDD+adnyyi8MRnQq+aQ@mail.gmail.com>
	<87fvmxj2sx.fsf@redhat.com>
Message-ID: <CAAa3hFNxW5m2jcpsPcfPZVwVJnCUmHUYEW9YL4ZHhmeHhX8DmA@mail.gmail.com>

On Tue, Mar 4, 2014 at 5:23 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> Cool, in this case its easy as app doesn't have any other choice but
>> initrd so you can basically just hardcode the commandline but how
>> would it work for fedora? As I pointed out before, the commandlines
>> are assuming the script to be on disk pointed out by 'script-disk'
>> parameter.
>
> will it be sufficient to support only disk and floppy for now?  That are
> the supports that were tested IIUC.

Yeah, that is fine but we need to fix this sometimes soon then.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Wed Mar  5 15:01:37 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:37 +0100
Subject: [Libosinfo] [PATCH v4 0/7] Add get_supported_injection_method API
Message-ID: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>

Noteworthy changes in v4:

* Specify only DISK and FLOPPY as supported injection methods for
  Fedora/RHEL installations.
* Add commandline template for Ubuntu and Debian installation scripts
* Drop installation script support for Ubuntu releases that are
  available from "old-releases.ubuntu.com".  They require
  additional arguments on the commandline to work properly.  Support
  for these old versions can be added later.

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

Giuseppe Scrivano (6):
  install_scripts: Add get_supported_injection_method API
  osinfo-install-script: support --list-injection-methods
  debian: add installer script
  installer,windows: Add injection method info
  installer,fedora: Add injection method info
  installer,rhel: Add injection method info

 data/install-scripts/Makefile.am          |   2 +
 data/install-scripts/debian.xml           |  73 ++++++++++++++
 data/install-scripts/fedora.xml           |   4 +
 data/install-scripts/rhel.xml             |   4 +
 data/install-scripts/ubuntu.xml           | 158 ++++++++++++++++++++++++++++++
 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                   |  16 +++
 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, 397 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  Wed Mar  5 15:01:38 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:38 +0100
Subject: [Libosinfo] [PATCH v4 1/7] install_scripts: Add
	get_supported_injection_method API
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-2-git-send-email-gscrivan@redhat.com>

The API allows to query how it is possible to use the script from the
installation process.

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..ef5fb7c 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 trough a CD-ROM.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY: Support injection of the
+ * installation script trough a floppy disk.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD: Support injection of the
+ * installation script trough 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  Wed Mar  5 15:01:39 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:39 +0100
Subject: [Libosinfo] [PATCH v4 2/7] osinfo-install-script: support
	--list-injection-methods
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-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  Wed Mar  5 15:01:40 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:40 +0100
Subject: [Libosinfo] [PATCH v4 3/7] debian: add installer script
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-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  | 73 ++++++++++++++++++++++++++++++++++++++++
 data/oses/debian.xml.in          | 12 +++++++
 3 files changed, 86 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..e826cc1
--- /dev/null
+++ b/data/install-scripts/debian.xml
@@ -0,0 +1,73 @@
+<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="/command-line">
+            <xsl:text>file=/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+            <xsl:text> debian-installer/locale=</xsl:text>
+            <xsl:value-of select="config/l10n-language"/>
+            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
+            <xsl:value-of select="config/l10n-keyboard"/>
+            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
+        </xsl:template>
+
+	<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 Mar  5 15:01:41 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:41 +0100
Subject: [Libosinfo] [PATCH v4 4/7] ubuntu: Add jeos install-script (version
	>= 12.04)
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-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
Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/Makefile.am |   1 +
 data/install-scripts/ubuntu.xml  | 158 +++++++++++++++++++++++++++++++++++++++
 data/oses/ubuntu.xml.in          |  16 ++++
 3 files changed, 175 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..4403c3d
--- /dev/null
+++ b/data/install-scripts/ubuntu.xml
@@ -0,0 +1,158 @@
+<libosinfo version="0.0.1">
+  <!-- JEOS PROFILE -->
+  <install-script id='http://ubuntu.com/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 match="/command-line">
+            <xsl:text>file=file:/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+            <xsl:text> locale=</xsl:text>
+            <xsl:value-of select="config/l10n-language"/>
+            <xsl:text> keyboard-configuration/layoutcode=</xsl:text>
+            <xsl:value-of select="config/l10n-keyboard"/>
+            <xsl:text> hostname=</xsl:text>
+            <xsl:call-template name="hostname"/>
+            <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text>
+        </xsl:template>
+
+        <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 name="hostname">
+	  <xsl:choose>
+	    <xsl:when test="config/hostname != ''">
+              <xsl:value-of select="config/hostname"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ubuntu</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+<xsl:template match="/install-script-config">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:call-template name="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..3a5d248 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -1116,6 +1116,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.10">
@@ -1177,6 +1181,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.04">
@@ -1238,6 +1246,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.10">
@@ -1299,5 +1311,9 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 </libosinfo>
-- 
1.8.5.3



From gscrivan at redhat.com  Wed Mar  5 15:01:42 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:42 +0100
Subject: [Libosinfo] [PATCH v4 5/7] installer,
	windows: Add injection method info
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-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  Wed Mar  5 15:01:43 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:43 +0100
Subject: [Libosinfo] [PATCH v4 6/7] installer,
	fedora: Add injection method info
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-7-git-send-email-gscrivan@redhat.com>

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

diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml
index 0a5de10..c5b2383 100644
--- a/data/install-scripts/fedora.xml
+++ b/data/install-scripts/fedora.xml
@@ -11,6 +11,8 @@
       <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>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -161,6 +163,8 @@ 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>
     <avatar-format>
       <mime-type>image/png</mime-type>
     </avatar-format>
-- 
1.8.5.3



From gscrivan at redhat.com  Wed Mar  5 15:01:44 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed,  5 Mar 2014 16:01:44 +0100
Subject: [Libosinfo] [PATCH v4 7/7] installer,
	rhel: Add injection method info
In-Reply-To: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394031704-1143-8-git-send-email-gscrivan@redhat.com>

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

diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel.xml
index 840344b..3016878 100644
--- a/data/install-scripts/rhel.xml
+++ b/data/install-scripts/rhel.xml
@@ -11,6 +11,8 @@
       <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>
     <template>
       <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -110,6 +112,8 @@ 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>
     <avatar-format>
       <mime-type>image/png</mime-type>
     </avatar-format>
-- 
1.8.5.3



From zeeshanak at gnome.org  Wed Mar  5 16:16:29 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:16:29 +0000
Subject: [Libosinfo] [PATCH v4 1/7] install_scripts: Add
 get_supported_injection_method API
In-Reply-To: <1394031704-1143-2-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-2-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFNqyussSh6LzFvpb3a1OSGyK05ezmmxK9+UzmSvgckT_Q@mail.gmail.com>

Hi,

Apart from some nitpicks below, looks good. ACK with or without
suggested changes.

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> The API allows to query how it is possible to use the script from the
> installation process.

Sounds a bit vague. "use the script from the installation process" ->
"inject the script into the installation process"? 'it is possible'
part is redundant IMO.

> @@ -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.

"is is possible" part redundant here too.



From zeeshanak at gnome.org  Wed Mar  5 16:17:09 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:17:09 +0000
Subject: [Libosinfo] [PATCH v4 2/7] osinfo-install-script: support
	--list-injection-methods
In-Reply-To: <1394031704-1143-3-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-3-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFNep6LzKPjuiZ61v7-Cr0-Nza3fKPKi=G7+PVO9FSCduw@mail.gmail.com>

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 16:19:35 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:19:35 +0000
Subject: [Libosinfo] [PATCH v4 3/7] debian: add installer script
In-Reply-To: <1394031704-1143-4-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-4-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFN8FUquwec6TtSoKMWiJoC2jM1sS_4O4FA-e+_G_cw4GA@mail.gmail.com>

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

Looks good. One question below.

>  data/install-scripts/Makefile.am |  1 +
>  data/install-scripts/debian.xml  | 73 ++++++++++++++++++++++++++++++++++++++++
>  data/oses/debian.xml.in          | 12 +++++++
>  3 files changed, 86 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..e826cc1
> --- /dev/null
> +++ b/data/install-scripts/debian.xml
> @@ -0,0 +1,73 @@
> +<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="/command-line">
> +            <xsl:text>file=/</xsl:text>
> +            <xsl:value-of select="script/expected-filename"/>
> +            <xsl:text> debian-installer/locale=</xsl:text>
> +            <xsl:value-of select="config/l10n-language"/>
> +            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
> +            <xsl:value-of select="config/l10n-keyboard"/>
> +            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>

Do you really need to set all the configs on commandline while they
are being set from script itself?


-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 16:20:00 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:20:00 +0000
Subject: [Libosinfo] [PATCH v4 6/7] installer,
 fedora: Add injection method info
In-Reply-To: <1394031704-1143-7-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-7-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFOYwNr3LbJHaRX19Q8YNz6OUu=fn+PbzQZoEzPuXgWDRg@mail.gmail.com>

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK



From zeeshanak at gnome.org  Wed Mar  5 16:22:34 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:22:34 +0000
Subject: [Libosinfo] [PATCH v4 6/7] installer,
 fedora: Add injection method info
In-Reply-To: <CAAa3hFOYwNr3LbJHaRX19Q8YNz6OUu=fn+PbzQZoEzPuXgWDRg@mail.gmail.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-7-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOYwNr3LbJHaRX19Q8YNz6OUu=fn+PbzQZoEzPuXgWDRg@mail.gmail.com>
Message-ID: <CAAa3hFPwLtizyhJ+Z9WqpOv-0Rpu1NbJkT8trRmYitk1Av=4hg@mail.gmail.com>

On Wed, Mar 5, 2014 at 4:20 PM, Zeeshan Ali (Khattak)
<zeeshanak at gnome.org> wrote:
> On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>
> ACK

Oh wait a minute. Fedora script also supports script injected from
other disks (e.g usb stick) and in fact that is what Boxes does
currently. So I take the ACK back.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 16:23:05 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:23:05 +0000
Subject: [Libosinfo] [PATCH v4 7/7] installer,
	rhel: Add injection method info
In-Reply-To: <1394031704-1143-8-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-8-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFNYF35UnZL5M=LWEniFxB4x_-u3KYaq3mYNRirqr2iXuw@mail.gmail.com>

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

Same comment as for Fedora.


-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 16:24:13 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:24:13 +0000
Subject: [Libosinfo] [PATCH v4 4/7] ubuntu: Add jeos install-script
 (version >= 12.04)
In-Reply-To: <1394031704-1143-5-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-5-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFN=DrO7yUvX+pyrVXabj+LHGyeU2L3WJ1g-G01unhVfKw@mail.gmail.com>

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>
> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
> Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

Looks good but same question about commandline as for debian.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 16:25:11 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 16:25:11 +0000
Subject: [Libosinfo] [PATCH v4 5/7] installer,
 windows: Add injection method info
In-Reply-To: <1394031704-1143-6-git-send-email-gscrivan@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-6-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFNo2EFnNK4uTksbBX1vJT=i6h3Jw13RX6jPvYeQRw54xw@mail.gmail.com>

On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK



From gscrivan at redhat.com  Wed Mar  5 20:16:01 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 05 Mar 2014 21:16:01 +0100
Subject: [Libosinfo] [PATCH v4 3/7] debian: add installer script
In-Reply-To: <CAAa3hFN8FUquwec6TtSoKMWiJoC2jM1sS_4O4FA-e+_G_cw4GA@mail.gmail.com>
	(Zeeshan Ali's message of "Wed, 5 Mar 2014 16:19:35 +0000")
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFN8FUquwec6TtSoKMWiJoC2jM1sS_4O4FA-e+_G_cw4GA@mail.gmail.com>
Message-ID: <87mwh4h05a.fsf@redhat.com>

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

>> +        <xsl:template match="/command-line">
>> +            <xsl:text>file=/</xsl:text>
>> +            <xsl:value-of select="script/expected-filename"/>
>> +            <xsl:text> debian-installer/locale=</xsl:text>
>> +            <xsl:value-of select="config/l10n-language"/>
>> +            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
>> +            <xsl:value-of select="config/l10n-keyboard"/>
>> +            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
>
> Do you really need to set all the configs on commandline while they
> are being set from script itself?

I've got to this result by iteratively testing the different versions
and adding to the commandline anything needed to get it working.  I am
not sure this is the minimal set of arguments needed, but it seemed to
work with the versions I've tried.

Giuseppe



From gscrivan at redhat.com  Wed Mar  5 20:17:01 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 05 Mar 2014 21:17:01 +0100
Subject: [Libosinfo] [PATCH v4 6/7] installer,
	fedora: Add injection method info
In-Reply-To: <CAAa3hFPwLtizyhJ+Z9WqpOv-0Rpu1NbJkT8trRmYitk1Av=4hg@mail.gmail.com>
	(Zeeshan Ali's message of "Wed, 5 Mar 2014 16:22:34 +0000")
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-7-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOYwNr3LbJHaRX19Q8YNz6OUu=fn+PbzQZoEzPuXgWDRg@mail.gmail.com>
	<CAAa3hFPwLtizyhJ+Z9WqpOv-0Rpu1NbJkT8trRmYitk1Av=4hg@mail.gmail.com>
Message-ID: <87iorsh03m.fsf@redhat.com>

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

> On Wed, Mar 5, 2014 at 4:20 PM, Zeeshan Ali (Khattak)
> <zeeshanak at gnome.org> wrote:
>> On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>>> ---
>>
>> ACK
>
> Oh wait a minute. Fedora script also supports script injected from
> other disks (e.g usb stick) and in fact that is what Boxes does
> currently. So I take the ACK back.

do we need another injection method?  USB storage?

Giuseppe



From gscrivan at redhat.com  Wed Mar  5 20:21:35 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Wed, 05 Mar 2014 21:21:35 +0100
Subject: [Libosinfo] [PATCH v4 4/7] ubuntu: Add jeos install-script
	(version >= 12.04)
In-Reply-To: <CAAa3hFN=DrO7yUvX+pyrVXabj+LHGyeU2L3WJ1g-G01unhVfKw@mail.gmail.com>
	(Zeeshan Ali's message of "Wed, 5 Mar 2014 16:24:13 +0000")
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-5-git-send-email-gscrivan@redhat.com>
	<CAAa3hFN=DrO7yUvX+pyrVXabj+LHGyeU2L3WJ1g-G01unhVfKw@mail.gmail.com>
Message-ID: <87eh2ggzw0.fsf@redhat.com>

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

> On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>>
>> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
>> Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>
> Looks good but same question about commandline as for debian.

same method here, I kept adding arguments until I got it working for all
versions, though now there are less supported versions as I've dropped
the ones that are on old releases repository and need additional tweaks.


Regards,
Giuseppe




From zeeshanak at gnome.org  Wed Mar  5 20:49:03 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 20:49:03 +0000
Subject: [Libosinfo] [PATCH v4 3/7] debian: add installer script
In-Reply-To: <87mwh4h05a.fsf@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFN8FUquwec6TtSoKMWiJoC2jM1sS_4O4FA-e+_G_cw4GA@mail.gmail.com>
	<87mwh4h05a.fsf@redhat.com>
Message-ID: <CAAa3hFOTznT69OGW86CxbdvrNCA2qvZWs9ef1HvOb=ACMZEdgw@mail.gmail.com>

On Wed, Mar 5, 2014 at 8:16 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>>> +        <xsl:template match="/command-line">
>>> +            <xsl:text>file=/</xsl:text>
>>> +            <xsl:value-of select="script/expected-filename"/>
>>> +            <xsl:text> debian-installer/locale=</xsl:text>
>>> +            <xsl:value-of select="config/l10n-language"/>
>>> +            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
>>> +            <xsl:value-of select="config/l10n-keyboard"/>
>>> +            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
>>
>> Do you really need to set all the configs on commandline while they
>> are being set from script itself?
>
> I've got to this result by iteratively testing the different versions
> and adding to the commandline anything needed to get it working.  I am
> not sure this is the minimal set of arguments needed, but it seemed to
> work with the versions I've tried.

Fair enough. If you have actually tested with commandline actually
generated through this template, ACK.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 20:52:49 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 20:52:49 +0000
Subject: [Libosinfo] [PATCH v4 4/7] ubuntu: Add jeos install-script
 (version >= 12.04)
In-Reply-To: <87eh2ggzw0.fsf@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-5-git-send-email-gscrivan@redhat.com>
	<CAAa3hFN=DrO7yUvX+pyrVXabj+LHGyeU2L3WJ1g-G01unhVfKw@mail.gmail.com>
	<87eh2ggzw0.fsf@redhat.com>
Message-ID: <CAAa3hFO=pj3AkbWh2irV1-V5Jy_mrsnGxM24_p3pOyCmoY2MLw@mail.gmail.com>

On Wed, Mar 5, 2014 at 8:21 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>>>
>>> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
>>> Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
>>> ---
>>
>> Looks good but same question about commandline as for debian.
>
> same method here, I kept adding arguments until I got it working for all
> versions, though now there are less supported versions as I've dropped
> the ones that are on old releases repository and need additional tweaks.

OK. If the answer to my question on the debian patch is 'yes', ACK here too. :)

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Wed Mar  5 20:51:01 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 5 Mar 2014 20:51:01 +0000
Subject: [Libosinfo] [PATCH v4 6/7] installer,
 fedora: Add injection method info
In-Reply-To: <87iorsh03m.fsf@redhat.com>
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-7-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOYwNr3LbJHaRX19Q8YNz6OUu=fn+PbzQZoEzPuXgWDRg@mail.gmail.com>
	<CAAa3hFPwLtizyhJ+Z9WqpOv-0Rpu1NbJkT8trRmYitk1Av=4hg@mail.gmail.com>
	<87iorsh03m.fsf@redhat.com>
Message-ID: <CAAa3hFPfn_eh+B6sAL08H1QjUy=qH4xuVHVo8n6hnop=x-6yyA@mail.gmail.com>

On Wed, Mar 5, 2014 at 8:17 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> On Wed, Mar 5, 2014 at 4:20 PM, Zeeshan Ali (Khattak)
>> <zeeshanak at gnome.org> wrote:
>>> On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>>>> ---
>>>
>>> ACK
>>
>> Oh wait a minute. Fedora script also supports script injected from
>> other disks (e.g usb stick) and in fact that is what Boxes does
>> currently. So I take the ACK back.
>
> do we need another injection method?

At least one, yes.

> USB storage?

How about just generic DISK?

Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Thu Mar  6 13:34:39 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 06 Mar 2014 14:34:39 +0100
Subject: [Libosinfo] [PATCH v4 6/7] installer,
	fedora: Add injection method info
In-Reply-To: <CAAa3hFPfn_eh+B6sAL08H1QjUy=qH4xuVHVo8n6hnop=x-6yyA@mail.gmail.com>
	(Zeeshan Ali's message of "Wed, 5 Mar 2014 20:51:01 +0000")
References: <1394031704-1143-1-git-send-email-gscrivan@redhat.com>
	<1394031704-1143-7-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOYwNr3LbJHaRX19Q8YNz6OUu=fn+PbzQZoEzPuXgWDRg@mail.gmail.com>
	<CAAa3hFPwLtizyhJ+Z9WqpOv-0Rpu1NbJkT8trRmYitk1Av=4hg@mail.gmail.com>
	<87iorsh03m.fsf@redhat.com>
	<CAAa3hFPfn_eh+B6sAL08H1QjUy=qH4xuVHVo8n6hnop=x-6yyA@mail.gmail.com>
Message-ID: <87wqg7fo28.fsf@redhat.com>

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

> On Wed, Mar 5, 2014 at 8:17 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>>
>>> On Wed, Mar 5, 2014 at 4:20 PM, Zeeshan Ali (Khattak)
>>> <zeeshanak at gnome.org> wrote:
>>>> On Wed, Mar 5, 2014 at 3:01 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>>>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>>>>> ---
>>>>
>>>> ACK
>>>
>>> Oh wait a minute. Fedora script also supports script injected from
>>> other disks (e.g usb stick) and in fact that is what Boxes does
>>> currently. So I take the ACK back.
>>
>> do we need another injection method?
>
> At least one, yes.
>
>> USB storage?
>
> How about just generic DISK?

ok, I've added a new DISK injection method and I'll include this change
in v5.

Thanks,
Giuseppe



From gscrivan at redhat.com  Thu Mar  6 15:22:46 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:46 +0100
Subject: [Libosinfo] [PATCH v5 0/7] Add get_supported_injection_method API
Message-ID: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>

changes in v5:

* Added DISK injection method
* Marked RHEL and Fedora to support DISK injection method
* Dropped installation script support for Debian 5
* Renamed Debian installation script to preseed.cfg

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

Giuseppe Scrivano (6):
  install_scripts: Add get_supported_injection_method API
  osinfo-install-script: support --list-injection-methods
  debian: add installer script
  installer,windows: Add injection method info
  installer,fedora: Add injection method info
  installer,rhel: Add injection method info

 data/install-scripts/Makefile.am          |   2 +
 data/install-scripts/debian.xml           |  73 ++++++++++++++
 data/install-scripts/fedora.xml           |   6 ++
 data/install-scripts/rhel.xml             |   6 ++
 data/install-scripts/ubuntu.xml           | 158 ++++++++++++++++++++++++++++++
 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                   |   8 ++
 data/oses/ubuntu.xml.in                   |  16 +++
 data/schemas/libosinfo.rng                |  11 +++
 osinfo/libosinfo.syms                     |   5 +
 osinfo/osinfo_install_script.c            |  20 +++-
 osinfo/osinfo_install_script.h            |  27 ++++-
 osinfo/osinfo_loader.c                    |  23 ++++-
 tools/osinfo-install-script.c             |  46 ++++++++-
 17 files changed, 400 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  Thu Mar  6 15:22:47 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:47 +0100
Subject: [Libosinfo] [PATCH v5 1/7] install_scripts: Add
	get_supported_injection_method API
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-2-git-send-email-gscrivan@redhat.com>

The API allows to query how to use the script from the installation
process.

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 | 27 ++++++++++++++++++++++++++-
 osinfo/osinfo_loader.c         | 23 +++++++++++++++++++++--
 5 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 0675217..b939954 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|disk|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..72d1887 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 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..e227ad5 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,28 @@ typedef enum {
     OSINFO_DEVICE_DRIVER_SIGNING_REQ_WARN
 } OsinfoDeviceDriverSigningReq;
 
+/**
+ * OsinfoInstallScriptSupportedInjectionMethod:
+ *
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_CDROM: Support injection of the
+ * installation script trough a CD-ROM.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_DISK: Support injection of the
+ * installation script trough a disk.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY: Support injection of the
+ * installation script trough a floppy disk.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD: Support injection of the
+ * installation script trough 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_DISK   = 1 << 1,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY = 1 << 2,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD = 1 << 3,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_WEB    = 1 << 4,
+} OsinfoInstallScriptSupportedInjectionMethod;
+
 GType osinfo_install_script_get_type(void);
 
 OsinfoInstallScript *osinfo_install_script_new(const gchar *id);
@@ -195,6 +218,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  Thu Mar  6 15:22:48 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:48 +0100
Subject: [Libosinfo] [PATCH v5 2/7] osinfo-install-script: support
	--list-injection-methods
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-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  Thu Mar  6 15:22:49 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:49 +0100
Subject: [Libosinfo] [PATCH v5 3/7] debian: add installer script
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-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  | 73 ++++++++++++++++++++++++++++++++++++++++
 data/oses/debian.xml.in          |  8 +++++
 3 files changed, 82 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..084dbd3
--- /dev/null
+++ b/data/install-scripts/debian.xml
@@ -0,0 +1,73 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://debian.org/scripts/debian/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>preseed.cfg</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="/command-line">
+            <xsl:text>file=/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+            <xsl:text> debian-installer/locale=</xsl:text>
+            <xsl:value-of select="config/l10n-language"/>
+            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
+            <xsl:value-of select="config/l10n-keyboard"/>
+            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
+        </xsl:template>
+
+<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..1ecb2dd 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -202,6 +202,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 +253,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  Thu Mar  6 15:22:50 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:50 +0100
Subject: [Libosinfo] [PATCH v5 4/7] ubuntu: Add jeos install-script (version
	>= 12.04)
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-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
Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/Makefile.am |   1 +
 data/install-scripts/ubuntu.xml  | 158 +++++++++++++++++++++++++++++++++++++++
 data/oses/ubuntu.xml.in          |  16 ++++
 3 files changed, 175 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..4403c3d
--- /dev/null
+++ b/data/install-scripts/ubuntu.xml
@@ -0,0 +1,158 @@
+<libosinfo version="0.0.1">
+  <!-- JEOS PROFILE -->
+  <install-script id='http://ubuntu.com/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 match="/command-line">
+            <xsl:text>file=file:/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+            <xsl:text> locale=</xsl:text>
+            <xsl:value-of select="config/l10n-language"/>
+            <xsl:text> keyboard-configuration/layoutcode=</xsl:text>
+            <xsl:value-of select="config/l10n-keyboard"/>
+            <xsl:text> hostname=</xsl:text>
+            <xsl:call-template name="hostname"/>
+            <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text>
+        </xsl:template>
+
+        <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 name="hostname">
+	  <xsl:choose>
+	    <xsl:when test="config/hostname != ''">
+              <xsl:value-of select="config/hostname"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ubuntu</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+<xsl:template match="/install-script-config">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:call-template name="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..3a5d248 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -1116,6 +1116,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.10">
@@ -1177,6 +1181,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.04">
@@ -1238,6 +1246,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.10">
@@ -1299,5 +1311,9 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 </libosinfo>
-- 
1.8.5.3



From gscrivan at redhat.com  Thu Mar  6 15:22:51 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:51 +0100
Subject: [Libosinfo] [PATCH v5 5/7] installer,
	windows: Add injection method info
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-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  Thu Mar  6 15:22:52 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:52 +0100
Subject: [Libosinfo] [PATCH v5 6/7] installer,
	fedora: Add injection method info
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-7-git-send-email-gscrivan@redhat.com>

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

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



From gscrivan at redhat.com  Thu Mar  6 15:22:53 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu,  6 Mar 2014 16:22:53 +0100
Subject: [Libosinfo] [PATCH v5 7/7] installer,
	rhel: Add injection method info
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394119373-32555-8-git-send-email-gscrivan@redhat.com>

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

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



From zeeshanak at gnome.org  Thu Mar  6 18:10:00 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 18:10:00 +0000
Subject: [Libosinfo] [PATCH v5 1/7] install_scripts: Add
 get_supported_injection_method API
In-Reply-To: <1394119373-32555-2-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-2-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFNh-WFkSUmdMLT_ndcyiKgYFLODNcDCAQjZwmP7oeh93Q@mail.gmail.com>

On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> The API allows to query how to use the script from the installation
> process.

So I take it that you didn't find my suggestion for commit log better.
:) ACK in any case.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar  6 18:11:10 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 18:11:10 +0000
Subject: [Libosinfo] [PATCH v5 2/7] osinfo-install-script: support
	--list-injection-methods
In-Reply-To: <1394119373-32555-3-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-3-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFNE0AVA59HMvxt2v4zo07=q9Qb9SjE0JgtGQ7a4W2kSmA@mail.gmail.com>

On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar  6 18:17:09 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 18:17:09 +0000
Subject: [Libosinfo] [PATCH v5 3/7] debian: add installer script
In-Reply-To: <1394119373-32555-4-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-4-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFOJMULNf4LA_r_Ah9S3SrY4_q+c4NU+PpvazQxTiqNLmA@mail.gmail.com>

On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK.

> +        <xsl:template match="/command-line">
> +            <xsl:text>file=/</xsl:text>
> +            <xsl:value-of select="script/expected-filename"/>
> +            <xsl:text> debian-installer/locale=</xsl:text>
> +            <xsl:value-of select="config/l10n-language"/>
> +            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
> +            <xsl:value-of select="config/l10n-keyboard"/>
> +            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
> +        </xsl:template>

If you could make virt-install get the commandline from here and test
it once again that way, that would be super awesome!

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar  6 18:18:02 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 18:18:02 +0000
Subject: [Libosinfo] [PATCH v5 4/7] ubuntu: Add jeos install-script
 (version >= 12.04)
In-Reply-To: <1394119373-32555-5-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-5-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMgv-bygAQW1LLjse2_Pu0i2e6kdj8UHpS4Z30Uv=1Zgg@mail.gmail.com>

On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> From: Fabiano Fid?ncio <fabiano at fidencio.org>
>
> script based on: https://github.com/clalancette/oz/tree/master/oz/auto
> Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar  6 18:19:25 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 18:19:25 +0000
Subject: [Libosinfo] [PATCH v5 5/7] installer,
 windows: Add injection method info
In-Reply-To: <1394119373-32555-6-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-6-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMbJEXwQkftiaK3n6U-v8OyWUHVmD4ogZpGzkEL4fqQWA@mail.gmail.com>

On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar  6 18:19:59 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 18:19:59 +0000
Subject: [Libosinfo] [PATCH v5 7/7] installer,
	rhel: Add injection method info
In-Reply-To: <1394119373-32555-8-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-8-git-send-email-gscrivan@redhat.com>
Message-ID: <CAAa3hFMwO5u7z+psrUF_CptQWZ2KjdCHjy6cuhsLjdUsqYwayw@mail.gmail.com>

On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Thu Mar  6 18:45:15 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 06 Mar 2014 19:45:15 +0100
Subject: [Libosinfo] [PATCH v5 3/7] debian: add installer script
In-Reply-To: <CAAa3hFOJMULNf4LA_r_Ah9S3SrY4_q+c4NU+PpvazQxTiqNLmA@mail.gmail.com>
	(Zeeshan Ali's message of "Thu, 6 Mar 2014 18:17:09 +0000")
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOJMULNf4LA_r_Ah9S3SrY4_q+c4NU+PpvazQxTiqNLmA@mail.gmail.com>
Message-ID: <877g87f9ok.fsf@redhat.com>

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

> On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>> ---
>
> ACK.
>
>> +        <xsl:template match="/command-line">
>> +            <xsl:text>file=/</xsl:text>
>> +            <xsl:value-of select="script/expected-filename"/>
>> +            <xsl:text> debian-installer/locale=</xsl:text>
>> +            <xsl:value-of select="config/l10n-language"/>
>> +            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
>> +            <xsl:value-of select="config/l10n-keyboard"/>
>> +            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
>> +        </xsl:template>
>
> If you could make virt-install get the commandline from here and test
> it once again that way, that would be super awesome!

I am a bit worried about this information that will become obsolete at
some point.  What is in general the strategy used by libosinfo to deal
with this problem?

Thanks,
Giuseppe



From zeeshanak at gnome.org  Thu Mar  6 20:59:00 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 20:59:00 +0000
Subject: [Libosinfo] [PATCH v5 3/7] debian: add installer script
In-Reply-To: <877g87f9ok.fsf@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOJMULNf4LA_r_Ah9S3SrY4_q+c4NU+PpvazQxTiqNLmA@mail.gmail.com>
	<877g87f9ok.fsf@redhat.com>
Message-ID: <CAAa3hFP5pXY=zxL54MN73LqBrDK7wm=wfO2YCMSuz1CfabYi+Q@mail.gmail.com>

On Thu, Mar 6, 2014 at 6:45 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> On Thu, Mar 6, 2014 at 3:22 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>>> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
>>> ---
>>
>> ACK.
>>
>>> +        <xsl:template match="/command-line">
>>> +            <xsl:text>file=/</xsl:text>
>>> +            <xsl:value-of select="script/expected-filename"/>
>>> +            <xsl:text> debian-installer/locale=</xsl:text>
>>> +            <xsl:value-of select="config/l10n-language"/>
>>> +            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
>>> +            <xsl:value-of select="config/l10n-keyboard"/>
>>> +            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
>>> +        </xsl:template>
>>
>> If you could make virt-install get the commandline from here and test
>> it once again that way, that would be super awesome!
>
> I am a bit worried about this information that will become obsolete at
> some point.  What is in general the strategy used by libosinfo to deal
> with this problem?

The commandline? How will it  become obsolete?

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Thu Mar  6 21:06:36 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 06 Mar 2014 22:06:36 +0100
Subject: [Libosinfo] [PATCH v5 3/7] debian: add installer script
In-Reply-To: <CAAa3hFP5pXY=zxL54MN73LqBrDK7wm=wfO2YCMSuz1CfabYi+Q@mail.gmail.com>
	(Zeeshan Ali's message of "Thu, 6 Mar 2014 20:59:00 +0000")
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOJMULNf4LA_r_Ah9S3SrY4_q+c4NU+PpvazQxTiqNLmA@mail.gmail.com>
	<877g87f9ok.fsf@redhat.com>
	<CAAa3hFP5pXY=zxL54MN73LqBrDK7wm=wfO2YCMSuz1CfabYi+Q@mail.gmail.com>
Message-ID: <874n3bdokj.fsf@redhat.com>

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

>> I am a bit worried about this information that will become obsolete at
>> some point.  What is in general the strategy used by libosinfo to deal
>> with this problem?
>
> The commandline? How will it  become obsolete?

sorry not the commandline, my comment wasn't strictly related to this
patch  What I wanted to say is that, for example on Debian, files will
be moved to another location in future (as http://archive.debian.org/),
then the same installer script + same commandline will not work as they
do now.

Regards,
Giuseppe



From zeeshanak at gnome.org  Thu Mar  6 21:14:03 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 6 Mar 2014 21:14:03 +0000
Subject: [Libosinfo] [PATCH v5 3/7] debian: add installer script
In-Reply-To: <874n3bdokj.fsf@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394119373-32555-4-git-send-email-gscrivan@redhat.com>
	<CAAa3hFOJMULNf4LA_r_Ah9S3SrY4_q+c4NU+PpvazQxTiqNLmA@mail.gmail.com>
	<877g87f9ok.fsf@redhat.com>
	<CAAa3hFP5pXY=zxL54MN73LqBrDK7wm=wfO2YCMSuz1CfabYi+Q@mail.gmail.com>
	<874n3bdokj.fsf@redhat.com>
Message-ID: <CAAa3hFOJCDziXXFOVjJ2+xkUnEJzgHHgW8BH3h6j1sEiZteHyw@mail.gmail.com>

On Thu, Mar 6, 2014 at 9:06 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>>> I am a bit worried about this information that will become obsolete at
>>> some point.  What is in general the strategy used by libosinfo to deal
>>> with this problem?
>>
>> The commandline? How will it  become obsolete?
>
> sorry not the commandline, my comment wasn't strictly related to this
> patch  What I wanted to say is that, for example on Debian, files will
> be moved to another location in future (as http://archive.debian.org/),
> then the same installer script + same commandline will not work as they
> do now.

Don't know which files exactly you mean but we don't have any other
option but to change the data in libosinfo when that happens.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar  6 21:48:05 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:05 +0000
Subject: [Libosinfo] Debian & Ubuntu install scripts
In-Reply-To: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
Message-ID: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>

While I was about to push these patches on behalf of Guiseppe, I realized some things that could be improved in the api:

* 'The 'supported/SUPPORTED' part of these API seems very redundant and makes identifiers way too long.
* get_injection_method should be plural form: get_injection_methods.

These patches fixes/improves these issues.



From zeeshanak at gnome.org  Thu Mar  6 21:48:06 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:06 +0000
Subject: [Libosinfo] [v6 1/7] installer: Add get_injection_methods()
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-2-git-send-email-zeeshanak@gnome.org>

From: Giuseppe Scrivano <gscrivan at redhat.com>

The API allows applications to query the available methods to inject the
script to the installation process.

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

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 0675217..4f4edac 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='injection-method'/>
+        </zeroOrMore>
         <element name='template'>
           <choice>
             <group>
@@ -770,4 +773,12 @@
       </data>
     </element>
   </define>
+
+  <define name='injection-method'>
+    <element name='injection-method'>
+      <data type="string">
+        <param name="pattern">cdrom|disk|floppy|initrd|web</param>
+      </data>
+    </element>
+  </define>
 </grammar>
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index c3b967c..abcc8bb 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_injection_methods;
+	osinfo_install_script_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..1a0b579 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,23 @@ int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri
          OSINFO_DEVICE_DRIVER_SIGNING_REQ_NONE);
 }
 
+/**
+ * osinfo_install_script_get_injection_methods:
+ * @script: the install script
+ *
+ * Retrieve the supported method to inject the script in to the installation process.
+ *
+ * Returns: (type OsinfoInstallScriptInjectionMethod): bitwise-or of
+ * supported methods for install script injection.
+ */
+unsigned int osinfo_install_script_get_injection_methods(OsinfoInstallScript *script)
+{
+    return osinfo_entity_get_param_value_int64_with_default
+        (OSINFO_ENTITY(script),
+         OSINFO_INSTALL_SCRIPT_PROP_INJECTION_METHOD,
+         0);
+}
+
 
 /*
  * Local variables:
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index c39b786..d328a96 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_INJECTION_METHOD "injection-method"
 
 /* object */
 struct _OsinfoInstallScript
@@ -113,6 +114,28 @@ typedef enum {
     OSINFO_DEVICE_DRIVER_SIGNING_REQ_WARN
 } OsinfoDeviceDriverSigningReq;
 
+/**
+ * OsinfoInstallScriptInjectionMethod:
+ *
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_CDROM: Support injection of the
+ * installation script trough a CD-ROM.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_DISK: Support injection of the
+ * installation script trough a disk.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY: Support injection of the
+ * installation script trough a floppy disk.
+ * @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD: Support injection of the
+ * installation script trough 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_DISK   = 1 << 1,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_FLOPPY = 1 << 2,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD = 1 << 3,
+    OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_WEB    = 1 << 4,
+} OsinfoInstallScriptInjectionMethod;
+
 GType osinfo_install_script_get_type(void);
 
 OsinfoInstallScript *osinfo_install_script_new(const gchar *id);
@@ -195,6 +218,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_injection_methods(OsinfoInstallScript *script);
+
 #endif /* __OSINFO_INSTALL_SCRIPT_H__ */
 /*
  * Local variables:
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index e9ce8e1..aa5e48f 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("./injection-method", ctxt, &nodes, err);
+    if (error_is_set(err))
+        goto error;
+
+    flags_class = g_type_class_ref(OSINFO_TYPE_INSTALL_SCRIPT_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_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 zeeshanak at gnome.org  Thu Mar  6 21:48:07 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:07 +0000
Subject: [Libosinfo] [v6 2/7] osinfo-install-script: support
	--list-injection-methods
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-3-git-send-email-zeeshanak@gnome.org>

From: Giuseppe Scrivano <gscrivan at 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..4191629 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_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_injection_methods(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 zeeshanak at gnome.org  Thu Mar  6 21:48:08 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:08 +0000
Subject: [Libosinfo] [v6 3/7] debian: add installer script
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-4-git-send-email-zeeshanak@gnome.org>

From: Giuseppe Scrivano <gscrivan at redhat.com>

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/Makefile.am |  1 +
 data/install-scripts/debian.xml  | 73 ++++++++++++++++++++++++++++++++++++++++
 data/oses/debian.xml.in          |  8 +++++
 3 files changed, 82 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..c5c8592
--- /dev/null
+++ b/data/install-scripts/debian.xml
@@ -0,0 +1,73 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://debian.org/scripts/debian/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>preseed.cfg</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>
+    <injection-method>initrd</injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template match="/command-line">
+            <xsl:text>file=/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+            <xsl:text> debian-installer/locale=</xsl:text>
+            <xsl:value-of select="config/l10n-language"/>
+            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
+            <xsl:value-of select="config/l10n-keyboard"/>
+            <xsl:text> auto-install/enableconsole-setup/ask_detect=false debconf/priority=critical netcfg/choose_interface=auto</xsl:text>
+        </xsl:template>
+
+<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..1ecb2dd 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -202,6 +202,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 +253,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 zeeshanak at gnome.org  Thu Mar  6 21:48:09 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:09 +0000
Subject: [Libosinfo] [v6 4/7] ubuntu: Add jeos install-script (version >=
	12.04)
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-5-git-send-email-zeeshanak@gnome.org>

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

script based on: https://github.com/clalancette/oz/tree/master/oz/auto
Co-Author: Giuseppe Scrivano <gscrivan at redhat.com>
---
 data/install-scripts/Makefile.am |   1 +
 data/install-scripts/ubuntu.xml  | 158 +++++++++++++++++++++++++++++++++++++++
 data/oses/ubuntu.xml.in          |  16 ++++
 3 files changed, 175 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..86987b8
--- /dev/null
+++ b/data/install-scripts/ubuntu.xml
@@ -0,0 +1,158 @@
+<libosinfo version="0.0.1">
+  <!-- JEOS PROFILE -->
+  <install-script id='http://ubuntu.com/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>
+    <injection-method>initrd</injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template match="/command-line">
+            <xsl:text>file=file:/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+            <xsl:text> locale=</xsl:text>
+            <xsl:value-of select="config/l10n-language"/>
+            <xsl:text> keyboard-configuration/layoutcode=</xsl:text>
+            <xsl:value-of select="config/l10n-keyboard"/>
+            <xsl:text> hostname=</xsl:text>
+            <xsl:call-template name="hostname"/>
+            <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text>
+        </xsl:template>
+
+        <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 name="hostname">
+	  <xsl:choose>
+	    <xsl:when test="config/hostname != ''">
+              <xsl:value-of select="config/hostname"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ubuntu</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+<xsl:template match="/install-script-config">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:call-template name="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..3a5d248 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -1116,6 +1116,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/12.10">
@@ -1177,6 +1181,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.04">
@@ -1238,6 +1246,10 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 
   <os id="http://ubuntu.com/ubuntu/13.10">
@@ -1299,5 +1311,9 @@
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
     </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
   </os>
 </libosinfo>
-- 
1.8.5.3



From zeeshanak at gnome.org  Thu Mar  6 21:48:10 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:10 +0000
Subject: [Libosinfo] [v6 5/7] installer,windows: Add injection method info
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-6-git-send-email-zeeshanak@gnome.org>

From: Giuseppe Scrivano <gscrivan at 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..6059a98 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>
+    <injection-method>floppy</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..c7bfa27 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>
+    <injection-method>floppy</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..dc28533 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>
+    <injection-method>floppy</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>
+    <injection-method>floppy</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..618fa47 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>
+    <injection-method>floppy</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>
+    <injection-method>floppy</injection-method>
     <template>
      <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-- 
1.8.5.3



From zeeshanak at gnome.org  Thu Mar  6 21:48:11 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:11 +0000
Subject: [Libosinfo] [v6 6/7] installer,fedora: Add injection method info
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-7-git-send-email-zeeshanak@gnome.org>

From: Giuseppe Scrivano <gscrivan at redhat.com>

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

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



From zeeshanak at gnome.org  Thu Mar  6 21:48:12 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu,  6 Mar 2014 21:48:12 +0000
Subject: [Libosinfo] [v6 7/7] installer,rhel: Add injection method info
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1394142492-329-8-git-send-email-zeeshanak@gnome.org>

From: Giuseppe Scrivano <gscrivan at redhat.com>

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

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



From gscrivan at redhat.com  Sun Mar  9 12:36:42 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Sun, 09 Mar 2014 13:36:42 +0100
Subject: [Libosinfo] Debian & Ubuntu install scripts
In-Reply-To: <1394142492-329-1-git-send-email-zeeshanak@gnome.org> (Zeeshan
	Ali's message of "Thu, 6 Mar 2014 21:48:05 +0000")
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <87y50jblb9.fsf@redhat.com>

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

> While I was about to push these patches on behalf of Guiseppe, I realized some things that could be improved in the api:
>
> * 'The 'supported/SUPPORTED' part of these API seems very redundant and makes identifiers way too long.
> * get_injection_method should be plural form: get_injection_methods.
>
> These patches fixes/improves these issues.

thanks for these fixes.  I've tested these changes again trough the
Python binding and they seem to work as expected.  Is something more
holding this series?

Thanks,
Giuseppe



From zeeshanak at gnome.org  Sun Mar  9 18:23:21 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Sun, 9 Mar 2014 18:23:21 +0000
Subject: [Libosinfo] Debian & Ubuntu install scripts
In-Reply-To: <87y50jblb9.fsf@redhat.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
	<87y50jblb9.fsf@redhat.com>
Message-ID: <CAAa3hFMJPHY-9sP0zF3MobxNVAW5n2=TdO+goTNbYR-SShQpgw@mail.gmail.com>

On Sun, Mar 9, 2014 at 12:36 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> While I was about to push these patches on behalf of Guiseppe, I realized some things that could be improved in the api:
>>
>> * 'The 'supported/SUPPORTED' part of these API seems very redundant and makes identifiers way too long.
>> * get_injection_method should be plural form: get_injection_methods.
>>
>> These patches fixes/improves these issues.
>
> thanks for these fixes.  I've tested these changes again trough the
> Python binding and they seem to work as expected.

Cool, thanks for testing.

> Is something more
> holding this series?

No, just need an ACK after my changes. :)

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Mon Mar 10 22:37:02 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Mon, 10 Mar 2014 22:37:02 +0000
Subject: [Libosinfo] Debian & Ubuntu install scripts
In-Reply-To: <CAAa3hFMJPHY-9sP0zF3MobxNVAW5n2=TdO+goTNbYR-SShQpgw@mail.gmail.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
	<87y50jblb9.fsf@redhat.com>
	<CAAa3hFMJPHY-9sP0zF3MobxNVAW5n2=TdO+goTNbYR-SShQpgw@mail.gmail.com>
Message-ID: <CAAa3hFP1b32tXaso1CdGDPF=k2Qz-hM1MO6VH1WRvA-fP9_gpg@mail.gmail.com>

On Sun, Mar 9, 2014 at 6:23 PM, Zeeshan Ali (Khattak)
<zeeshanak at gnome.org> wrote:
> On Sun, Mar 9, 2014 at 12:36 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
>> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>>
>>> While I was about to push these patches on behalf of Guiseppe, I realized some things that could be improved in the api:
>>>
>>> * 'The 'supported/SUPPORTED' part of these API seems very redundant and makes identifiers way too long.
>>> * get_injection_method should be plural form: get_injection_methods.
>>>
>>> These patches fixes/improves these issues.
>>
>> thanks for these fixes.  I've tested these changes again trough the
>> Python binding and they seem to work as expected.
>
> Cool, thanks for testing.
>
>> Is something more
>> holding this series?
>
> No, just need an ACK after my changes. :)

And still need it btw. :)

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From fabiano at fidencio.org  Mon Mar 10 23:00:18 2014
From: fabiano at fidencio.org (=?ISO-8859-1?Q?Fabiano_Fid=EAncio?=)
Date: Tue, 11 Mar 2014 00:00:18 +0100
Subject: [Libosinfo] Debian & Ubuntu install scripts
In-Reply-To: <CAAa3hFP1b32tXaso1CdGDPF=k2Qz-hM1MO6VH1WRvA-fP9_gpg@mail.gmail.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
	<87y50jblb9.fsf@redhat.com>
	<CAAa3hFMJPHY-9sP0zF3MobxNVAW5n2=TdO+goTNbYR-SShQpgw@mail.gmail.com>
	<CAAa3hFP1b32tXaso1CdGDPF=k2Qz-hM1MO6VH1WRvA-fP9_gpg@mail.gmail.com>
Message-ID: <CAK9pz9+yG7BQ00o-xcCAVuv+6VFjDWAWzsE5jHU=yLsvkfPndg@mail.gmail.com>

On Mon, Mar 10, 2014 at 11:37 PM, Zeeshan Ali (Khattak) <zeeshanak at gnome.org
> wrote:

> On Sun, Mar 9, 2014 at 6:23 PM, Zeeshan Ali (Khattak)
> <zeeshanak at gnome.org> wrote:
> > On Sun, Mar 9, 2014 at 12:36 PM, Giuseppe Scrivano <gscrivan at redhat.com>
> wrote:
> >> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
> >>
> >>> While I was about to push these patches on behalf of Guiseppe, I
> realized some things that could be improved in the api:
> >>>
> >>> * 'The 'supported/SUPPORTED' part of these API seems very redundant
> and makes identifiers way too long.
> >>> * get_injection_method should be plural form: get_injection_methods.
> >>>
> >>> These patches fixes/improves these issues.
> >>
> >> thanks for these fixes.  I've tested these changes again trough the
> >> Python binding and they seem to work as expected.
> >
> > Cool, thanks for testing.
> >
> >> Is something more
> >> holding this series?
> >
> > No, just need an ACK after my changes. :)
>
> And still need it btw. :)
>

"I've tested these changes again trough the
Python binding and they seem to work as expected".

So, go ahead and push it.


Best Regards,
-- 
Fabiano Fid?ncio
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20140311/52d18bff/attachment.htm>

From zeeshanak at gnome.org  Tue Mar 11 13:44:05 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Tue, 11 Mar 2014 13:44:05 +0000
Subject: [Libosinfo] Debian & Ubuntu install scripts
In-Reply-To: <CAK9pz9+yG7BQ00o-xcCAVuv+6VFjDWAWzsE5jHU=yLsvkfPndg@mail.gmail.com>
References: <1394119373-32555-1-git-send-email-gscrivan@redhat.com>
	<1394142492-329-1-git-send-email-zeeshanak@gnome.org>
	<87y50jblb9.fsf@redhat.com>
	<CAAa3hFMJPHY-9sP0zF3MobxNVAW5n2=TdO+goTNbYR-SShQpgw@mail.gmail.com>
	<CAAa3hFP1b32tXaso1CdGDPF=k2Qz-hM1MO6VH1WRvA-fP9_gpg@mail.gmail.com>
	<CAK9pz9+yG7BQ00o-xcCAVuv+6VFjDWAWzsE5jHU=yLsvkfPndg@mail.gmail.com>
Message-ID: <CAAa3hFOX03Fu5snZCozY2AiaU8zseArPKa+A57DAGiX-zLwgXg@mail.gmail.com>

On Mon, Mar 10, 2014 at 11:00 PM, Fabiano Fid?ncio <fabiano at fidencio.org> wrote:
>
>
>
> On Mon, Mar 10, 2014 at 11:37 PM, Zeeshan Ali (Khattak)
> <zeeshanak at gnome.org> wrote:
>>
>> On Sun, Mar 9, 2014 at 6:23 PM, Zeeshan Ali (Khattak)
>> <zeeshanak at gnome.org> wrote:
>> > On Sun, Mar 9, 2014 at 12:36 PM, Giuseppe Scrivano <gscrivan at redhat.com>
>> > wrote:
>> >> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>> >>
>> >>> While I was about to push these patches on behalf of Guiseppe, I
>> >>> realized some things that could be improved in the api:
>> >>>
>> >>> * 'The 'supported/SUPPORTED' part of these API seems very redundant
>> >>> and makes identifiers way too long.
>> >>> * get_injection_method should be plural form: get_injection_methods.
>> >>>
>> >>> These patches fixes/improves these issues.
>> >>
>> >> thanks for these fixes.  I've tested these changes again trough the
>> >> Python binding and they seem to work as expected.
>> >
>> > Cool, thanks for testing.
>> >
>> >> Is something more
>> >> holding this series?
>> >
>> > No, just need an ACK after my changes. :)
>>
>> And still need it btw. :)
>
>
> "I've tested these changes again trough the
> Python binding and they seem to work as expected".
>
> So, go ahead and push it.

All pushed!

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From cfergeau at redhat.com  Thu Mar 13 16:34:51 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 13 Mar 2014 17:34:51 +0100
Subject: [Libosinfo] [PATCH] README: Fix typo
Message-ID: <1394728491-30401-1-git-send-email-cfergeau@redhat.com>

This fixes a typo in the 'Patch submission' header
---

Hey,

This patch counts as a trivial one, but I'm sending it as I'm not sure if I
should use "Patches submissions" or "Patch submissions". I've changed it to
"Patch submissions" for consistency with the rest of the text, but I prefer
to check it's correct.

Christophe

 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index a1a8d39..4a8b02e 100644
--- a/README
+++ b/README
@@ -29,8 +29,8 @@ Dependencies
   - gobject-introspection
   - Vala (build-time only)
 
-Patches sumissions
-==================
+Patch submissions
+=================
 
 Patch submissions are welcomed from any interested contributor. Please
 use the libosinfo list for any patch submissions, or discussions about
-- 
1.8.5.3



From eblake at redhat.com  Thu Mar 13 18:32:05 2014
From: eblake at redhat.com (Eric Blake)
Date: Thu, 13 Mar 2014 12:32:05 -0600
Subject: [Libosinfo] [PATCH] README: Fix typo
In-Reply-To: <1394728491-30401-1-git-send-email-cfergeau@redhat.com>
References: <1394728491-30401-1-git-send-email-cfergeau@redhat.com>
Message-ID: <5321F9A5.206@redhat.com>

On 03/13/2014 10:34 AM, Christophe Fergeau wrote:
> This fixes a typo in the 'Patch submission' header
> ---
> 
> Hey,
> 
> This patch counts as a trivial one, but I'm sending it as I'm not sure if I
> should use "Patches submissions" or "Patch submissions". I've changed it to
> "Patch submissions" for consistency with the rest of the text, but I prefer
> to check it's correct.

"Patch submissions" is best; anything else sounds awkward, except maybe
"submission of patches"

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20140313/bf38078d/attachment.sig>

From cfergeau at redhat.com  Fri Mar 14 08:12:35 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 14 Mar 2014 09:12:35 +0100
Subject: [Libosinfo] [PATCH] README: Fix typo
In-Reply-To: <5321F9A5.206@redhat.com>
References: <1394728491-30401-1-git-send-email-cfergeau@redhat.com>
	<5321F9A5.206@redhat.com>
Message-ID: <20140314081235.GB3475@teriyaki.redhat.com>

Hi,

On Thu, Mar 13, 2014 at 12:32:05PM -0600, Eric Blake wrote:
> On 03/13/2014 10:34 AM, Christophe Fergeau wrote:
> > This fixes a typo in the 'Patch submission' header
> > ---
> > 
> > Hey,
> > 
> > This patch counts as a trivial one, but I'm sending it as I'm not sure if I
> > should use "Patches submissions" or "Patch submissions". I've changed it to
> > "Patch submissions" for consistency with the rest of the text, but I prefer
> > to check it's correct.
> 
> "Patch submissions" is best; anything else sounds awkward, except maybe
> "submission of patches"

Thanks, I've pushed it this way then.

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/20140314/9e3dfc8f/attachment.sig>

From gscrivan at redhat.com  Mon Mar 17 14:20:44 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Mon, 17 Mar 2014 15:20:44 +0100
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values as
	strings
Message-ID: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>

Prefer xmlNewDocRawNode to xmlNewDocNode when the content is a raw
string.

Solves this problem:

$ osinfo-install-script rhel6.5 -c "admin-password=a&b"
error : unterminated entity reference               b

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 osinfo/osinfo_install_script.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 1a0b579..b6fe1ab 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -670,8 +670,8 @@ static xmlNodePtr osinfo_install_script_generate_entity_xml(OsinfoInstallScript
         goto error;
     }
 
-    if (!(data = xmlNewDocNode(NULL, NULL, (const xmlChar*)"id",
-                               (const xmlChar*)osinfo_entity_get_id(entity)))) {
+    if (!(data = xmlNewDocRawNode(NULL, NULL, (const xmlChar*)"id",
+                                  (const xmlChar*)osinfo_entity_get_id(entity)))) {
         xmlErrorPtr err = xmlGetLastError();
         g_set_error(error, 0, 0, _("Unable to create XML node 'id': '%s'"),
                     err ? err->message : "");
@@ -698,8 +698,8 @@ static xmlNodePtr osinfo_install_script_generate_entity_xml(OsinfoInstallScript
 
         tmp2 = values;
         while (tmp2) {
-            if (!(data = xmlNewDocNode(NULL, NULL, (const xmlChar*)tmp1->data,
-                                       (const xmlChar*)tmp2->data))) {
+            if (!(data = xmlNewDocRawNode(NULL, NULL, (const xmlChar*)tmp1->data,
+                                          (const xmlChar*)tmp2->data))) {
                 xmlErrorPtr err = xmlGetLastError();
                 g_set_error(error, 0, 0, _("Unable to create XML node '%s': '%s'"),
                             (const gchar *)tmp1->data, err ? err->message : "");
-- 
1.8.5.3



From cfergeau at redhat.com  Mon Mar 17 15:35:56 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 17 Mar 2014 16:35:56 +0100
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values
 as strings
In-Reply-To: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
References: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
Message-ID: <20140317153556.GP3475@teriyaki.redhat.com>

On Mon, Mar 17, 2014 at 03:20:44PM +0100, Giuseppe Scrivano wrote:
> Prefer xmlNewDocRawNode to xmlNewDocNode when the content is a raw
> string.
> 
> Solves this problem:
> 
> $ osinfo-install-script rhel6.5 -c "admin-password=a&b"
> error : unterminated entity reference               b


Shouldn't we be XML-escaping user-input instead (
xmlEncodeEntitiesReentrant() ) ?

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/20140317/c2bf6ba2/attachment.sig>

From gscrivan at redhat.com  Mon Mar 17 16:00:16 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Mon, 17 Mar 2014 17:00:16 +0100
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values
	as strings
In-Reply-To: <20140317153556.GP3475@teriyaki.redhat.com> (Christophe Fergeau's
	message of "Mon, 17 Mar 2014 16:35:56 +0100")
References: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
	<20140317153556.GP3475@teriyaki.redhat.com>
Message-ID: <874n2whl2n.fsf@redhat.com>

Christophe Fergeau <cfergeau at redhat.com> writes:

>> Solves this problem:
>> 
>> $ osinfo-install-script rhel6.5 -c "admin-password=a&b"
>> error : unterminated entity reference               b
>
>
> Shouldn't we be XML-escaping user-input instead (
> xmlEncodeEntitiesReentrant() ) ?

the same would happen, for example, if the password is generated
randomly.  If you try enough times the same command without the
'-c "admin-password=a&b"' part, you will hit the same problem at some
point.  I think it is safer to fix it at this level.

Regards,
Giuseppe



From gscrivan at redhat.com  Thu Mar 20 13:10:25 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 20 Mar 2014 14:10:25 +0100
Subject: [Libosinfo] next release?
Message-ID: <87a9clc8xq.fsf@redhat.com>

Hi,

it hasn't been a long time since the last release but there are some
fixes that would be nice to have in a release, and some work in
virt-manager depends on those.

Is the next release already planned?

Thanks,
Giuseppe



From zeeshanak at gnome.org  Thu Mar 20 13:38:56 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 20 Mar 2014 13:38:56 +0000
Subject: [Libosinfo] next release?
In-Reply-To: <87a9clc8xq.fsf@redhat.com>
References: <87a9clc8xq.fsf@redhat.com>
Message-ID: <CAAa3hFM_4DvR7F-ms1id3m4t1gu-r6F72FoCUawNYPyj-pYApQ@mail.gmail.com>

On Thu, Mar 20, 2014 at 1:10 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> Hi,

Hello,

> it hasn't been a long time since the last release but there are some
> fixes that would be nice to have in a release, and some work in
> virt-manager depends on those.
>
> Is the next release already planned?

It never is. :) Usually its me who needs one and then I roll one out.
I can roll out one today, assuming its ok with Daniel.

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From gscrivan at redhat.com  Thu Mar 20 14:43:44 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 20 Mar 2014 15:43:44 +0100
Subject: [Libosinfo] next release?
In-Reply-To: <CAAa3hFM_4DvR7F-ms1id3m4t1gu-r6F72FoCUawNYPyj-pYApQ@mail.gmail.com>
	(Zeeshan Ali's message of "Thu, 20 Mar 2014 13:38:56 +0000")
References: <87a9clc8xq.fsf@redhat.com>
	<CAAa3hFM_4DvR7F-ms1id3m4t1gu-r6F72FoCUawNYPyj-pYApQ@mail.gmail.com>
Message-ID: <87txataq1r.fsf@redhat.com>

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

> It never is. :) Usually its me who needs one and then I roll one out.
> I can roll out one today, assuming its ok with Daniel.

that would be great.

There is a pending patch here:

  https://www.redhat.com/archives/libosinfo/2014-March/msg00073.html

but in any case I don't think it is worth of blocking a release.

Thanks,
Giuseppe



From cfergeau at redhat.com  Thu Mar 20 14:56:04 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 20 Mar 2014 15:56:04 +0100
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values
 as strings
In-Reply-To: <874n2whl2n.fsf@redhat.com>
References: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
	<20140317153556.GP3475@teriyaki.redhat.com>
	<874n2whl2n.fsf@redhat.com>
Message-ID: <20140320145604.GE12249@teriyaki.cdg.redhat.com>

On Mon, Mar 17, 2014 at 05:00:16PM +0100, Giuseppe Scrivano wrote:
> Christophe Fergeau <cfergeau at redhat.com> writes:
> 
> >> Solves this problem:
> >> 
> >> $ osinfo-install-script rhel6.5 -c "admin-password=a&b"
> >> error : unterminated entity reference               b
> >
> >
> > Shouldn't we be XML-escaping user-input instead (
> > xmlEncodeEntitiesReentrant() ) ?
> 
> the same would happen, for example, if the password is generated
> randomly.  If you try enough times the same command without the
> '-c "admin-password=a&b"' part, you will hit the same problem at some
> point.  I think it is safer to fix it at this level.

My initial thought was to fix this when this string is set on the
OsinfoInstallScriptConfig object, but there is no special code handling this parameter
in osinfo-install-script nor in OsinfoInstallScriptConfig, just generic
code setting an entity param, so this patch is probably the only place
where we can solve this.

However, I'm not familiar enough with the implications of using
this 'raw' node API to feel comfortable ACKing this :-/

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/20140320/29f9993f/attachment.sig>

From zeeshanak at gnome.org  Thu Mar 20 15:35:20 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 20 Mar 2014 15:35:20 +0000
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values
	as strings
In-Reply-To: <20140320145604.GE12249@teriyaki.cdg.redhat.com>
References: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
	<20140317153556.GP3475@teriyaki.redhat.com>
	<874n2whl2n.fsf@redhat.com>
	<20140320145604.GE12249@teriyaki.cdg.redhat.com>
Message-ID: <CAAa3hFOBa9b-UH=nC0xqOmhL5OuR064rpnSk2rUPu6jL106dSQ@mail.gmail.com>

On Thu, Mar 20, 2014 at 2:56 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> On Mon, Mar 17, 2014 at 05:00:16PM +0100, Giuseppe Scrivano wrote:
>> Christophe Fergeau <cfergeau at redhat.com> writes:
>>
>> >> Solves this problem:
>> >>
>> >> $ osinfo-install-script rhel6.5 -c "admin-password=a&b"
>> >> error : unterminated entity reference               b
>> >
>> >
>> > Shouldn't we be XML-escaping user-input instead (
>> > xmlEncodeEntitiesReentrant() ) ?
>>
>> the same would happen, for example, if the password is generated
>> randomly.  If you try enough times the same command without the
>> '-c "admin-password=a&b"' part, you will hit the same problem at some
>> point.  I think it is safer to fix it at this level.
>
> My initial thought was to fix this when this string is set on the
> OsinfoInstallScriptConfig object, but there is no special code handling this parameter
> in osinfo-install-script nor in OsinfoInstallScriptConfig, just generic
> code setting an entity param, so this patch is probably the only place
> where we can solve this.
>
> However, I'm not familiar enough with the implications of using
> this 'raw' node API to feel comfortable ACKing this :-/

Looking at the docs, it should be fine. Giuseppe, I assume you ensured
`make check` doesn't break with this?



From gscrivan at redhat.com  Thu Mar 20 16:09:28 2014
From: gscrivan at redhat.com (Giuseppe Scrivano)
Date: Thu, 20 Mar 2014 17:09:28 +0100
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values
	as strings
In-Reply-To: <CAAa3hFOBa9b-UH=nC0xqOmhL5OuR064rpnSk2rUPu6jL106dSQ@mail.gmail.com>
	(Zeeshan Ali's message of "Thu, 20 Mar 2014 15:35:20 +0000")
References: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
	<20140317153556.GP3475@teriyaki.redhat.com>
	<874n2whl2n.fsf@redhat.com>
	<20140320145604.GE12249@teriyaki.cdg.redhat.com>
	<CAAa3hFOBa9b-UH=nC0xqOmhL5OuR064rpnSk2rUPu6jL106dSQ@mail.gmail.com>
Message-ID: <87lhw4c0nb.fsf@redhat.com>

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

>> However, I'm not familiar enough with the implications of using
>> this 'raw' node API to feel comfortable ACKing this :-/
>
> Looking at the docs, it should be fine. Giuseppe, I assume you ensured
> `make check` doesn't break with this?

yes, sure:

$ git log --oneline -1
5d53e18 osinfo-install-script: read config values as strings

$ make -C test check

[......]

============================================================================
Testsuite summary for libosinfo 0.2.9
============================================================================
# TOTAL: 18
# PASS:  16
# SKIP:  2
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================

Giuseppe



From zeeshanak at gnome.org  Thu Mar 20 16:33:30 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 20 Mar 2014 16:33:30 +0000
Subject: [Libosinfo] [PATCH] osinfo-install-script: read config values
	as strings
In-Reply-To: <87lhw4c0nb.fsf@redhat.com>
References: <1395066044-30044-1-git-send-email-gscrivan@redhat.com>
	<20140317153556.GP3475@teriyaki.redhat.com>
	<874n2whl2n.fsf@redhat.com>
	<20140320145604.GE12249@teriyaki.cdg.redhat.com>
	<CAAa3hFOBa9b-UH=nC0xqOmhL5OuR064rpnSk2rUPu6jL106dSQ@mail.gmail.com>
	<87lhw4c0nb.fsf@redhat.com>
Message-ID: <CAAa3hFOJn6wv=e7BgVUvFdvgSDQi6W7KXxZRVthJstk5dvg=pw@mail.gmail.com>

On Thu, Mar 20, 2014 at 4:09 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>>> However, I'm not familiar enough with the implications of using
>>> this 'raw' node API to feel comfortable ACKing this :-/
>>
>> Looking at the docs, it should be fine. Giuseppe, I assume you ensured
>> `make check` doesn't break with this?
>
> yes, sure:
>
> $ git log --oneline -1
> 5d53e18 osinfo-install-script: read config values as strings
>
> $ make -C test check
>
> [......]
>
> ============================================================================
> Testsuite summary for libosinfo 0.2.9
> ============================================================================
> # TOTAL: 18
> # PASS:  16
> # SKIP:  2
> # XFAIL: 0
> # FAIL:  0
> # XPASS: 0
> # ERROR: 0
> ============================================================================

Cool, ACK then. Will push it soon.


-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From zeeshanak at gnome.org  Thu Mar 20 18:00:30 2014
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 20 Mar 2014 18:00:30 +0000
Subject: [Libosinfo] Libosinfo 0.2.10
Message-ID: <CAAa3hFNnFxZzhzQzhdt96DaxibCZtdLKCHavPUqthjjsKB7OYg@mail.gmail.com>

Libosinfo 0.2.10 is out!

Changes since 0.2.9:

- Add API and option to osinfo-install-script utility that allows you to query
  the available methods to inject the installer script to the installation
  process.
- Add JEOS installer scripts for Debian and Ubuntu.
- Disable installer script for Windows 8.1 as its known not to work.
- Allow XML special chars in installer script configuration values.
- Fix a few build issues.
- Add/improve/fix data on:
  - Debian
  - Fedora
  - FreeBSD
  - Mandrake
  - Mandriva
  - Microsoft Windows 7
  - openSUSE
  - Solaris
  - Ubuntu
  - Qemu

Release tarball available here for download:
http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.10.tar.gz
sha256 checksum:
564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d

What is libosinfo?
==================

libosinfo is a GObject based library API for managing information about
operating systems, hypervisors and the (virtual) hardware devices they can
support. It includes a database containing device metadata and provides APIs
to match/identify optimal devices for deploying an operating system on a
hypervisor. Via the magic of GObject Introspection, the API is available in all
common programming languages with demos for javascript (GJS/Seed) and python
(PyGObject). Also provided are Vala bindings.

libosinfo is Free Software and licenced under LGPLv2+.

Dependencies
============

- Required:
  - gobject-2.0
  - gio-2.0
  - libxml-2.0

- Optional:
  - gobject-introspection
  - Vala (build-time only)

For further information about libosinfo please consult the project homepage

   http://libosinfo.org/

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124



From crobinso at redhat.com  Wed Mar 26 00:54:53 2014
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 25 Mar 2014 20:54:53 -0400
Subject: [Libosinfo] [PATCH libosinfo] windows: Add some win7 and vista
	volume IDs
Message-ID: <0a0966a1d000338ea9d1a5ccb1966ca92177329e.1395795293.git.crobinso@redhat.com>

These are from DVD media I snagged off MSDN years ago.

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 data/oses/windows.xml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index b7d5c21..39d5b55 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -690,14 +690,14 @@
 
     <media arch="i686">
       <iso>
-        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL)_</volume-id>
+        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL)_</volume-id>
+        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL|FRMCXFRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -805,7 +805,7 @@
     <media arch="i686" installer-reboots="2">
       <variant id="ultimate"/>
       <iso>
-        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER)_</volume-id>
+        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -813,7 +813,7 @@
     <media arch="x86_64" installer-reboots="2">
       <variant id="ultimate"/>
       <iso>
-        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER)_</volume-id>
+        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GRMCNULXFRER)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
-- 
1.8.5.3



From cfergeau at redhat.com  Wed Mar 26 08:48:16 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 26 Mar 2014 09:48:16 +0100
Subject: [Libosinfo] [PATCH libosinfo] windows: Add some win7 and vista
 volume IDs
In-Reply-To: <0a0966a1d000338ea9d1a5ccb1966ca92177329e.1395795293.git.crobinso@redhat.com>
References: <0a0966a1d000338ea9d1a5ccb1966ca92177329e.1395795293.git.crobinso@redhat.com>
Message-ID: <20140326084816.GG12249@teriyaki.cdg.redhat.com>

Hey,

On Tue, Mar 25, 2014 at 08:54:53PM -0400, Cole Robinson wrote:
> These are from DVD media I snagged off MSDN years ago.

If you have these ISOs handy, can you also add the output of
isoinfo -d -i $isoname >$isoname.txt
to libosinfo/test/isodata/windows, and then check that 'make check' passes?

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/20140326/d51a398e/attachment.sig>

From crobinso at redhat.com  Wed Mar 26 11:39:05 2014
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 26 Mar 2014 07:39:05 -0400
Subject: [Libosinfo] [PATCH libosinfo] windows: Add some win7 and vista
 volume IDs
In-Reply-To: <20140326084816.GG12249@teriyaki.cdg.redhat.com>
References: <0a0966a1d000338ea9d1a5ccb1966ca92177329e.1395795293.git.crobinso@redhat.com>
	<20140326084816.GG12249@teriyaki.cdg.redhat.com>
Message-ID: <5332BC59.6080206@redhat.com>

On 03/26/2014 04:48 AM, Christophe Fergeau wrote:
> Hey,
> 
> On Tue, Mar 25, 2014 at 08:54:53PM -0400, Cole Robinson wrote:
>> These are from DVD media I snagged off MSDN years ago.
> 
> If you have these ISOs handy, can you also add the output of
> isoinfo -d -i $isoname >$isoname.txt
> to libosinfo/test/isodata/windows, and then check that 'make check' passes?
> 

Didn't notice that, will do.

Thanks,
Cole



From crobinso at redhat.com  Wed Mar 26 12:07:20 2014
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 26 Mar 2014 08:07:20 -0400
Subject: [Libosinfo] [PATCH libosinfo] .gitignore: Add generated mageia.xml
Message-ID: <6c8e5c9bb39743d094caa8c2d8eb37f6fea0f2c4.1395835635.git.crobinso@redhat.com>

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 02ac028..6093491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@ data/oses/dos.xml
 data/oses/fedora.xml
 data/oses/freebsd.xml
 data/oses/gnome.xml
+data/oses/mageia.xml
 data/oses/mandrake.xml
 data/oses/mandriva.xml
 data/oses/macos.xml
-- 
1.8.5.3



From crobinso at redhat.com  Wed Mar 26 12:08:08 2014
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 26 Mar 2014 08:08:08 -0400
Subject: [Libosinfo] [PATCH libosinfo v2] windows: Add some win7 and vista
	volume IDs
Message-ID: <0b2c76ee7fe61b1c49cb34f4650b892e156cd1ba.1395835633.git.crobinso@redhat.com>

These are from DVD media I snagged off MSDN years ago. Unforunately
I renamed them a long time ago and I don't know the original file
names, hence the generic 'unknown' in the test data names.

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
v2:
    Add test data

 data/oses/windows.xml.in                           |  8 +++---
 .../en_windows_7_ultimate_x64_dvd_unknown.iso.txt  | 29 ++++++++++++++++++++++
 .../win7/en_windows_7_ultimate_x64_dvd_unknown.lng |  2 ++
 .../en_windows_7_ultimate_x86_dvd_unknown.iso.txt  | 29 ++++++++++++++++++++++
 .../win7/en_windows_7_ultimate_x86_dvd_unknown.lng |  2 ++
 ...ise_with_service_pack_1_x64_dvd_unknown.iso.txt | 29 ++++++++++++++++++++++
 ...ise_with_service_pack_1_x86_dvd_unknown.iso.txt | 29 ++++++++++++++++++++++
 7 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
 create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
 create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index b7d5c21..39d5b55 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -690,14 +690,14 @@
 
     <media arch="i686">
       <iso>
-        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL)_</volume-id>
+        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL)_</volume-id>
+        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL|FRMCXFRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -805,7 +805,7 @@
     <media arch="i686" installer-reboots="2">
       <variant id="ultimate"/>
       <iso>
-        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER)_</volume-id>
+        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -813,7 +813,7 @@
     <media arch="x86_64" installer-reboots="2">
       <variant id="ultimate"/>
       <iso>
-        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER)_</volume-id>
+        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GRMCNULXFRER)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
new file mode 100644
index 0000000..fafea58
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNULXFRER_EN_DVD
+Volume set id: GRMCNULXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1420193
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
new file mode 100644
index 0000000..e46008a
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
@@ -0,0 +1,2 @@
+[general]
+l10n-language=en_US
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
new file mode 100644
index 0000000..cb98a99
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNULFRER_EN_DVD
+Volume set id: GRMCNULFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1088204
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
new file mode 100644
index 0000000..e46008a
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
@@ -0,0 +1,2 @@
+[general]
+l10n-language=en_US
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
new file mode 100644
index 0000000..fbd56e0
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: FRMCXFRE_EN_DVD
+Volume set id: FRMCXFRE_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1919276
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 261 609
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
new file mode 100644
index 0000000..81aa52e
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: FRMCFRE_EN_DVD
+Volume set id: FRMCFRE_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1506908
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 264 612
-- 
1.8.5.3



From cfergeau at redhat.com  Wed Mar 26 12:14:37 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 26 Mar 2014 13:14:37 +0100
Subject: [Libosinfo] [PATCH libosinfo] .gitignore: Add generated
 mageia.xml
In-Reply-To: <6c8e5c9bb39743d094caa8c2d8eb37f6fea0f2c4.1395835635.git.crobinso@redhat.com>
References: <6c8e5c9bb39743d094caa8c2d8eb37f6fea0f2c4.1395835635.git.crobinso@redhat.com>
Message-ID: <20140326121437.GR12249@teriyaki.cdg.redhat.com>

On Wed, Mar 26, 2014 at 08:07:20AM -0400, Cole Robinson wrote:
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  .gitignore | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.gitignore b/.gitignore
> index 02ac028..6093491 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -84,6 +84,7 @@ data/oses/dos.xml
>  data/oses/fedora.xml
>  data/oses/freebsd.xml
>  data/oses/gnome.xml
> +data/oses/mageia.xml
>  data/oses/mandrake.xml
>  data/oses/mandriva.xml
>  data/oses/macos.xml

data/oses/*.xml maybe? ACK to either version.

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/20140326/b831f03a/attachment.sig>

From cfergeau at redhat.com  Wed Mar 26 12:16:37 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 26 Mar 2014 13:16:37 +0100
Subject: [Libosinfo] [PATCH libosinfo v2] windows: Add some win7 and
 vista volume IDs
In-Reply-To: <0b2c76ee7fe61b1c49cb34f4650b892e156cd1ba.1395835633.git.crobinso@redhat.com>
References: <0b2c76ee7fe61b1c49cb34f4650b892e156cd1ba.1395835633.git.crobinso@redhat.com>
Message-ID: <20140326121637.GS12249@teriyaki.cdg.redhat.com>


On Wed, Mar 26, 2014 at 08:08:08AM -0400, Cole Robinson wrote:
> These are from DVD media I snagged off MSDN years ago. Unforunately

'Unfortunately'

ACK

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/20140326/a321e38e/attachment.sig>

From crobinso at redhat.com  Wed Mar 26 12:17:19 2014
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 26 Mar 2014 08:17:19 -0400
Subject: [Libosinfo] [PATCH libosinfo v2] windows: Add some win7 and
 vista volume IDs
In-Reply-To: <20140326121637.GS12249@teriyaki.cdg.redhat.com>
References: <0b2c76ee7fe61b1c49cb34f4650b892e156cd1ba.1395835633.git.crobinso@redhat.com>
	<20140326121637.GS12249@teriyaki.cdg.redhat.com>
Message-ID: <5332C54F.5050503@redhat.com>

On 03/26/2014 08:16 AM, Christophe Fergeau wrote:
> 
> On Wed, Mar 26, 2014 at 08:08:08AM -0400, Cole Robinson wrote:
>> These are from DVD media I snagged off MSDN years ago. Unforunately
> 
> 'Unfortunately'
> 
> ACK
> 
> Christophe
> 

Thanks for the review. I don't have commit access though, can you push? Feel
free to drop the gitignore patch in favor of the wildcard match if you want.

Thanks,
Cole



From cfergeau at redhat.com  Wed Mar 26 14:36:15 2014
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 26 Mar 2014 15:36:15 +0100
Subject: [Libosinfo] [PATCH libosinfo v2] windows: Add some win7 and
 vista volume IDs
In-Reply-To: <5332C54F.5050503@redhat.com>
References: <0b2c76ee7fe61b1c49cb34f4650b892e156cd1ba.1395835633.git.crobinso@redhat.com>
	<20140326121637.GS12249@teriyaki.cdg.redhat.com>
	<5332C54F.5050503@redhat.com>
Message-ID: <20140326143615.GV12249@teriyaki.cdg.redhat.com>

Hey,

On Wed, Mar 26, 2014 at 08:17:19AM -0400, Cole Robinson wrote:
> On 03/26/2014 08:16 AM, Christophe Fergeau wrote:
> > 
> > On Wed, Mar 26, 2014 at 08:08:08AM -0400, Cole Robinson wrote:
> >> These are from DVD media I snagged off MSDN years ago. Unforunately
> > 
> > 'Unfortunately'
> > 
> > ACK
> > 
> > Christophe
> > 
> 
> Thanks for the review. I don't have commit access though, can you push? Feel
> free to drop the gitignore patch in favor of the wildcard match if you want.

I've pushed that patch, and a data/oses/*.xml .gitignore one.

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/20140326/887a63f3/attachment.sig>