generic/fedora-20-cloud.ks generic/fedora-20.ks generic/fedora-20-minimal.ks
by Matthew Miller
generic/fedora-20-cloud.ks | 6 +++---
generic/fedora-20-minimal.ks | 5 ++---
generic/fedora-20.ks | 5 ++---
3 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit b7bbff394654e5e7b5dd6b1e0985ed969b40bc0e
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu Sep 5 20:03:31 2013 -0400
remove rawhide repo placeholder and point to f20, now that we're branched
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index a17dfcc..b6e0016 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -34,9 +34,9 @@ clearpart --all
part / --size 2048 --fstype ext4
# Repositories
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
-#repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
+
reboot
diff --git a/generic/fedora-20-minimal.ks b/generic/fedora-20-minimal.ks
index f2ec452..e8e446d 100644
--- a/generic/fedora-20-minimal.ks
+++ b/generic/fedora-20-minimal.ks
@@ -37,9 +37,8 @@ part / --size 2048 --fstype ext4
# Repositories
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
-#repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
reboot
diff --git a/generic/fedora-20.ks b/generic/fedora-20.ks
index 1313df5..4ae6a85 100644
--- a/generic/fedora-20.ks
+++ b/generic/fedora-20.ks
@@ -31,9 +31,8 @@ part / --size 10000 --fstype ext4
# Repositories
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
-#repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
reboot
10 years, 7 months
- 1
- 0
generic/fedora-20-minimal.ks
by Matthew Miller
generic/fedora-20-minimal.ks | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d33857a19b9a4b80bb75977accf9c033ec3dba11
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu Sep 5 14:45:48 2013 -0400
fix error in locale removal bit
diff --git a/generic/fedora-20-minimal.ks b/generic/fedora-20-minimal.ks
index 200c12a..f2ec452 100644
--- a/generic/fedora-20-minimal.ks
+++ b/generic/fedora-20-minimal.ks
@@ -200,7 +200,7 @@ echo "Compressing cracklib."
gzip -9 /usr/share/cracklib/pw_dict.pwd
echo "Minimizing locale-archive."
-localedef --list-archive | grep -v en_US | xargs localedef --prefix $ROOT --delete-from-archive
+localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
/usr/sbin/build-locale-archive
10 years, 7 months
- 1
- 0
4 commits - generic/fedora-20-cloud.ks generic/fedora-20.ks generic/fedora-20-minimal.ks
by Matthew Miller
generic/fedora-20-cloud.ks | 31 ++++++++++++++++++++++++-------
generic/fedora-20-minimal.ks | 16 ++++++++++++++--
generic/fedora-20.ks | 8 ++++++--
3 files changed, 44 insertions(+), 11 deletions(-)
New commits:
commit 9a55ae2727470a23f75a40aa801a164122b969ef
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu Sep 5 14:16:10 2013 -0400
nobase doesn't do anything anymore
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index 1e403e4..a17dfcc 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -42,7 +42,7 @@ repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo
reboot
# Package list.
-%packages --nobase
+%packages
@core
grubby
kernel
diff --git a/generic/fedora-20-minimal.ks b/generic/fedora-20-minimal.ks
index c7585a2..200c12a 100644
--- a/generic/fedora-20-minimal.ks
+++ b/generic/fedora-20-minimal.ks
@@ -46,7 +46,7 @@ reboot
# Package list.
# "Obsessively minimal as we can reasonably get and still be Fedora."
-%packages --nobase --excludedocs
+%packages --excludedocs
@core
grubby
kernel
diff --git a/generic/fedora-20.ks b/generic/fedora-20.ks
index 62098aa..1313df5 100644
--- a/generic/fedora-20.ks
+++ b/generic/fedora-20.ks
@@ -42,7 +42,7 @@ reboot
# Package list.
# Just the basics, here.
-%packages --nobase
+%packages
@core
grubby
kernel
commit 4e79ed04cde9c61817cb06fc5e80e403c6d5be6f
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu Sep 5 14:14:56 2013 -0400
more minimal experimental minimal image (note we don't actually use this)
diff --git a/generic/fedora-20-minimal.ks b/generic/fedora-20-minimal.ks
index 6aa5650..c7585a2 100644
--- a/generic/fedora-20-minimal.ks
+++ b/generic/fedora-20-minimal.ks
@@ -46,7 +46,7 @@ reboot
# Package list.
# "Obsessively minimal as we can reasonably get and still be Fedora."
-%packages --nobase
+%packages --nobase --excludedocs
@core
grubby
kernel
@@ -195,6 +195,15 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/random-seed
+
+echo "Compressing cracklib."
+gzip -9 /usr/share/cracklib/pw_dict.pwd
+
+echo "Minimizing locale-archive."
+localedef --list-archive | grep -v en_US | xargs localedef --prefix $ROOT --delete-from-archive
+mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+/usr/sbin/build-locale-archive
+
echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
commit c2440011b055e386348c9f8a45c8edf83be26621
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Aug 21 11:55:28 2013 -0400
initial pass at pvgrub creation hack
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index 7016b8f..1e403e4 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -87,13 +87,27 @@ rsync
%post --erroronfail
-#link grub.conf to menu.lst for ec2 to work
-if [[ -e /boot/grub/grub.conf ]]; then
- echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
- ln -sf grub.conf /boot/grub/menu.lst
- ln -sf /boot/grub/grub.conf /etc/grub.conf
+# Create grub.conf for EC2.
+if [[ ! -e /boot/grub/grub.conf ]]; then
+ echo -n "Creating grub.conf for pvgrub"
+ rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab )
+ mkdir /boot/grub
+ echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
+ for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do
+ echo "title Fedora ($kv)" >> /boot/grub/grub.conf
+ echo -e "\troot (hd0)" >> /boot/grub/grub.conf
+ echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
+ echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
+ echo
+ done
fi
+
+#link grub.conf to menu.lst for ec2 to work
+echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
+ln -sf grub.conf /boot/grub/menu.lst
+ln -sf /boot/grub/grub.conf /etc/grub.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
commit f62e5cc917cf3a8126a87922ad2919ba479da9bf
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Aug 21 11:07:36 2013 -0400
clear partitioning, reboot when done.
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index 2158ae7..7016b8f 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -29,15 +29,18 @@ network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
+zerombr
+clearpart --all
part / --size 2048 --fstype ext4
-
# Repositories
#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
#repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+reboot
+
# Package list.
%packages --nobase
@core
diff --git a/generic/fedora-20-minimal.ks b/generic/fedora-20-minimal.ks
index c28aee7..6aa5650 100644
--- a/generic/fedora-20-minimal.ks
+++ b/generic/fedora-20-minimal.ks
@@ -31,7 +31,8 @@ network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,iptables
-
+zerombr
+clearpart --all
part / --size 2048 --fstype ext4
@@ -41,6 +42,8 @@ part / --size 2048 --fstype ext4
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+reboot
+
# Package list.
# "Obsessively minimal as we can reasonably get and still be Fedora."
%packages --nobase
diff --git a/generic/fedora-20.ks b/generic/fedora-20.ks
index 1e788c5..62098aa 100644
--- a/generic/fedora-20.ks
+++ b/generic/fedora-20.ks
@@ -25,7 +25,8 @@ network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,iptables
-
+zerombr
+clearpart --all
part / --size 10000 --fstype ext4
@@ -35,6 +36,9 @@ part / --size 10000 --fstype ext4
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+reboot
+
+
# Package list.
# Just the basics, here.
10 years, 7 months
- 1
- 0