3 commits - generic/fedora-18-x86_64-minimal.ks

[Matthew Miller]

 generic/fedora-18-x86_64-minimal.ks |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 6453a6869b4f91412f49d3d1fba42ad341f08e74
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Dec 13 13:06:09 2012 -0500

    no "set" in old grub config file syntax

diff --git a/generic/fedora-18-x86_64-minimal.ks b/generic/fedora-18-x86_64-minimal.ks
index b9508e3..82d4ea7 100644
--- a/generic/fedora-18-x86_64-minimal.ks
+++ b/generic/fedora-18-x86_64-minimal.ks
@@ -79,7 +79,7 @@ echo -n "Grub tweaks"
 echo GRUB_TIMEOUT=0 > /etc/default/grub
 sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
 sed -i '1i# This file is for use with pv-grub; legacy grub is not installed in this image' /boot/grub2/grub.cfg
-sed -i 's/^set timeout=5/set timeout=0/' /boot/grub/grub.conf
+sed -i 's/^timeout=5/timeout=0/' /boot/grub/grub.conf
 # need to file a bug on this one
 sed -i 's/root=.*/root=LABEL=_\//' /boot/grub/grub.conf
 echo .


commit d0028e5f280dce411ecba707120229558efa460c
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Dec 13 13:04:54 2012 -0500

    Revert "relatime" (this was redundant since it's the default)
    
    This reverts commit 7e8b4ca4673a5386ee7a7890883379bd606595d3.

diff --git a/generic/fedora-18-x86_64-minimal.ks b/generic/fedora-18-x86_64-minimal.ks
index 8f339ef..b9508e3 100644
--- a/generic/fedora-18-x86_64-minimal.ks
+++ b/generic/fedora-18-x86_64-minimal.ks
@@ -71,7 +71,7 @@ iptables-services
 
 echo -n "Writing fstab"
 cat <<EOF > /etc/fstab
-LABEL=_/   /         ext4    defaults,relatime        1 1
+LABEL=_/   /         ext4    defaults        1 1
 EOF
 echo .
 


commit 10686a5fc802dbebb35ec69d38e69ea353f177fa
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Dec 13 13:03:31 2012 -0500

    make old-style menu.lst/grub.conf for pv-grub in EC2 and Xen

diff --git a/generic/fedora-18-x86_64-minimal.ks b/generic/fedora-18-x86_64-minimal.ks
index c93832c..8f339ef 100644
--- a/generic/fedora-18-x86_64-minimal.ks
+++ b/generic/fedora-18-x86_64-minimal.ks
@@ -77,10 +77,15 @@ echo .
 
 echo -n "Grub tweaks"
 echo GRUB_TIMEOUT=0 > /etc/default/grub
-sed -ie 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
+sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
+sed -i '1i# This file is for use with pv-grub; legacy grub is not installed in this image' /boot/grub2/grub.cfg
+sed -i 's/^set timeout=5/set timeout=0/' /boot/grub/grub.conf
+# need to file a bug on this one
+sed -i 's/root=.*/root=LABEL=_\//' /boot/grub/grub.conf
 echo .
-
-# for EC2, need to figure out how to set up menu.list for pv-grub
+echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
+mv /boot/grub/grub.conf /boot/grub/menu.lst
+ln -s /boot/grub/menu.lst /etc/grub.conf
 
 
 # setup systemd to boot to the right runlevel