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

Matthew Miller mattdm at fedoraproject.org
Mon Jun 17 18:44:41 UTC 2013


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

New commits:
commit 5c70a0a3df5121ad76694f70d79180b63c35d1b7
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Mon Jun 17 14:44:28 2013 -0400

    ec2-user to fedora; see mailing list discussion

diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 4010024..2a92bc6 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -213,6 +213,10 @@ fi
 #disable_root: 0
 #EOF
 
+# This is a temporary fix to change the default user to "fedora"; this
+# change is pending in an f19 update to the cloud-utils pakcage
+sed -i 's/ec2-user/fedora/;s/EC2 user/Fedora Cloud User/' /etc/cloud/cloud.cfg
+
 echo "Cleaning old yum repodata."
 yum clean all
 
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index cfba2a1..b89d417 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -210,6 +210,10 @@ fi
 #disable_root: 0
 #EOF
 
+# This is a temporary fix to change the default user to "fedora"; this
+# change is pending in an f19 update to the cloud-utils pakcage
+sed -i 's/ec2-user/fedora/;s/EC2 user/Fedora Cloud User/' /etc/cloud/cloud.cfg
+
 echo "Cleaning old yum repodata."
 yum clean all
 


commit e6cc4607fa93164ba37425bc6f3b034049ebbfcb
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Mon Jun 17 14:44:05 2013 -0400

    tty fixes

diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 1e14cb3..4010024 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -24,7 +24,7 @@ rootpw --lock --iscrypted locked
 # matching these rules is generated below.
 firewall --service=ssh
 
-bootloader --timeout=1 --append="serial=tty0 console=tty1 console=ttyS0,115200n8 console=hvc0" extlinux
+bootloader --timeout=1 --append="serial=tty0 console=ttyS0,115200n8 console=hvc0 console=tty1" extlinux
 
 network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -143,6 +143,12 @@ COMMIT
 EOF
 echo .
 
+echo -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
 
 echo -n "Network fixes"
 # initscripts don't like this file to be missing.
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 4d185b5..cfba2a1 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -24,7 +24,7 @@ rootpw --lock --iscrypted locked
 # matching these rules is generated below.
 firewall --service=ssh
 
-bootloader --timeout=1 --append="serial=tty0 console=tty1 console=ttyS0,115200n8 console=hvc0" extlinux
+bootloader --timeout=1 --append="serial=tty0 console=ttyS0,115200n8 console=hvc0 console=tty1" extlinux
 
 network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -139,6 +139,12 @@ COMMIT
 EOF
 echo .
 
+echo -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
 
 echo -n "Network fixes"
 # initscripts don't like this file to be missing.




More information about the cloud mailing list