diff options
author | Julien Cristau <jcristau@debian.org> | 2016-11-13 16:10:03 (GMT) |
---|---|---|
committer | Julien Cristau <jcristau@debian.org> | 2016-11-13 16:10:03 (GMT) |
commit | 988c5ca36a4cb44e0ba3a143f70b6ae8a7e5afdc (patch) | |
tree | 50013add26f6ce76cc5857029967f85150566859 /debootstrap | |
parent | a7a8b4b62996d95a7590c06f33049647441544dd (diff) | |
download | debootstrap-988c5ca36a4cb44e0ba3a143f70b6ae8a7e5afdc.zip debootstrap-988c5ca36a4cb44e0ba3a143f70b6ae8a7e5afdc.tar.gz debootstrap-988c5ca36a4cb44e0ba3a143f70b6ae8a7e5afdc.tar.bz2 |
Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps (closes: #844221).
Diffstat (limited to 'debootstrap')
-rwxr-xr-x | debootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
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 |