From d95433f90c32abe3e8a035122da1b8dee8889adc Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Tue, 13 Sep 2016 14:04:55 +0200
Subject: Default to no merged-/usr.

---
 debootstrap   | 6 +++++-
 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,
-- 
cgit v0.12