From: micah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Sun, 4 Mar 2007 20:15:39 +0000 (+0000)
Subject: fix LC_ALL=C sfdisk thing that I missed
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=efcad8349b48114abaf03df333744225e7c236a4;p=matthijs%2Fupstream%2Fbackupninja.git

fix LC_ALL=C sfdisk thing that I missed


git-svn-id: http://code.autistici.org/svn/backupninja/trunk@469 758a04ac-41e6-0310-8a23-8373a73cc35d
---

diff --git a/ChangeLog b/ChangeLog
index 9c7ea45..1179b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@ version 0.9.5 -- unreleased
 	   that produce warnings about no harddisks found (Closes: #404071)
 	 . Fixed example in example.sys to detail the __star__ in partitionsfile and
 	   note why its necessary (Closes: #409192)
+	 . Force C locale for sfdisk to ensure english words are found in grep
     fixed 'make install' bug that failed if /etc/backup.d already existed
     changed spaces to tabs in Makefile.am
     updated examples/Makefile.am and handlers/Makefile.am to include rsnap/rub files
diff --git a/handlers/sys b/handlers/sys
index 3e7f03e..2e181c8 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -473,7 +473,7 @@ fi
 
 if [ "$partitions" == "yes" ]; then
    if [ "$dosfdisk" == "yes" ]; then
-      devices=`$SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
+      devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
 	if [ "$devices" == "" ]; then 
 	   warning "No harddisks found" 
 	fi