Re: [PATCH 1/4] debian: Add templates to JEOS script

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

 



On Tue, Jul 8, 2014 at 2:35 PM, Lasse Schuirmann
<lasse.schuirmann@xxxxxxxxx> wrote:
> This introduces default values so that no questions are asked if
> localization or target disk are not given or 'C'.

Description is good but shortlog is vague. 'templates' is just a
means. How about: debian: Assume defaults for l10n & disk

> ---
>  data/install-scripts/debian.xml | 52 +++++++++++++++++++++++++++++++++--------
>  1 file changed, 42 insertions(+), 10 deletions(-)
>
> diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml
> index c5c8592..e344bda 100644
> --- a/data/install-scripts/debian.xml
> +++ b/data/install-scripts/debian.xml
> @@ -1,4 +1,5 @@
>  <libosinfo version="0.0.1">
> +  <!-- JEOS PROFILE -->
>    <install-script id='http://debian.org/scripts/debian/jeos'>
>      <profile>jeos</profile>
>      <expected-filename>preseed.cfg</expected-filename>
> @@ -8,6 +9,7 @@
>        <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"/>
>      </config>
>      <injection-method>initrd</injection-method>
>      <template>
> @@ -17,33 +19,64 @@
>
>          <xsl:output method="text"/>
>
> +        <xsl:template name="target-disk">
> +          <xsl:choose>
> +            <xsl:when test="config/target-disk != ''">
> +              <xsl:value-of select="config/target-disk"/>
> +            </xsl:when>
> +            <xsl:otherwise>
> +              <xsl:text>/dev/vda</xsl:text>

Shouldn't this be based on OS version, like in fedora's script?

> +            </xsl:otherwise>
> +          </xsl:choose>
> +        </xsl:template>
> +
> +        <xsl:template name="l10n-language">
> +          <xsl:choose>
> +            <xsl:when test="config/l10n-language != '' and config/l10n-language != 'C'">

* Don't we have the same issue in fedora and rhel scripts?
* It can be lowercase 'c' too:
https://www.gnu.org/savannah-checkouts/gnu/gettext/manual/html_node/Locale-Names.html

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/

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




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

  Powered by Linux