diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | debootstrap | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index db312cb..ed1b201 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -debootstrap (1.0.5) UNRELEASED; urgency=low +debootstrap (1.0.5) unstable; urgency=low + [ Colin Watson ] * Don't rely on GNU sed's s///I extension (closes: #350583). - -- Colin Watson <cjwatson@debian.org> Sat, 20 Oct 2007 13:49:37 +0100 + [ Joey Hess ] + * Skip the noexec/nodev test when running --print-debs or other operations + that do not involve building systems. + + -- Joey Hess <joeyh@debian.org> Sat, 20 Oct 2007 23:10:34 -0400 debootstrap (1.0.4) unstable; urgency=low diff --git a/debootstrap b/debootstrap index aa02dca..90a643b 100755 --- a/debootstrap +++ b/debootstrap @@ -307,6 +307,10 @@ if am_doing_phase first_stage second_stage; then if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then error 1 NEEDROOT "debootstrap can only run as root" fi + # Ensure that we can create working devices and executables on the target. + if ! check_sane_mount "$TARGET"; then + error 1 NOEXEC "Cannot install into target '$TARGET' mounted with noexec or nodev" + fi fi if [ ! -e "$SCRIPT" ]; then @@ -351,13 +355,6 @@ fi ########################################################################### -# Ensure that we can create working devices and executables on the target. -if ! check_sane_mount "$TARGET"; then - error 1 NOEXEC "Cannot install into target '$TARGET' mounted with noexec or nodev" -fi - -########################################################################### - if [ "$UNPACK_TARBALL" ]; then if [ "${UNPACK_TARBALL#/}" = "$UNPACK_TARBALL" ]; then error 1 TARPATH "Tarball must be given a complete path" |