tar2fs: chgrp and failsafe kpartx

The current state made vm images belong to root group, no reason to not change those to the primary group of the user building an image. kpartx -d -s could fail in some circumstances, make a safety cleanup call more verbose.

tar2fs: chgrp and failsafe kpartx
aa7f2d84 · Michael Shigorin · 209c610f · aa7f2d84
Commit aa7f2d84 authored Aug 02, 2017 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

tar2fs bin/tar2fs +5 -2

No files found.
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -138,7 +138,10 @@ exit_handler() {
 		umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}

 		if [ -n "$LOOPDEV" ]; then
-			kpartx -d -s "$LOOPDEV"
+			kpartx -d -s "$LOOPDEV" || {
+				sleep 10
+				kpartx -d -s -v "$LOOPDEV"
+			}
 			losetup --detach "$LOOPDEV"
 		fi
 		rm -r -- "$ROOTFS"
@@ -272,5 +275,5 @@ image=/boot/vmlinuz
 fi

 if [ -n "$SUDO_USER" ]; then
-	chown "$SUDO_USER" "$IMG" "$ROOTFS" "$WORKDIR"
+	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" "$ROOTFS" "$WORKDIR" ||:
 fi