diff options
| author | Ansgar Burchardt <ansgar@debian.org> | 2016-10-18 22:14:03 (GMT) |
|---|---|---|
| committer | Ansgar Burchardt <ansgar@debian.org> | 2016-10-19 22:27:46 (GMT) |
| commit | 6b4019d0d4911cdb337ad8204891223c9f323829 (patch) | |
| tree | b6ec7e453a781bfe1b74e51c3b09f2e17b703891 | |
| parent | 2ab4758d3a447698cf2bd28a56a19a1378cd6ac7 (diff) | |
| download | debootstrap-6b4019d0d4911cdb337ad8204891223c9f323829.zip debootstrap-6b4019d0d4911cdb337ad8204891223c9f323829.tar.gz debootstrap-6b4019d0d4911cdb337ad8204891223c9f323829.tar.bz2 | |
Enable merged-/usr by default.
Thanks to Marco d'Itri for the patch.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debootstrap | 2 | ||||
| -rw-r--r-- | debootstrap.8 | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1cee5d1..c746495 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ debootstrap (1.0.85) UNRELEASED; urgency=medium + [ Ansgar Burchardt ] * Add jessie-kfreebsd to merged-/usr blacklist. * No longer Build-Depend on makedev. The code using it was already removed in debootstrap 1.0.82. @@ -11,6 +12,9 @@ debootstrap (1.0.85) UNRELEASED; urgency=medium * Only unpack and configure the base system when there are actually packages to install. (Closes: #825034) + [ Marco d'Itri ] + * Enable merged-/usr by default. (Closes: #839046, #839162) + -- Ansgar Burchardt <ansgar@debian.org> Wed, 14 Sep 2016 01:03:58 +0200 debootstrap (1.0.84) unstable; urgency=medium diff --git a/debootstrap b/debootstrap index 7875c5b..0d6cb54 100755 --- a/debootstrap +++ b/debootstrap @@ -27,7 +27,7 @@ KEYRING="" DISABLE_KEYRING="" FORCE_KEYRING="" VARIANT="" -MERGED_USR="no" +MERGED_USR="yes" ARCH="" HOST_ARCH="" HOST_OS="" diff --git a/debootstrap.8 b/debootstrap.8 index 3d19683..bb590d7 100644 --- a/debootstrap.8 +++ b/debootstrap.8 @@ -86,6 +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/. .IP .IP "\fB\-\-keyring=KEYRING\fP" Override the default keyring for the distribution being bootstrapped, |