docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5336 from tianon/slightly-more-organized-check-config 

Move "possible config locations" list to the top of check-config.sh
This commit is contained in:
Tianon Gravi 2014-04-23 11:21:08 -06:00
parent 03aacc4b91 2c4cebe916
commit 6b0f0af0e9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/check-config.sh
View File

@ -4,7 +4,13 @@ set -e
# bits of this were adapted from lxc-checkconfig # bits of this were adapted from lxc-checkconfig
# see also https://github.com/lxc/lxc/blob/lxc-1.0.2/src/lxc/lxc-checkconfig.in # see also https://github.com/lxc/lxc/blob/lxc-1.0.2/src/lxc/lxc-checkconfig.in
: ${CONFIG:=/proc/config.gz} possibleConfigs=(
'/proc/config.gz'
"/boot/config-$(uname -r)"
"/usr/src/linux-$(uname -r)/.config"
'/usr/src/linux/.config'
)
: ${CONFIG:="${possibleConfigs[0]}"}
if ! command -v zgrep &> /dev/null; then if ! command -v zgrep &> /dev/null; then
zgrep() { zgrep() {
@ -74,11 +80,7 @@ check_flags() {
if [ ! -e "$CONFIG" ]; then if [ ! -e "$CONFIG" ]; then
wrap_warning "warning: $CONFIG does not exist, searching other paths for kernel config..." wrap_warning "warning: $CONFIG does not exist, searching other paths for kernel config..."
for tryConfig in \ for tryConfig in "${possibleConfigs[@]}"; do
'/proc/config.gz' \
"/boot/config-$(uname -r)" \
'/usr/src/linux/.config' \
; do
if [ -e "$tryConfig" ]; then if [ -e "$tryConfig" ]; then
CONFIG="$tryConfig" CONFIG="$tryConfig"
break break