[PATCH] Support ISO detection of xorriso ISOs

ISOs were created by genisoimage, so the paths were lowercase, when readed in iso9660 format. Debian 8 ppc64el started to use xorriso, which uses uppercase paths. Signed-off-by: Ramon Medeiros <ramonn@linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index fd1f8f7..6fb0f38 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -308,7 +308,7 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ if dir_parent == 1: # read the dir name using the namelen dir_name = path_table_data[i: i+dir_namelen].rstrip() - if dir_name == 'ppc': + if dir_name.lower() == 'ppc': # stop searching, dir was found break # Need to consider the optional padding field as well @@ -378,7 +378,7 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ static_rec_size + file_name_len].rstrip() # The second bit of the file_flags indicate if this record # is a directory. - if filename == BOOT_FILE_NAME and (file_flags & 2) != 1: + if BOOT_FILE_NAME in filename.lower() and (file_flags & 2) != 1: self.bootable = True return -- 2.1.0

Reviewed-by: Daniel Barboza <dhbarboza82@gmail.com> ps: fix typo in commit msg before pushing On 06/15/2015 02:33 PM, Ramon Medeiros wrote:
ISOs were created by genisoimage, so the paths were lowercase, when readed in iso9660 format. Debian 8 ppc64el started to use xorriso, which uses uppercase paths.
Signed-off-by: Ramon Medeiros <ramonn@linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index fd1f8f7..6fb0f38 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -308,7 +308,7 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ if dir_parent == 1: # read the dir name using the namelen dir_name = path_table_data[i: i+dir_namelen].rstrip() - if dir_name == 'ppc': + if dir_name.lower() == 'ppc': # stop searching, dir was found break # Need to consider the optional padding field as well @@ -378,7 +378,7 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ static_rec_size + file_name_len].rstrip() # The second bit of the file_flags indicate if this record # is a directory. - if filename == BOOT_FILE_NAME and (file_flags & 2) != 1: + if BOOT_FILE_NAME in filename.lower() and (file_flags & 2) != 1: self.bootable = True return
participants (3)
-
Aline Manera
-
Daniel Henrique Barboza
-
Ramon Medeiros