Merge branch 'debug' into 'main'

install: Two logging/output tweaks

See merge request bootc-org/podman-bootc-cli!57

Author: ckyrouac

pkg/bootc/bootc_disk.go

@@ -135,14 +135,17 @@ func (p *BootcDisk) getOrInstallImageToDisk(quiet bool) error {
 		if !errors.Is(err, os.ErrNotExist) {
 			return err
 		}
+		logrus.Debugf("No existing disk image found")
 		return p.bootcInstallImageToDisk(quiet)
 	}
+	logrus.Debug("Found existing disk image, comparing digest")
 	defer f.Close()
 	buf := make([]byte, 4096)
 	len, err := unix.Fgetxattr(int(f.Fd()), imageMetaXattr, buf)
 	if err != nil {
 		// If there's no xattr, just remove it
 		os.Remove(diskPath)
+		logrus.Debugf("No %s xattr found", imageMetaXattr)
 		return p.bootcInstallImageToDisk(quiet)
 	}
 	bufTrimmed := buf[:len]
@@ -170,7 +173,7 @@ func align(size int64, align int64) int64 {
 
 // bootcInstallImageToDisk creates a disk image from a bootc container
 func (p *BootcDisk) bootcInstallImageToDisk(quiet bool) (err error) {
-	println("Creating bootc disk image...")
+	fmt.Printf("Executing `bootc install to-disk` from container image %s to create disk image\n", p.RepoTag)
 	p.file, err = os.CreateTemp(p.Directory, "podman-bootc-tempdisk")
 	if err != nil {
 		return err
@@ -186,6 +189,7 @@ func (p *BootcDisk) bootcInstallImageToDisk(quiet bool) (err error) {
 	if err := syscall.Ftruncate(int(p.file.Fd()), size); err != nil {
 		return err
 	}
+	logrus.Debugf("Created %s with size %v", p.file.Name(), diskSize)
 	doCleanupDisk := true
 	defer func() {
 		if doCleanupDisk {
@@ -260,16 +264,19 @@ func (p *BootcDisk) runInstallContainer(quiet bool) (err error) {
 	}
 
 	p.bootcInstallContainerId = createResponse.ID //save the id for possible cleanup
+	logrus.Debugf("Created install container, id=%s", createResponse.ID)
 
 	// run the container to create the disk
 	err = containers.Start(p.Ctx, p.bootcInstallContainerId, &containers.StartOptions{})
 	if err != nil {
 		return fmt.Errorf("failed to start container: %w", err)
 	}
+	logrus.Debugf("Started install container")
 
 	var exitCode int32
 	if quiet {
 		//wait for the container to finish
+		logrus.Debugf("Waiting for container completion")
 		exitCode, err = containers.Wait(p.Ctx, p.bootcInstallContainerId, nil)
 		if err != nil {
 			return fmt.Errorf("failed to wait for container: %w", err)
@@ -311,6 +318,7 @@ func (p *BootcDisk) runInstallContainer(quiet bool) (err error) {
 		}()
 
 		//wait for the container to finish
+		logrus.Debugf("Waiting for container completion (streaming output)")
 		exitCode, err = containers.Wait(p.Ctx, p.bootcInstallContainerId, nil)
 		if err != nil {
 			return fmt.Errorf("failed to wait for container: %w", err)