Skip to content

Commit 1e4843a

Browse files
authored
Merge pull request #96 from jingxu97/oct/dismount
Update Dismount function
2 parents c5d08fd + 4f072f2 commit 1e4843a

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

internal/os/volume/api.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -188,25 +188,12 @@ func (VolAPIImplementor) GetVolumeIDFromMount(mount string) (string, error) {
188188
}
189189

190190
func getTarget(mount string) (string, error) {
191-
cmd := fmt.Sprintf("Get-Item -LiteralPath \"%s\" | Select Target | ConvertTo-Json", mount)
191+
cmd := fmt.Sprintf("(Get-Item -Path %s).Target", mount)
192192
out, err := runExec(cmd)
193-
194193
if err != nil || len(out) == 0 {
195194
return "", fmt.Errorf("error getting volume from mount. cmd: %s, output: %s, error: %v", cmd, string(out), err)
196195
}
197-
198-
var getVolume map[string][]string
199-
outString := string(out)
200-
err = json.Unmarshal([]byte(outString), &getVolume)
201-
if err != nil {
202-
return "", fmt.Errorf("out %v outstring %v err %v", out, outString, err)
203-
}
204-
var volumeString string
205-
206-
volumeString = getVolume["Target"][0]
207-
208-
volumeString = strings.TrimSuffix(volumeString, "\n")
209-
196+
volumeString := strings.TrimSpace(string(out))
210197
if !strings.HasPrefix(volumeString, "Volume") {
211198
return getTarget(volumeString)
212199
}

0 commit comments

Comments
 (0)