Commit 9876f275 authored by Hideki Yamane's avatar Hideki Yamane

check "$DEBOOTSTRAP_DIR/scripts/debian-common"

As Nicolas pointed out, I should not assume to run debootstrap on
current directory, so it should be "$DEBOOTSTRAP_DIR/scripts/debian-common"
parent 7a92f4a1
debootstrap (1.0.95) unstable; urgency=medium
* Really fix #894415 (Closes: #894415)
-- Hideki Yamane <henrich@debian.org> Sat, 31 Mar 2018 13:28:26 +0900
debootstrap (1.0.94) unstable; urgency=medium
* debian/control
......
......@@ -9,6 +9,8 @@ force_md5
# include common settings
if [ -d /usr/share/debootstrap/scripts ]; then
. /usr/share/debootstrap/scripts/debian-common
elif [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then
. "$DEBOOTSTRAP_DIR/scripts/debian-common"
else
. /debootstrap/debian-common
fi
......@@ -7,8 +7,8 @@ keyring /usr/share/keyrings/debian-archive-keyring.gpg
# include common settings
if [ -d /usr/share/debootstrap/scripts ]; then
. /usr/share/debootstrap/scripts/debian-common
elif [ -e ./scripts/debian-common ]; then
. ./scripts/debian-common
elif [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then
. "$DEBOOTSTRAP_DIR/scripts/debian-common"
else
. /debootstrap/debian-common
fi
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