diff options
| author | Jonathan Abrahams <jonathan@mongodb.com> | 2018-05-17 13:19:24 -0400 |
|---|---|---|
| committer | Jonathan Abrahams <jonathan@mongodb.com> | 2018-08-10 09:41:23 -0400 |
| commit | 4e88e120caa555333ad7e611fea543fdfe3c82fa (patch) | |
| tree | 156882aeebb13a71aa2b261aa1c207e7bae870ff | |
| parent | d4ee0eae054c1904f0afcbd3f35c65945026d186 (diff) | |
| download | mongo-4e88e120caa555333ad7e611fea543fdfe3c82fa.tar.gz | |
SERVER-34258 Fix error in mount_drives.sh on Windows
(cherry picked from commit 1bbdb461b5ee44886e25dc0b44df2859471e6ed3)
| -rwxr-xr-x | buildscripts/mount_drives.sh | 9 | ||||
| -rw-r--r-- | etc/evergreen.yml | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/buildscripts/mount_drives.sh b/buildscripts/mount_drives.sh index 28960ced531..a861bac6352 100755 --- a/buildscripts/mount_drives.sh +++ b/buildscripts/mount_drives.sh @@ -99,16 +99,17 @@ function mount_drive { echo "Looking for drive '$drive' to mount $root_dir" if [ -d /cygdrive/$drive ]; then echo "Found drive" - rm -rf $root_dir + rm -rf /$root_dir rm -rf /cygdrive/$system_drive/$root_dir + mkdir $drive:\\$root_dir cmd.exe /c mklink /J $system_drive:\\$root_dir $drive:\\$root_dir - ln -s /cygdrive/$system_drive/$root_dir /$root_dir - setfacl -s user::rwx,group::rwx,other::rwx $drive:\\$root_dir + ln -s /cygdrive/$drive/$root_dir /$root_dir + setfacl -s user::rwx,group::rwx,other::rwx /cygdrive/$drive/$root_dir for sub_dir in $sub_dirs do mkdir -p /cygdrive/$drive/$root_dir/$sub_dir done - chown -R $user_group /$root_dir + chown -R $user_group /cygdrive/$system_drive/$root_dir break fi let drive_poll_retry=drive_poll_retry+1 diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 3a292855fe1..b0117ab0d16 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1434,7 +1434,7 @@ functions: user_group="$USER:$group" script_opts="$script_opts -u $user_group" data_db=/data/db - cmds="$sudo bash mount_drives.sh $script_opts; ls -ld $data_db $log; df; mount" + cmds="$sudo bash mount_drives.sh $script_opts; mount; ls -ld $data_db $log; df" ssh_connection_options="${ssh_identity} ${ssh_connection_options}" $python buildscripts/remote_operations.py \ --verbose \ |