3 commits - docs/livecd-iso-to-disk.pod tools/livecd-iso-to-disk.sh

[Warren Togami 砥上勇]

 docs/livecd-iso-to-disk.pod |    8 ++++++--
 tools/livecd-iso-to-disk.sh |   10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit e22eee657156d205c10ddbc93afdb006d8152b97
Author: Bernie Innocenti <bernie(a)codewiz.org&gt;
Date:   Sun Nov 22 22:31:23 2009 -0500

    LANG=C when parted output is being scraped, as localized strings cause it to fail.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 2fd6d29..95ca158 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=$(/sbin/parted --script -m $device "unit b print" |grep
^$device:)
+    partinfo=$(LANG=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=$(/sbin/parted --script -m $device "unit b print" |grep
^$device:)
+    partinfo=$(LANG=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=$(/sbin/parted --script -m $device "print" |grep ^$partnum:)
+    partinfo=$(LANG=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


commit ffa15aef04108b65ab395617d835266e818b9b29
Author: Bastien Nocera <hadess(a)hadess.net&gt;
Date:   Sun Nov 8 14:28:48 2009 +0000

    Document the --efi command-line argument
    
    In the man page, and in the tool.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=533687

diff --git a/docs/livecd-iso-to-disk.pod b/docs/livecd-iso-to-disk.pod
index 9274ab8..c673eef 100644
--- a/docs/livecd-iso-to-disk.pod
+++ b/docs/livecd-iso-to-disk.pod
@@ -6,7 +6,7 @@ livecd-iso-to-disk - installs bootable CD images on a USB storage
devices.
 
 =head1 SYNOPSIS
 
-B<livecd-iso-to-disk> [--format] [--reset-mbr] [--noverify] [--overlay-size-mb
<size>] [\-\-home\-size\-mb <size>] [\-\-unencrypted\-home] [\-\-skipcopy] 
<path-to-iso> <usb storage device>
+B<livecd-iso-to-disk> [--format] [--reset-mbr] [--noverify] [--efi]
[--overlay-size-mb <size>] [\-\-home\-size\-mb <size>] [\-\-unencrypted\-home]
[\-\-skipcopy]  <path-to-iso> <usb storage device>
 
 =head1 DESCRIPTION
 
@@ -20,7 +20,7 @@ B<livecd-iso-to-disk> is not a destructive process; any data you
currently have
 
 =item --format
 
-Formats the USB stick and creates a GPT partition table.
+Formats the USB stick and creates an MS-DOS partition table (or GPT partition table if
--efi is passed).
 
 =item --reset-mbr
 
@@ -46,6 +46,10 @@ Disables the encryption of the home directory.
 
 Skips the copy of the live image to the USB stick.
 
+=item --efi
+
+Create a GPT partition table when --format is passed, and install an hybrid EFI/MBR
bootloader on the disk. This is necessary for most Intel Macs.
+
 =back
 
 =head1 CONTRIBUTORS
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index e947b4a..2fd6d29 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -23,7 +23,7 @@
 export PATH=/sbin:/usr/sbin:$PATH
 
 usage() {
-    echo "$0 [--format] [--reset-mbr] [--noverify] [--overlay-size-mb <size>]
[--home-size-mb <size>] [--unencrypted-home] [--skipcopy] <isopath>
<usbstick device>"
+    echo "$0 [--format] [--reset-mbr] [--noverify] [--overlay-size-mb <size>]
[--home-size-mb <size>] [--unencrypted-home] [--skipcopy] [--efi] <isopath>
<usbstick device>"
     exit 1
 }
 


commit 96a0ef5bf18f928beb7884935d47627101663f88
Author: Bastien Nocera <hadess(a)hadess.net&gt;
Date:   Mon Nov 9 12:48:28 2009 +0000

    Update the root label for EFI as well
    
    EFI likes to have its root disk label set correctly as well.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 67b25b7..e947b4a 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -596,7 +596,7 @@ fi
 
 echo "Updating boot config file"
 # adjust label and fstype
-sed -i -e "s/CDLABEL=[^ ]*/$USBLABEL/" -e "s/rootfstype=[^
]*/rootfstype=$USBFS/" $BOOTCONFIG  $BOOTCONFIG_EFI
+sed -i -e "s/CDLABEL=[^ ]*/$USBLABEL/" -e "s/rootfstype=[^
]*/rootfstype=$USBFS/" -e "s/LABEL=[^ ]*/$USBLABEL/" $BOOTCONFIG 
$BOOTCONFIG_EFI
 if [ -n "$kernelargs" ]; then sed -i -e "s/liveimg/liveimg
${kernelargs}/" $BOOTCONFIG $BOOTCONFIG_EFI ; fi
 if [ "$LIVEOS" != "LiveOS" ]; then sed -i -e "s;liveimg;liveimg
live_dir=$LIVEOS;" $BOOTCONFIG $BOOTCONFIG_EFI ; fi

[Jim Meyering]

Warren Togami 砥上勇 wrote:
>   docs/livecd-iso-to-disk.pod |    8 ++++++--
>   tools/livecd-iso-to-disk.sh |   10 +++++-----
>   2 files changed, 11 insertions(+), 7 deletions(-)
>
>  New commits:
>  commit e22eee657156d205c10ddbc93afdb006d8152b97
>  Author: Bernie Innocenti <bernie(a)codewiz.org&gt;
>  Date:   Sun Nov 22 22:31:23 2009 -0500
>
>      LANG=C when parted output is being scraped, as localized strings cause it to fail.
Hi Bernie,

Please use LC_ALL=C for this sort of thing, 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 
...
>  -    partinfo=$(/sbin/parted --script -m $device "unit b
> print" |grep ^$device:)
>  +    partinfo=$(LANG=C /sbin/parted --script -m $device "unit b print" |grep
> ^$device:) 

> From fc8b39c586b5f88440ebb78acc64b6a40807ba64 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com&gt;
Date: Tue, 1 Dec 2009 10:19:10 +0100
Subject: [PATCH] livecd-iso-to-disk.sh: use LC_ALL=C, not LANG=C, since...

* tools/livecd-iso-to-disk.sh: ...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
---
 tools/livecd-iso-to-disk.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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
--
1.6.6.rc0.324.gb5bf2