generic/fedora-19-i386-cloud.ks | 9 +++++++-- generic/fedora-19-x86_64-cloud.ks | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-)
New commits: commit 426e0f28cc7e34d0d14b7717a77de7322e32773f Author: Dennis Gilmore <den...@ausil.us> Date: Tue May 21 11:34:57 2013 -0500 drop -- from extlinux link grub.conf to menu.lst for ec2 use diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks index 25b540c..ee97d80 100644 --- a/generic/fedora-19-i386-cloud.ks +++ b/generic/fedora-19-i386-cloud.ks @@ -23,7 +23,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh -bootloader --timeout=1 --extlinux +bootloader --timeout=1 extlinux network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final @@ -76,7 +76,12 @@ rsync %post --erroronfail - +#link grub.conf to menu.lst for ec2 to work +if ! [[ -e /boot/grub/menu.lst ]]; then + echo -n "Linking menu.lst to old-style grub.conf for pv-grub" + ln -s /boot/grub/grub.conf /boot/grub/menu.lst + ln -sf /boot/grub/grub.conf /etc/grub.conf +fi # workaround xen performance issue (bz 651861; see also bz 708406) echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks index 4a8dfaf..0f14894 100644 --- a/generic/fedora-19-x86_64-cloud.ks +++ b/generic/fedora-19-x86_64-cloud.ks @@ -23,7 +23,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh -bootloader --timeout=1 --extlinux +bootloader --timeout=1 extlinux network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final @@ -76,6 +76,12 @@ rsync %post --erroronfail +#link grub.conf to menu.lst for ec2 to work +if ! [[ -e /boot/grub/menu.lst ]]; then + echo -n "Linking menu.lst to old-style grub.conf for pv-grub" + ln -s /boot/grub/grub.conf /boot/grub/menu.lst + ln -sf /boot/grub/grub.conf /etc/grub.conf +fi # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. _______________________________________________ cloud mailing list cloud@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/cloud