diff options
| author | Roger Leigh <rleigh@debian.org> | 2011-07-11 13:28:50 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2011-07-11 13:28:50 +0100 |
| commit | 7d331464226d9cb0efc977b4fc41eed39c12aeed (patch) | |
| tree | ee7ef555a06ff8c85dae45ccb5c6f384c32370fc | |
| parent | 6e8a8d6dcedcdae53386fc68a4c5f56d371196e0 (diff) | |
| download | schroot-7d331464226d9cb0efc977b4fc41eed39c12aeed.tar.gz | |
etc/setup.d/05file: Remove support for zip archives
| -rwxr-xr-x | etc/setup.d/05file | 8 | ||||
| -rw-r--r-- | man/schroot.conf.5.in | 10 | ||||
| -rw-r--r-- | sbuild/sbuild-chroot-file.h | 2 |
3 files changed, 7 insertions, 13 deletions
diff --git a/etc/setup.d/05file b/etc/setup.d/05file index 0891cb2a..7fa7e4bf 100755 --- a/etc/setup.d/05file +++ b/etc/setup.d/05file @@ -37,8 +37,6 @@ check_filetype() filetype="tgz" elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.bz2|\.tbz)$'; then filetype="tbz" - elif echo "$CHROOT_FILE" | grep -q '\.zip$'; then - filetype="zip" else fatal "Unsupported filetype for $CHROOT_FILE" fi @@ -57,8 +55,6 @@ unpack_file() tar $TAR_VERBOSE -xzf "$CHROOT_FILE" elif [ "$filetype" = "tbz" ]; then tar $TAR_VERBOSE -xjf "$CHROOT_FILE" - elif [ "$filetype" = "zip" ]; then - unzip $ZIP_VERBOSE "$CHROOT_FILE" else fatal "Unsupported filetype for $CHROOT_FILE" fi @@ -77,8 +73,6 @@ repack_file() tar $TAR_VERBOSE -czf "$NEWFILE" . elif [ "$filetype" = "tbz" ]; then tar $TAR_VERBOSE -cjf "$NEWFILE" . - elif [ "$filetype" = "zip" ]; then - zip $ZIP_VERBOSE -r "$NEWFILE" . else fatal "Unsupported filetype for $CHROOT_FILE" fi @@ -100,8 +94,6 @@ repack_file() if [ "$VERBOSE" = "verbose" ]; then TAR_VERBOSE="-v" -else - ZIP_VERBOSE="-q" fi if [ "$CHROOT_TYPE" = "file" ]; then diff --git a/man/schroot.conf.5.in b/man/schroot.conf.5.in index 28c625a1..d891fdfd 100644 --- a/man/schroot.conf.5.in +++ b/man/schroot.conf.5.in @@ -221,10 +221,12 @@ of updating. These additional options are also implemented: .TP \f[CBI]file=\fP\f[CI]filename\fP The file containing the archived chroot environment (mandatory). This must be -a tar (tape archive), optionally compressed with gzip or bzip2, or a zip -archive. The file extensions used to determine the type are are \fI.tar\fP, -\fI.tar.gz\fP, \fI.tar.bz2\fP, \fI.tgz\fP, \fI.tbz\fP and \fI.zip\fP. This -file must be owned by the root user, and not be writable by other. +a tar (tape archive), optionally compressed with gzip or bzip2. The file +extensions used to determine the type are are \fI.tar\fP, \fI.tar.gz\fP, +\fI.tar.bz2\fP, \fI.tgz\fP, and \fI.tbz\fP. This file must be owned by the +root user, and not be writable by other. Note that zip archives are no longer +supported; zip was not able to archive named pipes and device nodes, so was not +suitable for archiving chroots. .TP \f[CBI]location=\fP\f[CI]path\fP This is the path to the chroot \fIinside\fP the archive. For example, if the diff --git a/sbuild/sbuild-chroot-file.h b/sbuild/sbuild-chroot-file.h index a2a98c79..de2e6313 100644 --- a/sbuild/sbuild-chroot-file.h +++ b/sbuild/sbuild-chroot-file.h @@ -25,7 +25,7 @@ namespace sbuild { /** - * A chroot stored in a file archive (tar or zip). + * A chroot stored in a file archive (tar with optional compression). * * The archive will be unpacked and repacked on demand. */ |