Commit b77d3457 authored by Hideki Yamane's avatar Hideki Yamane

Merge branch 'henrich/merged-usr' into 'master'

Re-enable merged-usr by default (after stretch release) See merge request !5
parents b54fe383 4a1b3cac
Pipeline #9589 passed with stage
in 1 minute 34 seconds
......@@ -27,7 +27,7 @@ KEYRING=""
DISABLE_KEYRING=""
FORCE_KEYRING=""
VARIANT=""
MERGED_USR="no"
MERGED_USR="yes"
ARCH=""
HOST_ARCH=""
HOST_OS=""
......@@ -102,7 +102,7 @@ usage()
--variant=X use variant X of the bootstrap scripts
(currently supported variants: buildd, fakechroot,
minbase)
--merged-usr make /{bin,sbin,lib}/ symlinks to /usr/
--no-merged-usr do not 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
......
......@@ -86,10 +86,10 @@ base Debian installation with all packages of priority \fIrequired\fR and
.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,
......
......@@ -36,7 +36,8 @@ work_out_debs () {
first_stage_install () {
case "$CODENAME" in
etch|etch-m68k|jessie|jessie-kfreebsd|lenny|squeeze|wheezy) ;;
etch*|lenny|squeeze|wheezy|jessie*|stretch)
;;
*)
EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k"
setup_merged_usr
......
......@@ -67,7 +67,8 @@ work_out_debs () {
first_stage_install () {
case "$CODENAME" in
etch|etch-m68k|jessie|jessie-kfreebsd|lenny|squeeze|wheezy) ;;
gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|utopic|vivid|wily|yakkety|zesty|artful|bionic|cosmic)
;;
*)
EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k"
setup_merged_usr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment