truncate shit

src/creator.rs

@@ -212,8 +212,8 @@ pub trait ImageCreator {
 		self.instpkgs()?;
 		// self.dracut()?;
 		self.rootpw()?;
-		self.postinst_script()?;
 		self.genfstab()?;
+		self.postinst_script()?;
 
 		// self.squashfs()?;
 		// self.liveos()?;
@@ -371,6 +371,29 @@ pub trait ImageCreator {
 		std::fs::remove_file(dest)?;
 		// debug!("Unmounting /dev, /proc, /sys");
 		unmount_chroot(rootname)?;
+
+		match cfg.format {
+			OutputFormat::Disk => {
+				// Post-process disk image
+
+				let image = format!("{}.raw", cfg.out);
+
+				// get actual file size by bytes using -du
+
+				let size = cmd_lib::run_fun!(du --block-size=1 $image | cut -f1)?;
+				let size = size.parse::<i64>()? + 1;
+
+				// let's truncate the disk image to the actual size
+				info!(?size, "Truncating disk image");
+
+				cmd_lib::run_cmd!(
+					truncate -s $size $image;
+				)?;
+
+
+			}
+			_ => {}
+		}
 		Ok(())
 	}
 

tests/katsudon-arm.yaml

@@ -50,7 +50,7 @@ packages:
 
 disk:
   bootloader: true
-  root_format: btrfs
+  root_format: ext4
   disk_size: 8G
 
 sys:

tests/katsudon-test.yaml

@@ -36,4 +36,4 @@ sys:
 
 script:
   init: init.sh
-  postinst: postinst.sh
+  postinst: postinst-live.sh

tests/postinst-live.sh

@@ -0,0 +1,34 @@
+#!/bin/bash -x
+echo postinst
+systemctl disable systemd-networkd-wait-online systemd-networkd systemd-networkd.socket
+systemctl disable chronyd
+# systemctl disable polkit
+# Add polkitd user manually, weird hack because preinstall script doesn't run
+cat << EOF > /usr/lib/sysusers.d/extras.conf
+# This is a really weird hack
+#Type  Name    ID   Argument
+g      polkitd 114  
+u      polkitd 114:114 "User for polkitd" - -
+
+g      rpc     32
+u      rpc     32:32  "Rpcbind Daemon" - -
+EOF
+
+echo max_parallel_downloads=20 >> /etc/dnf/dnf.conf
+echo defaultyes=True >> /etc/dnf/dnf.conf
+
+systemd-sysusers
+# dnf -y remove dracut-config-generic
+
+# dracut -vvv --force --regenerate-all -N
+
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+rm -f /var/lib/rpm/__db*
+
+echo "Fixing SELinux labels"
+
+setfiles -v -F -e /proc -e /sys -e /dev -e /bin /etc/selinux/targeted/contexts/files/file_contexts /
+setfiles -v -F -e /proc -e /sys -e /dev -e /etc/selinux/targeted/contexts/files/file_contexts.bin /bin
+