Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-21 10:23:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Nadav-Ruskin/wsl_fix_missing_config

Browse Source 
Fixed trying to read wsl.conf when it's missing
This commit is contained in:
Matt McCormick
2018-07-13 15:03:26 -04:00
committed by GitHub
parent 0d0f941ec0 9572d88a7a
commit 4689069099
1 changed files with 7 additions and 5 deletions

2
imagefiles/dockcross

@ -185,11 +185,13 @@ fi
if [ -n "$UBUNTU_ON_WINDOWS" ]; then if [ -n "$UBUNTU_ON_WINDOWS" ]; then
WSL_ROOT="/mnt/" WSL_ROOT="/mnt/"
CFG_FILE=/etc/wsl.conf CFG_FILE=/etc/wsl.conf
if [ -f "$CFG_FILE" ]; then
CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g') CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
eval "$CFG_CONTENT" eval "$CFG_CONTENT"
if [ -n "$root" ]; then if [ -n "$root" ]; then
WSL_ROOT=$root WSL_ROOT=$root
fi fi
fi
HOST_PWD=`pwd -P` HOST_PWD=`pwd -P`
HOST_PWD=${HOST_PWD/$WSL_ROOT//} HOST_PWD=${HOST_PWD/$WSL_ROOT//}
elif [ -n "$MSYS" ]; then elif [ -n "$MSYS" ]; then