diff options
| author | Julien Cristau <jcristau@debian.org> | 2016-10-20 06:39:55 (GMT) |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2016-10-20 06:39:55 (GMT) |
| commit | 5cf331b568827a9bce557db72c2713d8d7468bff (patch) | |
| tree | 76794a930ebaf4014f6bf74c731e4048adc9e01a /debootstrap | |
| parent | cb32574a472d4645ecdf176bef9e671c977c4d1f (diff) | |
| parent | 6b4019d0d4911cdb337ad8204891223c9f323829 (diff) | |
| download | debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.zip debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.tar.gz debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.tar.bz2 | |
Merge branch 'master' of https://github.com/aburch/debootstrap
Diffstat (limited to 'debootstrap')
| -rwxr-xr-x | debootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debootstrap b/debootstrap index 084a541..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="" @@ -360,7 +360,7 @@ if [ $# != 0 ] ; then CHECKCERTIF="--no-check-certificate" shift ;; - --*) + -*) error 1 BADARG "unrecognized or invalid option %s" "$1" ;; *) |