containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15061 from cfergeau/always-true 

machine: Fix check which is always true
This commit is contained in:
OpenShift Merge Robot 2022-07-26 12:20:30 +02:00 committed by GitHub
parent 43d6f89d12 8e56a5605f
commit a298909dec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/qemu/machine.go
View File

@ -670,11 +670,11 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
// because / is immutable, we have to monkey around with permissions // because / is immutable, we have to monkey around with permissions
// if we dont mount in /home or /mnt // if we dont mount in /home or /mnt
args := []string{"-q", "--"} args := []string{"-q", "--"}
if !strings.HasPrefix(mount.Target, "/home") || !strings.HasPrefix(mount.Target, "/mnt") { if !strings.HasPrefix(mount.Target, "/home") && !strings.HasPrefix(mount.Target, "/mnt") {
args = append(args, "sudo", "chattr", "-i", "/", ";") args = append(args, "sudo", "chattr", "-i", "/", ";")
} }
args = append(args, "sudo", "mkdir", "-p", mount.Target) args = append(args, "sudo", "mkdir", "-p", mount.Target)
if !strings.HasPrefix(mount.Target, "/home") || !strings.HasPrefix(mount.Target, "/mnt") { if !strings.HasPrefix(mount.Target, "/home") && !strings.HasPrefix(mount.Target, "/mnt") {
args = append(args, ";", "sudo", "chattr", "+i", "/", ";") args = append(args, ";", "sudo", "chattr", "+i", "/", ";")
} }
err = v.SSH(name, machine.SSHOptions{Args: args}) err = v.SSH(name, machine.SSHOptions{Args: args})