Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jul 2009 22:59:23 -0700
From:      Tim Kientzle <kientzle@freebsd.org>
To:        Jung-uk Kim <jkim@freebsd.org>
Cc:        "'freebsd-current@freebsd.org'" <freebsd-current@freebsd.org>
Subject:   Re: Joliet and release ISOs?
Message-ID:  <4A694DBB.8080800@freebsd.org>
In-Reply-To: <200907231903.46474.jkim@FreeBSD.org>
References:  <4A615602.4090000@freebsd.org> <200907231903.46474.jkim@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------040009070606010401060900
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Jung-uk Kim wrote:
> 
> The "--options=!joliet" trick didn't work for me:
> 
> # uname -mrs 
> FreeBSD 8.0-BETA2 amd64
> # tar -x --options=!joliet -p -f ../8.0-BETA2-amd64-livefs.iso
> # cd rescue
> # ls -il
> total 4204
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 [
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 atacontrol
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 atmconfig
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 badsect
> ...
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 whoami
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 zcat
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 zfs
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 zpool
> # file atacontrol
> atacontrol: data
> # hexdump atacontrol
> 0000000 0000 0000 0000 0000 0000 0000 0000 0000
> *
> 0447160

Try the attached patch; I believe this corrects the
reading of hardlinks from iso9660 images.

Tim

--------------040009070606010401060900
Content-Type: text/x-patch;
 name="libarchive_iso9660_hardlink.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libarchive_iso9660_hardlink.patch"

Index: archive_read_support_format_iso9660.c
===================================================================
--- archive_read_support_format_iso9660.c	(revision 195838)
+++ archive_read_support_format_iso9660.c	(working copy)
@@ -579,6 +579,7 @@
 	    && file->size > 0) {
 		archive_entry_set_hardlink(entry,
 		    iso9660->previous_pathname.s);
+		archive_entry_unset_size(entry);
 		iso9660->entry_bytes_remaining = 0;
 		iso9660->entry_sparse_offset = 0;
 		release_file(iso9660, file);

--------------040009070606010401060900--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A694DBB.8080800>