Fedora 19 image on EC2
by Krishna Raman
Hi,
Wondering if there is a Fedora 19 AMI available on EC2 US-East-1?
I would like to start building and testing OpenShift Origin on there if possible.
--Krishna
10 years, 3 months
Default cloud user name
by Juerg Haefliger
Hi all,
Per Matt's request, I'm starting a new thread about the default user
name for Fedora cloud images. Currently it's 'ec2-user' which I don't
really like. OK, coming from the OpenStack-side of the cloud I might
be a little biased :-) Nevertheless, I think we want to achieve an end
goal of a single image that can be used in different cloud
environments rather than having different images for the different
environments. As such, the user name needs to be cloud/service
provider independent. Following the lead of Ubuntu and Debian I
propose to use 'fedora' as the default user name for F19 and going
forward.
Let the popularity contest begin...
...Juerg
10 years, 3 months
Fedora 19 Beta RC AMI's
by Dennis Gilmore
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi All
there is some ami's in us-east-1 on ec2
ami-21e08848 : us-east-1 image for i386
ami-f9e08890 : us-east-1 image for x86_64
the ec2 images are exactly the same as at
http://dl.fedoraproject.org/pub/alt/stage/19-Beta-RC4/Images/
I've compressed the qcow2 images and put up xz compressed raw images
Dennis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEARECAAYFAlGeg9QACgkQkSxm47BaWffJHQCfa6O6879+KP2rHv5842Ead6ux
jcwAnj8VBzQ8s7/K/Pqofn2/jenhucZ+
=l3Uq
-----END PGP SIGNATURE-----
10 years, 3 months
3 commits - generic/fedora-19-i386-cloud.ks generic/fedora-19-x86_64-cloud.ks
by 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(a)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(a)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(a)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
10 years, 3 months
Fedora 19 beta test candidate images
by Matthew Miller
Take a look at
http://dl.fedoraproject.org/pub/alt/stage/19-Beta-RC4/Images/
based on the Fedora Go/No-Go meeting, this is likely to be the Beta.
We have a couple of known issues in this beta release, which will probably
cause us to respin some intermediate updated images between beta and final.
1. Cloud init hostname module broken
- This causes an about-one-minute delay on boot, during which ec2-user is
not created.
Bug https://bugzilla.redhat.com/show_bug.cgi?id=964006
2. Growroot support not working right
- possibly related to the above? Definitely related to recent
conversation.
- Currently still producing 10GB images until this is resolved
No bug yet but will file something soon.
3. qcow2 image is uncompressed
- this is due to the current release engineering workflow
- will be fixed one way or another for general release
--
Matthew Miller ☁☁☁ Fedora Cloud Architect ☁☁☁ <mattdm(a)fedoraproject.org>
10 years, 4 months
4 commits - ec2/fedora-17-i386-ec2.ks ec2/fedora-17-x86_64-ec2.ks generic/fedora-19-i386-cloud.ks generic/fedora-19-x86_64-cloud.ks
by Matthew Miller
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(a)mattdm.org>
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(a)mattdm.org>
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(a)mattdm.org>
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(a)mattdm.org>
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
10 years, 4 months
3 commits - ec2/fedora-17-i386-ec2.ks ec2/fedora-17-x86_64-ec2.ks ec2/fedora-18-i386-ec2.ks ec2/fedora-18-x86_64-ec2.ks generic/fedora-18-i386-cloud.ks generic/fedora-18-i386.ks generic/fedora-18-i386-minimal.ks generic/fedora-18-x86_64-cloud.ks generic/fedora-18-x86_64.ks generic/fedora-18-x86_64-minimal.ks generic/fedora-19-i386-cloud.ks generic/fedora-19-i386.ks generic/fedora-19-i386-minimal.ks generic/fedora-19-x86_64-cloud.ks generic/fedora-19-x86_64.ks generic/fedora-19-x86_64-minimal.ks
by Matthew Miller
ec2/fedora-17-i386-ec2.ks | 5 +++++
ec2/fedora-17-x86_64-ec2.ks | 5 +++++
ec2/fedora-18-i386-ec2.ks | 15 ++++++++++-----
ec2/fedora-18-x86_64-ec2.ks | 16 +++++++++-------
generic/fedora-18-i386-cloud.ks | 7 ++++++-
generic/fedora-18-i386-minimal.ks | 5 +++++
generic/fedora-18-i386.ks | 5 +++++
generic/fedora-18-x86_64-cloud.ks | 7 ++++++-
generic/fedora-18-x86_64-minimal.ks | 5 +++++
generic/fedora-18-x86_64.ks | 5 +++++
generic/fedora-19-i386-cloud.ks | 8 +++++++-
generic/fedora-19-i386-minimal.ks | 7 ++++++-
generic/fedora-19-i386.ks | 5 +++++
generic/fedora-19-x86_64-cloud.ks | 8 +++++++-
generic/fedora-19-x86_64-minimal.ks | 7 ++++++-
generic/fedora-19-x86_64.ks | 5 +++++
16 files changed, 97 insertions(+), 18 deletions(-)
New commits:
commit 94d2ddd5a2a44b8942077f227c9dd232de76ce59
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu May 23 09:03:12 2013 -0400
minor formatting cleanup
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 1ffca9f..2200857 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -77,6 +77,7 @@ 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"
@@ -87,7 +88,7 @@ fi
# workaround xen performance issue (bz 651861; see also bz 708406)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
-# older versions of livecd-tools do not follow rootpw --lock line above
+# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index 9e2dcad..48e1074 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -39,7 +39,7 @@ repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo
repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=$basearch
-# Packag list.
+# Package list.
# "Obsessively minimal as we can reasonably get and still be Fedora."
%packages --nobase
@core
@@ -87,7 +87,7 @@ iptables-services
# workaround xen performance issue (bz 651861; see also bz 708406)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
-# older versions of livecd-tools do not follow rootpw --lock line above
+# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index e094bbd..98a5313 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -74,7 +74,7 @@ rsync
# workaround xen performance issue (bz 651861; see also bz 708406)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
-# older versions of livecd-tools do not follow rootpw --lock line above
+# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 8a1f5f5..906a75f 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -77,6 +77,7 @@ 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"
@@ -84,7 +85,7 @@ if ! [[ -e /boot/grub/menu.lst ]]; then
ln -sf /boot/grub/grub.conf /etc/grub.conf
fi
-# older versions of livecd-tools do not follow rootpw --lock line above
+# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index faa09b1..f463cd5 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -40,7 +40,7 @@ repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo
repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=$basearch
-# Packag list.
+# Package list.
# "Obsessively minimal as we can reasonably get and still be Fedora."
%packages --nobase
@core
@@ -85,7 +85,7 @@ iptables-services
%post --erroronfail
-# older versions of livecd-tools do not follow rootpw --lock line above
+# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index 7eedf9c..6840670 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -72,7 +72,7 @@ rsync
%post --erroronfail
-# older versions of livecd-tools do not follow rootpw --lock line above
+# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
commit e986c9684d85b6cf185353c6f0113637368fa230
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu May 23 08:54:39 2013 -0400
xen performance issue should have been i386 only
diff --git a/ec2/fedora-18-x86_64-ec2.ks b/ec2/fedora-18-x86_64-ec2.ks
index 4878afa..bb0a8c3 100644
--- a/ec2/fedora-18-x86_64-ec2.ks
+++ b/ec2/fedora-18-x86_64-ec2.ks
@@ -75,9 +75,6 @@ echo .
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root
-# workaround xen performance issue (bz 651861)
-echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
-
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i '1i# This file is for use with pv-grub; legacy grub is not installed in this image' /boot/grub/grub.conf
commit a81eef60ed108f37747168dbfe05dd6c6484ef63
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu May 23 08:53:40 2013 -0400
make sure empty root password is properly locked (bz #964299)
diff --git a/ec2/fedora-17-i386-ec2.ks b/ec2/fedora-17-i386-ec2.ks
index 32e2e0d..2335a98 100644
--- a/ec2/fedora-17-i386-ec2.ks
+++ b/ec2/fedora-17-i386-ec2.ks
@@ -4,6 +4,7 @@ keyboard us
timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
firewall --service=ssh
bootloader --timeout=1 --location=mbr --driveorder=sda
network --bootproto=dhcp --device=eth0 --onboot=on
@@ -62,6 +63,10 @@ cloud-init
# more ec2-ify
%post --erroronfail
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# create ec2-user
/usr/sbin/useradd ec2-user
/bin/echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
diff --git a/ec2/fedora-17-x86_64-ec2.ks b/ec2/fedora-17-x86_64-ec2.ks
index e09e533..9e9c2dd 100644
--- a/ec2/fedora-17-x86_64-ec2.ks
+++ b/ec2/fedora-17-x86_64-ec2.ks
@@ -4,6 +4,7 @@ keyboard us
timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
firewall --service=ssh
bootloader --timeout=1 --location=mbr --driveorder=sda
network --bootproto=dhcp --device=eth0 --onboot=on
@@ -62,6 +63,10 @@ cloud-init
# more ec2-ify
%post --erroronfail
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# create ec2-user
/usr/sbin/useradd ec2-user
/bin/echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
diff --git a/ec2/fedora-18-i386-ec2.ks b/ec2/fedora-18-i386-ec2.ks
index ecaf72f..f316528 100644
--- a/ec2/fedora-18-i386-ec2.ks
+++ b/ec2/fedora-18-i386-ec2.ks
@@ -1,8 +1,8 @@
-# This is a basic Fedora 18 spin designed to work in Amazon EC2.
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. That also
-# currently creates an ec2-user account; we'll probably want to make that
-# something generic by default. The root password is empty by default.
+# This is a basic Fedora 18 spin designed to work in Amazon EC2. It's
+# configured with cloud-init so it will take advantage of ec2-compatible
+# metadata services for provisioning ssh keys. That also currently creates
+# an ec2-user account; we'll probably want to make that something generic by
+# default. The root password is empty and locked by default.
#
# Note that unlike the standard F18 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium.
@@ -13,6 +13,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -73,6 +74,10 @@ echo .
# workaround xen performance issue (bz 651861)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i '1i# This file is for use with pv-grub; legacy grub is not installed in this image' /boot/grub/grub.conf
diff --git a/ec2/fedora-18-x86_64-ec2.ks b/ec2/fedora-18-x86_64-ec2.ks
index a1013b1..4878afa 100644
--- a/ec2/fedora-18-x86_64-ec2.ks
+++ b/ec2/fedora-18-x86_64-ec2.ks
@@ -1,8 +1,8 @@
-# This is a basic Fedora 18 spin designed to work in Amazon EC2.
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. That also
-# currently creates an ec2-user account; we'll probably want to make that
-# something generic by default. The root password is empty by default.
+# This is a basic Fedora 18 spin designed to work in Amazon EC2. It's
+# configured with cloud-init so it will take advantage of ec2-compatible
+# metadata services for provisioning ssh keys. That also currently creates
+# an ec2-user account; we'll probably want to make that something generic by
+# default. The root password is empty and locked by default.
#
# Note that unlike the standard F18 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium.
@@ -13,6 +13,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -70,6 +71,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# workaround xen performance issue (bz 651861)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
diff --git a/generic/fedora-18-i386-cloud.ks b/generic/fedora-18-i386-cloud.ks
index 299e95b..5e71885 100644
--- a/generic/fedora-18-i386-cloud.ks
+++ b/generic/fedora-18-i386-cloud.ks
@@ -3,7 +3,7 @@
# take advantage of ec2-compatible metadata services for provisioning
# ssh keys. That also currently creates an ec2-user account; we'll probably
# want to make that something generic by default. The root password is empty
-# by default.
+# and locked by default.
#
# Note that unlike the standard F18 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium.
@@ -14,6 +14,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -75,6 +76,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
diff --git a/generic/fedora-18-i386-minimal.ks b/generic/fedora-18-i386-minimal.ks
index 6819478..bbf7e25 100644
--- a/generic/fedora-18-i386-minimal.ks
+++ b/generic/fedora-18-i386-minimal.ks
@@ -15,6 +15,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -80,6 +81,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
diff --git a/generic/fedora-18-i386.ks b/generic/fedora-18-i386.ks
index 5d852b6..c55477d 100644
--- a/generic/fedora-18-i386.ks
+++ b/generic/fedora-18-i386.ks
@@ -9,6 +9,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -69,6 +70,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
diff --git a/generic/fedora-18-x86_64-cloud.ks b/generic/fedora-18-x86_64-cloud.ks
index 5a8fe75..3d4bb8b 100644
--- a/generic/fedora-18-x86_64-cloud.ks
+++ b/generic/fedora-18-x86_64-cloud.ks
@@ -3,7 +3,7 @@
# take advantage of ec2-compatible metadata services for provisioning
# ssh keys. That also currently creates an ec2-user account; we'll probably
# want to make that something generic by default. The root password is empty
-# by default.
+# and locked by default.
#
# Note that unlike the standard F18 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium.
@@ -14,6 +14,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -75,6 +76,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
diff --git a/generic/fedora-18-x86_64-minimal.ks b/generic/fedora-18-x86_64-minimal.ks
index cf46ed3..22201cb 100644
--- a/generic/fedora-18-x86_64-minimal.ks
+++ b/generic/fedora-18-x86_64-minimal.ks
@@ -15,6 +15,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -80,6 +81,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
diff --git a/generic/fedora-18-x86_64.ks b/generic/fedora-18-x86_64.ks
index 6120155..c55e1fe 100644
--- a/generic/fedora-18-x86_64.ks
+++ b/generic/fedora-18-x86_64.ks
@@ -9,6 +9,7 @@ timezone --utc America/New_York
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -69,6 +70,10 @@ LABEL=_/ / ext4 defaults 1 1
EOF
echo .
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
echo -n "Grub tweaks"
echo GRUB_TIMEOUT=0 > /etc/default/grub
sed -i 's/^set timeout=5/set timeout=0/' /boot/grub2/grub.cfg
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 5076c7d..1ffca9f 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -3,7 +3,7 @@
# take advantage of ec2-compatible metadata services for provisioning
# ssh keys. That also currently creates an ec2-user account; we'll probably
# want to make that something generic by default. The root password is empty
-# by default.
+# and locked by default.
#
# Note that unlike the standard F19 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium.
@@ -18,6 +18,7 @@ timezone --utc Etc/UTC
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -86,6 +87,10 @@ fi
# workaround xen performance issue (bz 651861; see also bz 708406)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index f498dd9..9e2dcad 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -19,6 +19,7 @@ timezone --utc Etc/UTC
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -86,6 +87,10 @@ iptables-services
# workaround xen performance issue (bz 651861; see also bz 708406)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index 3a07ed5..e094bbd 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -13,6 +13,7 @@ timezone --utc Etc/UTC
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -73,6 +74,10 @@ rsync
# workaround xen performance issue (bz 651861; see also bz 708406)
echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 9ac0db1..8a1f5f5 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -3,7 +3,7 @@
# take advantage of ec2-compatible metadata services for provisioning
# ssh keys. That also currently creates an ec2-user account; we'll probably
# want to make that something generic by default. The root password is empty
-# by default.
+# and locked by default.
#
# Note that unlike the standard F19 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium.
@@ -18,6 +18,7 @@ timezone --utc Etc/UTC
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -83,6 +84,10 @@ if ! [[ -e /boot/grub/menu.lst ]]; then
ln -sf /boot/grub/grub.conf /etc/grub.conf
fi
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index f212bb6..faa09b1 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -19,6 +19,7 @@ timezone --utc Etc/UTC
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -84,6 +85,10 @@ iptables-services
%post --erroronfail
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index 70dc89c..7eedf9c 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -13,6 +13,7 @@ timezone --utc Etc/UTC
auth --useshadow --enablemd5
selinux --enforcing
+rootpw --lock
# this is actually not used, but a static firewall
# matching these rules is generated below.
@@ -71,6 +72,10 @@ rsync
%post --erroronfail
+# older versions of livecd-tools do not follow rootpw --lock line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
10 years, 4 months
generic/fedora-19-i386-cloud.ks generic/fedora-19-i386.ks generic/fedora-19-i386-minimal.ks generic/fedora-19-x86_64-cloud.ks generic/fedora-19-x86_64.ks generic/fedora-19-x86_64-minimal.ks
by Matthew Miller
generic/fedora-19-i386-cloud.ks | 7 ++-----
generic/fedora-19-i386-minimal.ks | 7 ++-----
generic/fedora-19-i386.ks | 7 ++-----
generic/fedora-19-x86_64-cloud.ks | 7 ++-----
generic/fedora-19-x86_64-minimal.ks | 7 ++-----
generic/fedora-19-x86_64.ks | 7 ++-----
6 files changed, 12 insertions(+), 30 deletions(-)
New commits:
commit 7052fa9cd6364e45dee1a5f3fe03f95e69f71fe1
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue May 21 18:24:22 2013 -0400
um, zero empty space with fstrim. because, duh.
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index c8b0e4d..5076c7d 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -193,11 +193,8 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
%end
diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index be6749f..f498dd9 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -186,11 +186,8 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
%end
diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index 0cd3dbd..3a07ed5 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -173,11 +173,8 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
%end
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 70bc31b..9ac0db1 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -191,11 +191,8 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
%end
diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index a82bc3f..f212bb6 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -184,11 +184,8 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
%end
diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index 1fdfedf..70dc89c 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -171,11 +171,8 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
%end
10 years, 4 months
generic/fedora-19-i386-cloud.ks generic/fedora-19-x86_64-cloud.ks
by Matthew Miller
generic/fedora-19-i386-cloud.ks | 2 +-
generic/fedora-19-x86_64-cloud.ks | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6d6842091ae2d6a42ed1f15dd162e5807e3b8736
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue May 21 12:48:36 2013 -0400
use relative symlink to be consistent with f18 ks files; also, probably
the right thing, although it shouldn't matter.
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index ee97d80..c8b0e4d 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -79,7 +79,7 @@ rsync
#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 -s 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 0f14894..70bc31b 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -79,7 +79,7 @@ rsync
#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 -s grub.conf /boot/grub/menu.lst
ln -sf /boot/grub/grub.conf /etc/grub.conf
fi
10 years, 4 months
2 commits - ec2/fedora-17-i386-ec2.ks ec2/fedora-17-x86_64-ec2.ks
by Matthew Miller
ec2/fedora-17-i386-ec2.ks | 13 +++++++++++++
ec2/fedora-17-x86_64-ec2.ks | 13 +++++++++++++
2 files changed, 26 insertions(+)
New commits:
commit a3e3b2f61787fc23b8e80af5127565e21ae5a430
Merge: 6b2831a 426e0f2
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue May 21 12:43:30 2013 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/cloud-kickstarts
commit 6b2831a26c09758c07f672d1aab1eedfee89df19
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue May 21 12:43:07 2013 -0400
/etc/sysconfig/kernel for f17
diff --git a/ec2/fedora-17-i386-ec2.ks b/ec2/fedora-17-i386-ec2.ks
index 62aff35..32e2e0d 100644
--- a/ec2/fedora-17-i386-ec2.ks
+++ b/ec2/fedora-17-i386-ec2.ks
@@ -102,6 +102,19 @@ pushd /boot/grub
ln -s grub.conf menu.lst
popd
+# appliance-creator does not make this important file.
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel-PAE
+EOF
+fi
+
# setup systemd to boot to the right runlevel
rm /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
diff --git a/ec2/fedora-17-x86_64-ec2.ks b/ec2/fedora-17-x86_64-ec2.ks
index b303859..e09e533 100644
--- a/ec2/fedora-17-x86_64-ec2.ks
+++ b/ec2/fedora-17-x86_64-ec2.ks
@@ -102,6 +102,19 @@ pushd /boot/grub
ln -s grub.conf menu.lst
popd
+# appliance-creator does not make this important file.
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel
+EOF
+fi
+
# setup systemd to boot to the right runlevel
rm /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
10 years, 4 months
