зеркало из https://github.com/mozilla/labs-vcap.git
warden: Avoid lsb_release when we can
Directly sourcing /etc/lsb-release in a subshell takes less than 2 milliseconds whereas lsb-release -cs usually takes more than 29 ms. Change-Id: Ibf7586291519bdefd4c04b10f962bb1b99638136
This commit is contained in:
Родитель
13fd49346c
Коммит
943643b83c
|
@ -13,6 +13,20 @@ function chroot() {
|
|||
$(which chroot) ${target} env -i /bin/bash
|
||||
}
|
||||
|
||||
# When the override file /etc/lsb-release exists, try getting codename there.
|
||||
# Fall back to executing lsb_release.
|
||||
function get_codename() {
|
||||
if [ -r /etc/lsb-release ]; then
|
||||
source /etc/lsb-release
|
||||
if [ -n $DISTRIB_CODENAME ]; then
|
||||
echo $DISTRIB_CODENAME
|
||||
return 0
|
||||
fi
|
||||
else
|
||||
lsb_release -cs
|
||||
fi
|
||||
}
|
||||
|
||||
function setup_fs() {
|
||||
if [ ! -f fs ]; then
|
||||
dd if=/dev/null of=fs bs=1k seek=512k
|
||||
|
@ -25,7 +39,7 @@ function setup_fs() {
|
|||
mkdir -p rootfs ${target}
|
||||
mount -n -o loop fs rootfs
|
||||
|
||||
codename=$(lsb_release -c -s)
|
||||
codename=$(get_codename)
|
||||
|
||||
case "${codename}" in
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче