diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debootstrap | 4 | ||||
| -rw-r--r-- | debootstrap.8 | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 50771bc..3b91569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debootstrap (1.0.87) UNRELEASED; urgency=high + + * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps + (closes: #844221). + + -- Julien Cristau <jcristau@debian.org> Sun, 13 Nov 2016 08:05:35 -0800 + debootstrap (1.0.86) unstable; urgency=high * Rework split_inline_sig by using shell built-ins instead of trying to diff --git a/debootstrap b/debootstrap index 3bf5908..1d6ddaa 100755 --- a/debootstrap +++ b/debootstrap @@ -27,7 +27,7 @@ KEYRING="" DISABLE_KEYRING="" FORCE_KEYRING="" VARIANT="" -MERGED_USR="yes" +MERGED_USR="no" ARCH="" HOST_ARCH="" HOST_OS="" @@ -101,7 +101,7 @@ usage() --variant=X use variant X of the bootstrap scripts (currently supported variants: buildd, fakechroot, scratchbox, minbase) - --no-merged-usr do not make /{bin,sbin,lib}/ symlinks to /usr/ + --merged-usr make /{bin,sbin,lib}/ symlinks to /usr/ --keyring=K check Release files against keyring K --no-check-gpg avoid checking Release file signatures --force-check-gpg force checking Release file signatures diff --git a/debootstrap.8 b/debootstrap.8 index 5592255..f39709f 100644 --- a/debootstrap.8 +++ b/debootstrap.8 @@ -86,10 +86,10 @@ Debian installation in .IP .IP "\fB\-\-merged-usr\fP" Create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. -(Default.) .IP .IP "\fB\-\-no-merged-usr\fP" Do not create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. +(Default.) .IP .IP "\fB\-\-keyring=KEYRING\fP" Override the default keyring for the distribution being bootstrapped, |