cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: refs/heads/master - CLOUDSTACK-1340: Fix grub2 cfg to boot without waiting, fix locale
Date Wed, 06 Mar 2013 08:53:23 GMT
Updated Branches:
  refs/heads/master 9342f561f -> bb2c7dc72


CLOUDSTACK-1340: Fix grub2 cfg to boot without waiting, fix locale

Thanks to Marcus for testing and helping on KVM template, adding locale fix as
per Marcus's suggestion. Tested with latest build on my local vbox.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bb2c7dc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bb2c7dc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bb2c7dc7

Branch: refs/heads/master
Commit: bb2c7dc7284fe1887be209b18813df72d96edbbb
Parents: 9342f56
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Wed Mar 6 14:19:33 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Wed Mar 6 14:21:06 2013 +0530

----------------------------------------------------------------------
 .../appliance/definitions/systemvmtemplate/base.sh |    2 +-
 .../definitions/systemvmtemplate/postinstall.sh    |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bb2c7dc7/tools/appliance/definitions/systemvmtemplate/base.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/base.sh b/tools/appliance/definitions/systemvmtemplate/base.sh
index d8f6901..4d6092a 100644
--- a/tools/appliance/definitions/systemvmtemplate/base.sh
+++ b/tools/appliance/definitions/systemvmtemplate/base.sh
@@ -13,7 +13,7 @@ echo 'cloud ALL=NOPASSWD:ALL' > /etc/sudoers.d/cloud
 echo 'UseDNS no' >> /etc/ssh/sshd_config
 
 # Remove 5s grub timeout to speed up booting
-echo <<EOF > /etc/default/grub
+cat <<EOF > /etc/default/grub
 # If you change this file, run 'update-grub' afterwards to update
 # /boot/grub/grub.cfg.
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bb2c7dc7/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index dd07e6e..8e745eb 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -136,6 +136,8 @@ EOF
   cat >> /etc/locale.gen  << EOF
 en_US.UTF-8 UTF-8
 EOF
+
+  locale-gen en_US.UTF-8
 }
 
 do_fixes() {


Mime
View raw message