Merge pull request #26 from zaneb/initrd-length

Report size of initramfs correctly
openshift · Dec 13, 2021 · 54670f1 · 54670f1
2 parents 383497f + 6dd3842
commit 54670f1
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/pkg/imagehandler/imagefile.go b/pkg/imagehandler/imagefile.go
@@ -36,11 +36,26 @@ type imageFile struct {
 var _ fs.File = &imageFile{}
 
 func (f *imageFile) Init(inputFile baseFile) error {
-	if f.imageReader == nil {
-		var err error
-		ignition := &isoeditor.IgnitionContent{Config: f.ignitionContent}
-		f.imageReader, err = inputFile.InsertIgnition(ignition)
+	if f.imageReader != nil {
+		return nil
+	}
+
+	var err error
+	ignition := &isoeditor.IgnitionContent{Config: f.ignitionContent}
+	f.imageReader, err = inputFile.InsertIgnition(ignition)
+	if err != nil {
+		return err
+	}
+	if f.initramfs {
+		size, err := f.imageReader.Seek(0, io.SeekEnd)
+		if err != nil {
+			f.Close()
+			return err
+		}
+		f.size = size
+		_, err = f.imageReader.Seek(0, io.SeekStart)
 		if err != nil {
+			f.Close()
 			return err
 		}
 	}