From 6afd65237e2ce72393448c3bda61e237b976cf84 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 13 Apr 2012 11:14:57 +0200 Subject: Fix Ubuntu 10.04 detection LTS Ubuntu versions are respinned several times throughout their lifetime to integrate all the updates on the iso. When this happens, the volume ID becomes "Ubuntu 10.04.4 LTS i386" for example. The additional 3rd digit is properly handled for 8.04 but not for 10.04. This commit fixes the 10.04 volume ID regexp so that it handles this case, and also adds the missing "LTS" to the regexp (rhbz#811871). This fixes detection of the ubuntu 10.04.4 iso, I couldn't get my hands on an older 10.04 iso to double check this doesn't cause a regression. --- .../ubuntu-10.04.4-desktop-i386.iso.txt | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 test/isodata/ubuntu/ubuntu10.04/ubuntu-10.04.4-desktop-i386.iso.txt (limited to 'test') diff --git a/test/isodata/ubuntu/ubuntu10.04/ubuntu-10.04.4-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu10.04/ubuntu-10.04.4-desktop-i386.iso.txt new file mode 100644 index 0000000..cc79fab --- /dev/null +++ b/test/isodata/ubuntu/ubuntu10.04/ubuntu-10.04.4-desktop-i386.iso.txt @@ -0,0 +1,30 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Ubuntu 10.04.4 LTS i386 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 +E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +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: 355542 +El Torito VD version 1 found, boot catalog is in sector 151 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 8F 143 -- cgit v1.2.3