little bit of refactoring

src/builder.rs

@@ -144,9 +144,6 @@ impl Bootloader {
 	/// Currently only works for PC, no mac support
 	fn mkefiboot(&self, chroot: &Path, _: &Manifest) -> Result<()> {
 		let tree = chroot.parent().unwrap().join(ISO_TREE);
-		let tmp = PathBuf::from("/tmp/katsu.efiboot");
-		std::fs::create_dir_all(&tmp)?;
-		// glob the funny
 
 		// TODO: Add mac boot support
 
@@ -424,11 +421,9 @@ pub fn run_script(script: Script, chroot: &Path, in_chroot: bool) -> Result<()>
 	Ok(())
 }
 
-pub fn run_all_scripts(scripts: &[Script], chroot: &Path, in_chroot: bool) -> Result<()> {
-	let mut scrs: HashMap<String, (Script, bool)> = HashMap::new();
-	scripts.iter().for_each(|s| {
-		scrs.insert(s.id.clone().unwrap_or("<?>".into()), (s.clone(), false));
-	});
+pub fn run_all_scripts(scrs: &[Script], chroot: &Path, in_chroot: bool) -> Result<()> {
+	let scrs =
+		scrs.iter().map(|s| (s.id.clone().unwrap_or("<?>".into()), (s.clone(), false))).collect();
 	run_scripts(scrs, chroot, in_chroot)
 }
 
@@ -523,7 +518,7 @@ impl ImageBuilder for DiskImageBuilder {
 
 		self.root_builder.build(&chroot.canonicalize()?, manifest)?;
 
-		disk.unmount_from_chroot(&ldp, chroot)?;
+		disk.unmount_from_chroot()?;
 		loopdev.detach()?;
 
 		Ok(())
@@ -540,11 +535,11 @@ pub struct DeviceInstaller {
 
 impl ImageBuilder for DeviceInstaller {
 	fn build(
-		&self, _chroot: &Path, _image: &Path, _manifest: &Manifest, skip_phases: &SkipPhases,
+		&self, _chroot: &Path, _image: &Path, _manifest: &Manifest, _skip_phases: &SkipPhases,
 	) -> Result<()> {
 		todo!();
-		self.root_builder.build(_chroot, _manifest)?;
-		Ok(())
+		// self.root_builder.build(_chroot, _manifest)?;
+		// Ok(())
 	}
 }
 

src/config.rs

@@ -248,7 +248,6 @@ impl PartitionLayout {
 
 	pub fn get_index(&self, mountpoint: &str) -> Option<usize> {
 		// index should be +1 of the actual partition number (sda1 is index 0)
-
 		self.partitions.iter().position(|p| p.mountpoint == mountpoint).map(|i| i + 1)
 	}
 
@@ -284,7 +283,6 @@ impl PartitionLayout {
 
 		ordered.sort_unstable_by(|(_, a), (_, b)| {
 			// trim trailing slashes
-
 			let am = a.mountpoint.trim_end_matches('/').matches('/').count();
 			let bm = b.mountpoint.trim_end_matches('/').matches('/').count();
 			if a.mountpoint == "/" {
@@ -327,24 +325,16 @@ impl PartitionLayout {
 		Ok(())
 	}
 
-	pub fn unmount_from_chroot(&self, disk: &Path, chroot: &Path) -> Result<()> {
+	pub fn unmount_from_chroot(&self) -> Result<()> {
 		// unmount partitions from chroot
 
 		// sort partitions by mountpoint
-		let ordered = self.sort_partitions().into_iter().rev().collect::<Vec<_>>();
-
-		for (index, part) in &ordered {
-			let devname = partition_name(&disk.to_string_lossy(), *index);
-
-			// clean the mountpoint so we don't have the slash at the start
-			let mp_cleaned = part.mountpoint.trim_start_matches('/');
-			let mountpoint = chroot.join(mp_cleaned);
-
-			std::fs::create_dir_all(&mountpoint)?;
-
-			trace!("umount {devname} {mountpoint:?}");
+		let ordered =
+			self.sort_partitions().into_iter().map(|(_, p)| p.mountpoint).rev().collect::<Vec<_>>();
 
-			cmd_lib::run_cmd!(umount $devname 2>&1)?;
+		for mp in &ordered {
+			trace!("umount {mp}");
+			cmd_lib::run_cmd!(umount $mp 2>&1)?;
 		}
 		Ok(())
 	}

src/util.rs

@@ -383,6 +383,3 @@ pub fn run_with_chroot<T>(root: &Path, f: impl FnOnce() -> Result<T>) -> Result<
 	unmount_chroot(root)?;
 	res
 }
-
-
-