[osinfo-db 2/2] install-script, suse: Add install-scripts for SLES 11 SP4

[Fabiano Fidêncio <fidencio@xxxxxxxxxx>]

Some small changes have been done in the bootloader and in the patterns
currently used for SLES 12+ in order to also support the "old" SLES 11
SP4.

Signed-off-by: Fabiano Fidêncio <fabiano@xxxxxxxxxxxx>
---
 .../suse.com/suse-autoyast-desktop.xml.in          | 34 ++++++++++++++++++++--
 .../suse.com/suse-autoyast-jeos.xml.in             |  9 +++++-
 data/os/suse.com/sles-11.4.xml.in                  |  9 ++++--
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/data/install-script/suse.com/suse-autoyast-desktop.xml.in b/data/install-script/suse.com/suse-autoyast-desktop.xml.in
index acb38c1..381d621 100644
--- a/data/install-script/suse.com/suse-autoyast-desktop.xml.in
+++ b/data/install-script/suse.com/suse-autoyast-desktop.xml.in
@@ -86,7 +86,14 @@
                 <timeout config:type="integer">8</timeout>
                 <vgamode/>
               </global>
-              <loader_type>grub2</loader_type>
+              <xsl:choose>
+                <xsl:when test="os/version &lt; 12">
+                  <loader_type>grub</loader_type>
+                </xsl:when>
+                <xsl:otherwise>
+                  <loader_type>grub2</loader_type>
+                </xsl:otherwise>
+              </xsl:choose>
             </bootloader>
             <firewall>
               <enable_firewall config:type="boolean">false</enable_firewall>
@@ -172,13 +179,20 @@ if test -z '<xsl:value-of select="config/user-password"/>'; then
 pam-config -a --unix-nullok
 pam-config -a --nullok
 
-<xsl:if test="os/version = 12">
+<xsl:if test="os/version &lt; 12.1">
 useradd <xsl:value-of select="config/user-login"/> -m -G users
 passwd -d <xsl:value-of select="config/user-login"/>
 </xsl:if>
 
 #Enable passwordless login for users that are part of the nopasswdlogin group
+<xsl:choose>
+  <xsl:when test="os/version &lt; 12">
+sed -i '2 i auth sufficient pam_succeed_if.so user ingroup nopasswdlogin' /etc/pam.d/gdm
+  </xsl:when>
+  <xsl:otherwise>
 sed -i '4 i auth sufficient pam_succeed_if.so user ingroup nopasswdlogin' /etc/pam.d/gdm-password
+  </xsl:otherwise>
+</xsl:choose>
 fi
 
 if test -n '<xsl:value-of select="config/avatar-location"/>'; then
@@ -213,6 +227,15 @@ fi
                 <pattern>base</pattern>
                 <pattern>gnome-basic</pattern>
                 <pattern>printing</pattern>
+                <xsl:choose>
+                  <xsl:when test="os/version &lt; 12">
+                    <pattern>gnome</pattern>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <pattern>gnome-basic</pattern>
+                    <pattern>printing</pattern>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:if test="os/version &gt; 12">
                   <pattern>smt</pattern>
                 </xsl:if>
@@ -225,6 +248,13 @@ fi
                 <sysconfig_path>/etc/sysconfig/displaymanager</sysconfig_path>
                 <sysconfig_value>gdm</sysconfig_value>
               </sysconfig_entry>
+              <xsl:if test="os/version &lt; 12 and config/user-password = ''">
+                <sysconfig_entry>
+                  <sysconfig_key>DISPLAYMANAGER_AUTOLOGIN</sysconfig_key>
+                  <sysconfig_path>/etc/sysconfig/displaymanager</sysconfig_path>
+                  <sysconfig_value><xsl:value-of select="config/user-login"/></sysconfig_value>
+                </sysconfig_entry>
+              </xsl:if>
               <sysconfig_entry>
                 <sysconfig_key>DEFAULT_WM</sysconfig_key>
                 <sysconfig_path>/etc/sysconfig/windowmanager</sysconfig_path>
diff --git a/data/install-script/suse.com/suse-autoyast-jeos.xml.in b/data/install-script/suse.com/suse-autoyast-jeos.xml.in
index b657c28..b5cbe6a 100644
--- a/data/install-script/suse.com/suse-autoyast-jeos.xml.in
+++ b/data/install-script/suse.com/suse-autoyast-jeos.xml.in
@@ -77,7 +77,14 @@
                 <timeout config:type="integer">8</timeout>
                 <vgamode/>
               </global>
-              <loader_type>grub2</loader_type>
+              <xsl:choose>
+                <xsl:when test="os/version &lt; 12">
+                  <loader_type>grub</loader_type>
+                </xsl:when>
+                <xsl:otherwise>
+                  <loader_type>grub2</loader_type>
+                </xsl:otherwise>
+              </xsl:choose>
             </bootloader>
             <firewall>
               <enable_firewall config:type="boolean">false</enable_firewall>
diff --git a/data/os/suse.com/sles-11.4.xml.in b/data/os/suse.com/sles-11.4.xml.in
index e741062..7fb6f17 100644
--- a/data/os/suse.com/sles-11.4.xml.in
+++ b/data/os/suse.com/sles-11.4.xml.in
@@ -14,7 +14,7 @@
     <release-date>2015-07-15</release-date>
     <eol-date>2019-03-31</eol-date>
 
-    <media arch="i686">
+    <media arch="i686" eject-after-install="false">
       <iso>
         <system-id>LINUX</system-id>
         <volume-id>SLES-11-SP4-DVD-i586</volume-id>
@@ -22,7 +22,7 @@
       <kernel>boot/i386/loader/linux</kernel>
       <initrd>boot/i386/loader/initrd</initrd>
     </media>
-    <media arch="x86_64">
+    <media arch="x86_64" eject-after-install="false">
       <iso>
         <system-id>LINUX</system-id>
         <volume-id>SLES-11-SP4-DVD-x86_64</volume-id>
@@ -31,6 +31,11 @@
       <initrd>boot/x86_64/loader/initrd</initrd>
     </media>
 
+    <installer>
+      <script id='http://suse.com/suse/autoyast/desktop'/>
+      <script id='http://suse.com/suse/autoyast/jeos'/>
+    </installer>
+
     <resources arch="all">
       <minimum>
         <cpu>500000000</cpu>
-- 
2.9.3

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