ec2/fedora-17-i386-ec2.ks | 2 +-
ec2/fedora-17-x86_64-ec2.ks | 2 +-
generic/fedora-19-i386-cloud.ks | 11 ++++++++---
generic/fedora-19-x86_64-cloud.ks | 10 +++++++---
4 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit 892cce53e9ff70cbcc234c3d385af33f291a168a
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Fri May 24 09:29:43 2013 -0400
add cloud-utils for growpart support. brings in a lot of other dependencies,
but best approach for right now.
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 4f8941e..94fa77f 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -51,6 +51,11 @@ dracut-norescue
# a user account with ssh keys.
cloud-init
+# need this for growpart, because parted doesn't yet support resizepart
+# https://bugzilla.redhat.com/show_bug.cgi?id=966993
+cloud-utils
+
+
# Not needed with pv-grub (as in EC2), and pulled in automatically
# by anaconda, but appliance-creator needs the hint
syslinux-extlinux
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 9ebdc93..8686a9e 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -47,6 +47,10 @@ kernel
# a user account with ssh keys.
cloud-init
+# need this for growpart, because parted doesn't yet support resizepart
+# https://bugzilla.redhat.com/show_bug.cgi?id=966993
+cloud-utils
+
# We need this image to be portable; also, rescue mode isn't useful here.
dracut-nohostonly
dracut-norescue
commit 4fa5458580361a2acc43cb47fdb4929b5c878ada
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Fri May 24 09:28:04 2013 -0400
console=ttyS0 for cloud console output
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index d2df065..4f8941e 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -24,7 +24,7 @@ rootpw --lock
# matching these rules is generated below.
firewall --service=ssh
-bootloader --timeout=1 extlinux
+bootloader --timeout=1 --append="console=ttyS0" extlinux
network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 96d222e..9ebdc93 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -24,7 +24,7 @@ rootpw --lock
# matching these rules is generated below.
firewall --service=ssh
-bootloader --timeout=1 extlinux
+bootloader --timeout=1 --append="console=ttyS0" extlinux
network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
commit d38ce55ecb4e03139be4608a3918a2bce4d76e33
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Fri May 24 09:23:47 2013 -0400
more strong conditional for soft linking menu.lst
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 2200857..d2df065 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -79,9 +79,9 @@ rsync
%post --erroronfail
#link grub.conf to menu.lst for ec2 to work
-if ! [[ -e /boot/grub/menu.lst ]]; then
+if [[ -e /boot/grub/grub.conf ]]; then
echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
- ln -s grub.conf /boot/grub/menu.lst
+ ln -sf grub.conf /boot/grub/menu.lst
ln -sf /boot/grub/grub.conf /etc/grub.conf
fi
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 906a75f..96d222e 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -79,9 +79,9 @@ rsync
%post --erroronfail
#link grub.conf to menu.lst for ec2 to work
-if ! [[ -e /boot/grub/menu.lst ]]; then
+if [[ -e /boot/grub/grub.conf ]]; then
echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
- ln -s grub.conf /boot/grub/menu.lst
+ ln -sf grub.conf /boot/grub/menu.lst
ln -sf /boot/grub/grub.conf /etc/grub.conf
fi
commit e998616329738a7dd416be8dddfc039eaada9c1e
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Thu May 23 15:32:42 2013 -0400
rootpw --lock with no password does not work with F17. For this version,
just rely on passwd -l root in %post.
diff --git a/ec2/fedora-17-i386-ec2.ks b/ec2/fedora-17-i386-ec2.ks
index 2335a98..9bf09bb 100644
--- a/ec2/fedora-17-i386-ec2.ks
+++ b/ec2/fedora-17-i386-ec2.ks
@@ -4,7 +4,7 @@ keyboard us
timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
-rootpw --lock
+# root password blank but locked below
firewall --service=ssh
bootloader --timeout=1 --location=mbr --driveorder=sda
network --bootproto=dhcp --device=eth0 --onboot=on
diff --git a/ec2/fedora-17-x86_64-ec2.ks b/ec2/fedora-17-x86_64-ec2.ks
index 9e9c2dd..c50703a 100644
--- a/ec2/fedora-17-x86_64-ec2.ks
+++ b/ec2/fedora-17-x86_64-ec2.ks
@@ -4,7 +4,7 @@ keyboard us
timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
-rootpw --lock
+# root password blank but locked below
firewall --service=ssh
bootloader --timeout=1 --location=mbr --driveorder=sda
network --bootproto=dhcp --device=eth0 --onboot=on
_______________________________________________
cloud mailing list
cloud@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/cloud
