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

[Bruno Wolff III]

 tools/livecd-iso-to-disk.sh |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 827cd5bb05fb45a6df1ae907e63b7213af5b8501
Author: Bill Nottingham <notting at redhat.com>
Date:   Sat Sep 11 13:09:50 2010 -0500

    Set default boot language for USB images to the current locale.
    
    Signed-off-by: Bruno Wolff III <bruno at wolff.to>

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index f3df6f9..e12feb5 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -609,13 +609,16 @@ fi
 
 echo "Updating boot config file"
 # adjust label and fstype
+if [ -n "$LANG" ]; then
+	kernelargs="$kernelargs LANG=$LANG"
+fi
 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
 
 # DVD Installer
 if [ "$isotype" = "installer" ]; then
-  sed -i -e "s;initrd=initrd.img;initrd=initrd.img repo=hd:$USBLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI
+  sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI
   sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
 fi