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