tar2fs: fixed broken sfdisk use

Yet another age old bug: `sfdisk -l' is mimicking what a person does by hand but the script is rather interested in what `sfdisk -g' provides, that is, geometry. And it's stupid enough to only grok C locale.

tar2fs: fixed broken sfdisk use
0cdc8a7d · Michael Shigorin · 1d0d1cea · 0cdc8a7d
Commit 0cdc8a7d authored May 31, 2015 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

tar2fs bin/tar2fs +3 -2

No files found.
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -3,6 +3,7 @@
 # tar2fs chroot.tar image.raw [size_in_bytes [fstype]]
 . shell-error
+export LANG=C
 if [ $# -lt 2 ]; then
 	fatal "error: tar2fs needs at least two arguments"
@@ -211,8 +212,8 @@ sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
 if [ -x "$ROOTFS"/sbin/lilo ]; then
 	# configure and install bootloader
-	REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
+	REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
-	set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
+	set -- $(sfdisk -g "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
 	LILO_COMMON="lba32
 delay=1