From 478bcdc1e216db1a68e7a1ba8e0e2a9050b4f2bf Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 8 Feb 2011 13:36:42 +0000 Subject: [PATCH] -as mkisofs: Enabled reading of xattr and md5 before image loading --- libisoburn/trunk/xorriso/emulators.c | 11 +++++++---- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index ce0af2f8..20e1b392 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -1168,6 +1168,13 @@ illegal_c:; if(ret<=0) goto ex; } + + if(old_root[0] || root_seen) { + Xorriso_option_md5(xorriso, old_root_md5 ? "on" : "off", 0); + Xorriso_option_disk_dev_ino(xorriso, + old_root_dev && old_root_ino ? "on" : + old_root_ino ? "ino_only" : "off", 0); + } if(indev[0]) { ret= Xorriso_option_dev(xorriso, indev, 1); if(ret<=0) @@ -1178,10 +1185,6 @@ illegal_c:; {ret= 1; goto ex;} if(old_root[0]) { - Xorriso_option_md5(xorriso, old_root_md5 ? "on" : "off", 0); - Xorriso_option_disk_dev_ino(xorriso, - old_root_dev && old_root_ino ? "on" : - old_root_ino ? "ino_only" : "off", 0); ret= Xorriso_iso_lstat(xorriso, old_root, &stbuf, 0); if(ret >= 0) { if(root_seen) { diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index bfd82a6b..4ddbcb74 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.02.07.202851" +#define Xorriso_timestamP "2011.02.08.133624"