3 commits - generic/fedora-19-i386-cloud.ks generic/fedora-19-x86_64-cloud.ks

[Matthew Miller]

 generic/fedora-19-i386-cloud.ks   |    9 +++++++--
 generic/fedora-19-x86_64-cloud.ks |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit ba80d301ade0494799b8ecbcf9dd9061e8431ff5
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Fri May 24 10:20:09 2013 -0400

    workaround https://bugzilla.redhat.com/show_bug.cgi?id=966888

diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 944be3a..265f586 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -193,6 +193,11 @@ fi
 # make sure firstboot doesn't start
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
+# workaround https://bugzilla.redhat.com/show_bug.cgi?id=966888
+if ! grep -q growpart /etc/cloud/cloud.cfg; then
+  sed -i 's/ - resizefs/ - growpart\n - resizefs/' /etc/cloud/cloud.cfg
+fi
+
 # Uncomment this if you want to use cloud init but suppress the creation
 # of an "ec2-user" account. This will, in the absence of further config,
 # cause the ssh key from a metadata source to be put in the root account.
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index f2c2202..8786083 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -190,6 +190,11 @@ fi
 # make sure firstboot doesn't start
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
+# workaround https://bugzilla.redhat.com/show_bug.cgi?id=966888
+if ! grep -q growpart /etc/cloud/cloud.cfg; then
+  sed -i 's/ - resizefs/ - growpart\n - resizefs/' /etc/cloud/cloud.cfg
+fi
+
 # Uncomment this if you want to use cloud init but suppress the creation
 # of an "ec2-user" account. This will, in the absence of further config,
 # cause the ssh key from a metadata source to be put in the root account.


commit 0e1acc09dfaf119af1458817ba8bb9b1cb7e9a75
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Fri May 24 10:15:02 2013 -0400

    go small, since we are including cloud-utils growpart

diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 3a6ea74..944be3a 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -30,7 +30,7 @@ network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 
-part / --size 10000 --fstype ext4
+part / --size 2048 --fstype ext4
 
 
 # Repositories
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 48717ff..f2c2202 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -30,7 +30,7 @@ network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 
-part / --size 10000 --fstype ext4
+part / --size 2048 --fstype ext4
 
 
 # Repositories


commit a79056546658a9edda9d77fe6fc47a366fa051e0
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Fri May 24 10:14:22 2013 -0400

    also use regular console

diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 94fa77f..3a6ea74 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 --append="console=ttyS0" extlinux
+bootloader --timeout=1 --append="console=tty0 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 8686a9e..48717ff 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 --append="console=ttyS0" extlinux
+bootloader --timeout=1 --append="console=tty0 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