github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121881 from cji/5528

Browse Source 
Use golang library instead of mklink
This commit is contained in:
Kubernetes Prow Robot 2023-11-14 23:02:08 +01:00 committed by GitHub
commit 620bc81d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/mount-utils/mount_windows.go
View File

@ -150,12 +150,12 @@ func (mounter *Mounter) MountSensitive(source string, target string, fstype stri
mklinkSource = mklinkSource + "\\" mklinkSource = mklinkSource + "\\"
} }
output, err := exec.Command("cmd", "/c", "mklink", "/D", target, mklinkSource).CombinedOutput() err := os.Symlink(mklinkSource, target)
if err != nil { if err != nil {
klog.Errorf("mklink failed: %v, source(%q) target(%q) output: %q", err, mklinkSource, target, string(output)) klog.Errorf("symlink failed: %v, source(%q) target(%q)", err, mklinkSource, target)
return err return err
} }
klog.V(2).Infof("mklink source(%q) on target(%q) successfully, output: %q", mklinkSource, target, string(output)) klog.V(2).Infof("symlink source(%q) on target(%q) successfully", mklinkSource, target)
return nil return nil
} }
@ -219,8 +219,9 @@ func removeSMBMapping(remotepath string) (string, error) {
func (mounter *Mounter) Unmount(target string) error { func (mounter *Mounter) Unmount(target string) error {
klog.V(4).Infof("Unmount target (%q)", target) klog.V(4).Infof("Unmount target (%q)", target)
target = NormalizeWindowsPath(target) target = NormalizeWindowsPath(target)
if output, err := exec.Command("cmd", "/c", "rmdir", target).CombinedOutput(); err != nil {
klog.Errorf("rmdir failed: %v, output: %q", err, string(output)) if err := os.Remove(target); err != nil {
klog.Errorf("removing directory %s failed: %v", target, err)
return err return err
} }
return nil return nil