[Fedora-livecd-list] tools/livecd-iso-to-disk.sh

Warren Togami 砥上勇 wtogami at fedoraproject.org
Wed Dec 16 18:47:36 UTC 2009


 tools/livecd-iso-to-disk.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6872def12cb62eeaf17b6f6a8c12a7e0ae29a8cb
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Dec 16 13:46:07 2009 -0500

    livecd-iso-to-disk.sh: use LC_ALL=C, not LANG=C, since LC_ALL trumps all other envvars, including LANG.  For example,
      $ LC_ALL=fr_FR.UTF-8 LANG=C /bin/cat no-such
      /bin/cat: no-such: Aucun fichier ou dossier de ce type

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 95ca158..3a4726d 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -147,7 +147,7 @@ createGPTLayout() {
     read
     umount ${device}? &> /dev/null
     /sbin/parted --script $device mklabel gpt
-    partinfo=$(LANG=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
+    partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
     /sbin/parted --script $device unit b mkpart '"EFI System Partition"' fat32 17408 $(($size - 17408)) set 1 boot on
     USBDEV=${device}1
@@ -169,7 +169,7 @@ createMSDOSLayout() {
     read
     umount ${device}? &> /dev/null
     /sbin/parted --script $device mklabel msdos
-    partinfo=$(LANG=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
+    partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
     /sbin/parted --script $device unit b mkpart primary fat32 17408 $(($size - 17408)) set 1 boot on
     USBDEV=${device}1
@@ -192,7 +192,7 @@ checkGPT() {
        exitclean
     fi
 
-    partinfo=$(LANG=C /sbin/parted --script -m $device "print" |grep ^$partnum:)
+    partinfo=$(LC_ALL=C /sbin/parted --script -m $device "print" |grep ^$partnum:)
     volname=$(echo $partinfo |cut -d : -f 6)
     flags=$(echo $partinfo |cut -d : -f 7)
     if [ "$volname" != "EFI System Partition" ]; then





More information about the Fedora-livecd-list mailing list