diff options
author | Ansgar Burchardt <ansgar@debian.org> | 2016-09-13 12:04:55 (GMT) |
---|---|---|
committer | Ansgar Burchardt <ansgar@debian.org> | 2016-09-13 12:07:16 (GMT) |
commit | d95433f90c32abe3e8a035122da1b8dee8889adc (patch) | |
tree | 662b1c94c4367b3821271f95184ef5d5d281ddfd /debootstrap | |
parent | 3315d41229df3ca7de4e2db16433f0f71401cade (diff) | |
download | debootstrap-d95433f90c32abe3e8a035122da1b8dee8889adc.zip debootstrap-d95433f90c32abe3e8a035122da1b8dee8889adc.tar.gz debootstrap-d95433f90c32abe3e8a035122da1b8dee8889adc.tar.bz2 |
Default to no merged-/usr.
Diffstat (limited to '')
-rwxr-xr-x | debootstrap | 6 | ||||
-rw-r--r-- | debootstrap.8 | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/debootstrap b/debootstrap index ea1d048..084a541 100755 --- a/debootstrap +++ b/debootstrap @@ -27,7 +27,7 @@ KEYRING="" DISABLE_KEYRING="" FORCE_KEYRING="" VARIANT="" -MERGED_USR="" +MERGED_USR="no" ARCH="" HOST_ARCH="" HOST_OS="" @@ -304,6 +304,10 @@ if [ $# != 0 ] ; then error 1 NEEDARG "option requires an argument %s" "$1" fi ;; + --merged-usr) + MERGED_USR=yes + shift + ;; --no-merged-usr) MERGED_USR=no shift diff --git a/debootstrap.8 b/debootstrap.8 index 0c2f69f..3d19683 100644 --- a/debootstrap.8 +++ b/debootstrap.8 @@ -84,8 +84,8 @@ The default, with no \fB\-\-variant=X\fP argument, is to create a base Debian installation in .IR TARGET . .IP -.IP "\fB\-\-no-merged-usr\fP" -Do not create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. +.IP "\fB\-\-merged-usr\fP" +Create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. .IP .IP "\fB\-\-keyring=KEYRING\fP" Override the default keyring for the distribution being bootstrapped, |