tar2fs: avoid duplicate fstab entry

This commit fixes duplication of root device entry in /etc/fstab and changes LABEL=ROOT entry with the proper one if found. Apparently this didn't hurt qemu images much though...

tar2fs: avoid duplicate fstab entry
2ac26880 · Anton Midyukov · Michael Shigorin · caee317e · 2ac26880
Commit 2ac26880 authored Sep 10, 2019 by Anton Midyukov Committed by Michael Shigorin Sep 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

tar2fs bin/tar2fs +5 -1

No files found.
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -224,7 +224,11 @@ tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
 for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done

 # loop device so lilo could work...
-echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
+if grep -qe "[[:space:]]/[[:space:]]" "$ROOTFS/etc/fstab"; then \
+	sed -i "s/LABEL=ROOT/$ROOTDEV/" "$ROOTFS/etc/fstab"
+else
+	echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
+fi

 # target device at once
 if [ -n "$BOOTPART" ]; then