From c6c4bc078a42be2a4cf8ee70f8bc0652a7b77a8f Mon Sep 17 00:00:00 2001 From: Nadav Ruskin Date: Tue, 10 Jul 2018 16:55:17 +0300 Subject: [PATCH] Fixed trying to read wsl.conf when it's missing --- imagefiles/dockcross | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/imagefiles/dockcross b/imagefiles/dockcross index 9eb2890..aecc78c 100755 --- a/imagefiles/dockcross +++ b/imagefiles/dockcross @@ -185,11 +185,13 @@ fi if [ -n "$UBUNTU_ON_WINDOWS" ]; then WSL_ROOT="/mnt/" CFG_FILE=/etc/wsl.conf - CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g') - eval "$CFG_CONTENT" - if [ -n "$root" ]; then - WSL_ROOT=$root - fi + if [ -f CFG_FILE ]; then + CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g') + eval "$CFG_CONTENT" + if [ -n "$root" ]; then + WSL_ROOT=$root + fi + fi HOST_PWD=`pwd -P` HOST_PWD=${HOST_PWD/$WSL_ROOT//} elif [ -n "$MSYS" ]; then