[Libosinfo] [PATCH 4/4] ubuntu: Add jeos install-script (version >= 6.06)

[Zeeshan Ali (Khattak)]

On Thu, Dec 5, 2013 at 8:37 PM, Giuseppe Scrivano <gscrivan at redhat.com> wrote:
> "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org> writes:
>
>> This is getting more and more doubtful. Can you please just test them?
>
> I was able to install the following versions without any error after I
> amended this patch[1]:

Cool, thanks for testing them.

> ubuntu8.04
> ubuntu8.10
> ubuntu9.04
> ubuntu9.10
> ubuntu10.04
> ubuntu10.10
> ubuntu11.04
> ubuntu11.10
> ubuntu12.04
> ubuntu12.10
> ubuntu13.04
>
> Instead with the following versions I have encountered different kind
> problems, like getting questions during the installation or problems to
> access the mirror:
>
> ubuntu6.06
> ubuntu6.10
> ubuntu7.04
> ubuntu7.10
>
> I don't think it is worth to try to find a solution for those old
> releases, perhaps we can just remove them for now and go only for those
> I've tested.

I agree and this is why I wanted generated scripts to be actually
tested so we don't claim support for express install when there
actually isn't any.

> I had to un-indent the XML file as trailing whitespaces seemed to
> disturb the installer for ubuntu8.04.  Is there any other way to achieve
> the same result (no trailing whitespaces) but still maintaining the XML
> indentation?

Not that I know of but then again I'm no expert on XSL. Daniel?

> Thanks,
> Giuseppe
>
> 1)
>
> diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu.xml
> index d5985ff..ba2e820 100644
> --- a/data/install-scripts/ubuntu.xml
> +++ b/data/install-scripts/ubuntu.xml
> @@ -41,15 +41,13 @@
>              </xsl:otherwise>
>            </xsl:choose>
>          </xsl:template>
> -
>          <xsl:template match="/install-script-config">
> -# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
>  d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/>
>  d-i console-setup/ask_detect boolean false
>  d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/>
>
>  d-i netcfg/choose_interface select auto
> -d-i netcfg/get_hostname string <xsl:value-of select="config/hostname"/>
> +d-i netcfg/get_hostname string <xsl:call-template name="hostname"/>
>  d-i netcfg/get_domain string unassigned-domain
>  d-i netcfg/wireless_wep string
>
> @@ -64,21 +62,21 @@ d-i partman-auto/init_automatically_partition select Use the largest continuous
>  </xsl:if>
>  d-i partman-auto/method string regular
>  <xsl:choose>
> -  <xsl:when test="os/version < 7.10">
> +<xsl:when test="os/version < 7.10">
>  d-i partman-auto/choose_recipe select Separate /home partition
> -  </xsl:when>
> -  <xsl:otherwise>
> +</xsl:when>
> +<xsl:otherwise>
>  d-i partman-auto/choose_recipe select home
> -  </xsl:otherwise>
> +</xsl:otherwise>
>  </xsl:choose>
>  d-i partman/confirm_write_new_label boolean true
>  <xsl:choose>
> -  <xsl:when test="os/version < 7.10">
> +<xsl:when test="os/version < 7.10">
>  d-i partman/choose_partition select Finish partitioning and write changes to disk
> -  </xsl:when>
> -  <xsl:otherwise>
> +</xsl:when>
> +<xsl:otherwise>
>  d-i partman/choose_partition select finish
> -  </xsl:otherwise>
> +</xsl:otherwise>
>  </xsl:choose>
>  d-i partman/confirm boolean true
>  <xsl:if test="os/version > 9.10">
> @@ -95,30 +93,30 @@ d-i pkgsel/install-language-support boolean false
>  </xsl:if>
>
>  <xsl:choose>
> -  <xsl:when test="os/version < 7.10">
> +<xsl:when test="os/version < 7.10">
>  tasksel tasksel/first multiselect ubuntu-standard, ubuntu-desktop
> -  </xsl:when>
> -  <xsl:otherwise>
> +</xsl:when>
> +<xsl:otherwise>
>  tasksel tasksel/first multiselect standard
> -  </xsl:otherwise>
> +</xsl:otherwise>
>  </xsl:choose>
>  <xsl:choose>
> -  <xsl:when test="os/version < 8.04">
> +<xsl:when test="os/version < 8.04">
>  d-i mirror/http/proxy string
> -  </xsl:when>
> -  <xsl:when test="os/version = 10.04">
> +</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">
> +</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 > 11.04">
> +</xsl:when>
> +<xsl:when test="os/version > 11.04">
>  d-i pkgsel/include/install-recommends boolean true
>  d-i pkgsel/include string openssh-server python-software-properties
> -  </xsl:when>
> +</xsl:when>
>  </xsl:choose>
>
>  d-i grub-installer/only_debian boolean true
> @@ -140,9 +138,8 @@ d-i prebaseconfig/reboot_in_progress note
>  <xsl:if test="os/version = 13.04">
>  ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/& [ "$prompt" ] || return 0/' /etc/init.d/casper
>  </xsl:if>
> -       </xsl:template>
> +</xsl:template>
>        </xsl:stylesheet>
>      </template>
>    </install-script>
> -
>  </libosinfo>



-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124