[PATCH] freebsd: fix media url typo for 9.3 and add a test

[Roman Bogorodskiy <bogorodskiy@xxxxxxxxx>]

---
 data/oses/freebsd.xml.in                           |  4 +--
 .../freebsd/freebsd9.3/freebsd-9.3-amd64.txt       | 33 ++++++++++++++++++++++
 .../freebsd/freebsd9.3/freebsd-9.3-i386.txt        | 33 ++++++++++++++++++++++
 test/test-isodetect.c                              |  7 +++++
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt
 create mode 100644 test/isodata/freebsd/freebsd9.3/freebsd-9.3-i386.txt

diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in
index d1d6486..c8be1bf 100644
--- a/data/oses/freebsd.xml.in
+++ b/data/oses/freebsd.xml.in
@@ -587,7 +587,7 @@
     <eol-date>2016-12-31</eol-date>
 
     <media arch='i686'>
-      <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso</url>
+      <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso</url>
       <iso>
         <publisher-id>THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/</publisher-id>
         <system-id>FreeBSD</system-id>
@@ -596,7 +596,7 @@
     </media>
 
     <media arch='x86_64'>
-      <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso</url>
+      <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso</url>
       <iso>
         <publisher-id>THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/</publisher-id>
         <system-id>FreeBSD</system-id>
diff --git a/test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt b/test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt
new file mode 100644
index 0000000..c01e5fc
--- /dev/null
+++ b/test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt
@@ -0,0 +1,33 @@
+CD-ROM is in ISO 9660 format
+System id: FreeBSD
+Volume id: FREEBSD_INSTALL
+Volume set id: 
+Publisher id: THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/
+Data preparer id: 
+Application id: 
+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: 327561
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+
+SUSP signatures version 1 found
+Rock Ridge signatures version 1 found
+Rock Ridge id 'IEEE_P1282'
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Cksum AA 55 OK
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 14 20
diff --git a/test/isodata/freebsd/freebsd9.3/freebsd-9.3-i386.txt b/test/isodata/freebsd/freebsd9.3/freebsd-9.3-i386.txt
new file mode 100644
index 0000000..cd46c3d
--- /dev/null
+++ b/test/isodata/freebsd/freebsd9.3/freebsd-9.3-i386.txt
@@ -0,0 +1,33 @@
+CD-ROM is in ISO 9660 format
+System id: FreeBSD
+Volume id: FREEBSD_INSTALL
+Volume set id: 
+Publisher id: THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/
+Data preparer id: 
+Application id: 
+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: 297174
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+
+SUSP signatures version 1 found
+Rock Ridge signatures version 1 found
+Rock Ridge id 'IEEE_P1282'
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Cksum AA 55 OK
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 14 20
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 5bd211a..145b65f 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -408,6 +408,12 @@ START_TEST(test_mageia)
 }
 END_TEST
 
+START_TEST(test_freebsd)
+{
+    test_one("freebsd");
+}
+END_TEST
+
 static Suite *
 list_suite(void)
 {
@@ -426,6 +432,7 @@ list_suite(void)
     tcase_add_test(tc, test_gnome);
     tcase_add_test(tc, test_altlinux);
     tcase_add_test(tc, test_mageia);
+    tcase_add_test(tc, test_freebsd);
     suite_add_tcase(s, tc);
     return s;
 }
-- 
1.8.4.3

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