Revert "Switch all rootful to rootfull"

This reverts commit cc3790f332d989440eb1720e24e3619fc97c74ee.

We can't change rootful to rootfull because `rootful` is written into the machine config. Changing this will break json unmarshalling, which will break existing machines.

[NO NEW TESTS NEEDED]

Signed-off-by: Ashley Cui <acui@redhat.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go
index e9416dc36..7340de604 100644
--- a/pkg/machine/qemu/config.go
+++ b/pkg/machine/qemu/config.go
@@ -57,8 +57,8 @@ type MachineVMV1 struct {
 	QMPMonitor Monitorv1
 	// RemoteUsername of the vm user
 	RemoteUsername string
-	// Whether this machine should run in a rootfull or rootless manner
-	Rootfull bool
+	// Whether this machine should run in a rootful or rootless manner
+	Rootful bool
 	// UID is the numerical id of the user that called machine
 	UID int
 }
@@ -99,8 +99,8 @@ type ImageConfig struct {
 
 // HostUser describes the host user
 type HostUser struct {
-	// Whether this machine should run in a rootfull or rootless manner
-	Rootfull bool
+	// Whether this machine should run in a rootful or rootless manner
+	Rootful bool
 	// UID is the numerical id of the user that called machine
 	UID int
 }
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 66f5291c1..c57fa32fb 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -204,7 +204,7 @@ func migrateVM(configPath string, config []byte, vm *MachineVM) error {
 	vm.QMPMonitor = qmpMonitor
 	vm.ReadySocket = readySocket
 	vm.RemoteUsername = old.RemoteUsername
-	vm.Rootfull = old.Rootfull
+	vm.Rootful = old.Rootful
 	vm.UID = old.UID
 
 	// Backup the original config file
@@ -258,7 +258,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
 	)
 	sshDir := filepath.Join(homedir.Get(), ".ssh")
 	v.IdentityPath = filepath.Join(sshDir, v.Name)
-	v.Rootfull = opts.Rootfull
+	v.Rootful = opts.Rootful
 
 	switch opts.ImagePath {
 	case Testing, Next, Stable, "":
@@ -356,8 +356,8 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
 		names := []string{v.Name, v.Name + "-root"}
 
 		// The first connection defined when connections is empty will become the default
-		// regardless of IsDefault, so order according to rootfull
-		if opts.Rootfull {
+		// regardless of IsDefault, so order according to rootful
+		if opts.Rootful {
 			uris[0], names[0], uris[1], names[1] = uris[1], names[1], uris[0], names[0]
 		}
 
@@ -435,7 +435,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
 }
 
 func (v *MachineVM) Set(_ string, opts machine.SetOptions) error {
-	if v.Rootfull == opts.Rootfull {
+	if v.Rootful == opts.Rootful {
 		return nil
 	}
 
@@ -459,7 +459,7 @@ func (v *MachineVM) Set(_ string, opts machine.SetOptions) error {
 
 	if changeCon {
 		newDefault := v.Name
-		if opts.Rootfull {
+		if opts.Rootful {
 			newDefault += "-root"
 		}
 		if err := machine.ChangeDefault(newDefault); err != nil {
@@ -467,7 +467,7 @@ func (v *MachineVM) Set(_ string, opts machine.SetOptions) error {
 		}
 	}
 
-	v.Rootfull = opts.Rootfull
+	v.Rootful = opts.Rootful
 	return v.writeConfig()
 }
 
@@ -1117,7 +1117,7 @@ func (v *MachineVM) setupAPIForwarding(cmd []string) ([]string, string, apiForwa
 	destSock := fmt.Sprintf("/run/user/%d/podman/podman.sock", v.UID)
 	forwardUser := "core"
 
-	if v.Rootfull {
+	if v.Rootful {
 		destSock = "/run/podman/podman.sock"
 		forwardUser = "root"
 	}
@@ -1323,11 +1323,11 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward
 	}
 
 	waitAndPingAPI(forwardSock)
-	if !v.Rootfull {
+	if !v.Rootful {
 		fmt.Printf("\nThis machine is currently configured in rootless mode. If your containers\n")
 		fmt.Printf("require root permissions (e.g. ports < 1024), or if you run into compatibility\n")
 		fmt.Printf("issues with non-podman clients, you can switch using the following command: \n")
-		fmt.Printf("\n\tpodman machine set --rootfull%s\n\n", suffix)
+		fmt.Printf("\n\tpodman machine set --rootful%s\n\n", suffix)
 	}
 
 	fmt.Printf("API forwarding listening on: %s\n", forwardSock)