Add entries for SUSE Linux Enterprise Desktop 11 SP1, SP2, SP3 and SP4.
I can't find out the release date information about these SLED distros,
will update them when I get figure them out.
The patch also corrects the volume-id information for sles 11.x 32bit.
Signed-off-by: Lin Ma <lma@xxxxxxxx>
---
data/oses/suse.xml.in | 129 ++++++++++++++++++++-
.../sled11sp1/SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt | 29 +++++
.../SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++
.../sled11sp2/SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt | 29 +++++
.../SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++
.../sled11sp3/SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt | 29 +++++
.../SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++
.../SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++
test/test-isodetect.c | 7 ++
9 files changed, 333 insertions(+), 6 deletions(-)
create mode 100644 test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt
create mode 100644 test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt
create mode 100644 test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt
create mode 100644 test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 test/isodata/sled/sled12/SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in
index 2fc70ae..1d913dc 100644
--- a/data/oses/suse.xml.in
+++ b/data/oses/suse.xml.in
@@ -48,7 +48,7 @@
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLES-11-SP1-DVD-i386</volume-id>
+ <volume-id>SLES-11-SP1-DVD-i586</volume-id>
</iso>
<kernel>boot/i386/loader/linux</kernel>
<initrd>boot/i386/loader/initrd</initrd>
@@ -77,7 +77,7 @@
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLES-11-SP2-DVD-i386</volume-id>
+ <volume-id>SLES-11-SP2-DVD-i586</volume-id>
</iso>
<kernel>boot/i386/loader/linux</kernel>
<initrd>boot/i386/loader/initrd</initrd>
@@ -106,7 +106,7 @@
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLES-11-SP3-DVD-i386</volume-id>
+ <volume-id>SLES-11-SP3-DVD-i586</volume-id>
</iso>
<kernel>boot/i386/loader/linux</kernel>
<initrd>boot/i386/loader/initrd</initrd>
@@ -133,7 +133,7 @@
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLES-11-SP4-DVD-i386</volume-id>
+ <volume-id>SLES-11-SP4-DVD-i586</volume-id>
</iso>
<kernel>boot/i386/loader/linux</kernel>
<initrd>boot/i386/loader/initrd</initrd>
@@ -221,6 +221,114 @@
</resources>
</os>
+ <os id="http://suse.com/sled/11.1";>
+ <short-id>sled11sp1</short-id>
+ <_name>SUSE Linux Enterprise Desktop 11 SP1</_name>
+ <version>11.1</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>
+ <upgrades id="http://suse.com/sled/11"/>
+
+ <media arch="i686">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP1-DVD-i586</volume-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP1-DVD-x86_64</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+
+ <os id="http://suse.com/sled/11.2";>
+ <short-id>sled11sp2</short-id>
+ <_name>SUSE Linux Enterprise Desktop 11 SP2</_name>
+ <version>11.2</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>
+ <upgrades id="http://suse.com/sled/11.1"/>
+
+ <media arch="i686">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP2-DVD-i586</volume-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP2-DVD-x86_64</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+
+ <os id="http://suse.com/sled/11.3";>
+ <short-id>sled11sp3</short-id>
+ <_name>SUSE Linux Enterprise Desktop 11 SP3</_name>
+ <version>11.3</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>
+ <upgrades id="http://suse.com/sled/11.2"/>
+
+ <media arch="i686">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP3-DVD-i586</volume-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP3-DVD-x86_64</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+
+ <os id="http://suse.com/sled/11.4";>
+ <short-id>sled11sp4</short-id>
+ <_name>SUSE Linux Enterprise Desktop 11 SP4</_name>
+ <version>11.4</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>
+ <upgrades id="http://suse.com/sled/11.3"/>
+
+ <media arch="i686">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP4-DVD-i586</volume-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLED-11-SP4-DVD-x86_64</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+
<os id="http://suse.com/sled/12";>
<short-id>sled12</short-id>
<_name>SUSE Linux Enterprise Desktop 12</_name>
@@ -228,8 +336,17 @@
<_vendor>SUSE</_vendor>
<family>linux</family>
<distro>sled</distro>
- <upgrades id="http://suse.com/sled/11"/>
- <derives-from id="http://suse.com/sled/11"/>
+ <upgrades id="http://suse.com/sled/11.4"/>
+ <derives-from id="http://suse.com/sled/11.4"/>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-12-Desktop-DVD-x86_64</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
<resources arch="all">
<minimum>
diff --git a/test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt
new file mode 100644
index 0000000..0e1785e
--- /dev/null
+++ b/test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP1-DVD-i586.0336.1.001
+Volume set id:
+Publisher id: SUSE LINUX Products GmbH
+Data preparer id: KIWI - http://kiwi.berlios.de
+Application id: SLED-11-SP1-DVD-i586-Build0336-Media1
+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: 2106690
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX Products Gmb'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 20A 522
diff --git a/test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..0ee3753
--- /dev/null
+++ b/test/isodata/sled/sled11sp1/SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP1-DVD-x86_64.0336..001
+Volume set id:
+Publisher id: SUSE LINUX Products GmbH
+Data preparer id: KIWI - http://kiwi.berlios.de
+Application id: SLED-11-SP1-DVD-x86_64-Build0336-Media1
+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: 2178524
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX Products Gmb'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 239 569
diff --git a/test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt
new file mode 100644
index 0000000..03da31d
--- /dev/null
+++ b/test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP2-DVD-i58606261
+Volume set id:
+Publisher id: SUSE LINUX Products GmbH
+Data preparer id: KIWI - http://kiwi.berlios.de
+Application id: SLED-11-SP2-DVD-i586-Build0626-Media1
+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: 2183881
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX Products Gmb'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 217 535
diff --git a/test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..549d221
--- /dev/null
+++ b/test/isodata/sled/sled11sp2/SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP2-DVD-x86_6406261
+Volume set id:
+Publisher id: SUSE LINUX Products GmbH
+Data preparer id: KIWI - http://kiwi.berlios.de
+Application id: SLED-11-SP2-DVD-x86_64-Build0626-Media1
+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: 2264068
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX Products Gmb'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 24C 588
diff --git a/test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt
new file mode 100644
index 0000000..713428c
--- /dev/null
+++ b/test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP3-DVD-i58604841
+Volume set id:
+Publisher id: SUSE LINUX Products GmbH
+Data preparer id: KIWI - http://kiwi.berlios.de
+Application id: SLED-11-SP3-DVD-i586-Build0484-Media1
+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: 2171398
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX Products Gmb'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 215 533
diff --git a/test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..a5c3d08
--- /dev/null
+++ b/test/isodata/sled/sled11sp3/SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP3-DVD-x86_6404841
+Volume set id:
+Publisher id: SUSE LINUX Products GmbH
+Data preparer id: KIWI - http://kiwi.berlios.de
+Application id: SLED-11-SP3-DVD-x86_64-Build0484-Media1
+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: 2230315
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX Products Gmb'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 252 594
diff --git a/test/isodata/sled/sled12/SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled12/SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..ddf7ff0
--- /dev/null
+++ b/test/isodata/sled/sled12/SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-Desktop-DVD-x86_6405561
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-Desktop-DVD-x86_64-Build0556-Media1
+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: 2140317
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14D4 5332
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index c100ece..9b391b3 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -424,6 +424,12 @@ START_TEST(test_sles)
}
END_TEST
+START_TEST(test_sled)
+{
+ test_one("sled");
+}
+END_TEST
+
static Suite *
list_suite(void)
{
@@ -443,6 +449,7 @@ list_suite(void)
tcase_add_test(tc, test_altlinux);
tcase_add_test(tc, test_mageia);
tcase_add_test(tc, test_sles);
+ tcase_add_test(tc, test_sled);
suite_add_tcase(s, tc);
return s;
}
--
2.1.4
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
