6:30 a.m.
commit d034bb6c5881db76254474d01558c68e69d36619
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Oct 15 06:28:50 2014 -0500
Revert "design: add LuxRender and YaraRay plugin for Blender"
This reverts commit 6e96869ce304327eb980112da6ce05d758820258, reversing
changes made to 9142cc25d5ed9964f00bbc447a59543c6c18d34e.
fedora-cloud-atomic.ks | 60 ++++++++++--
fedora-cloud-bigdata.ks | 219 -----------------------------------------
fedora-docker-base.ks | 3 -
fedora-install-workstation.ks | 2 -
fedora-live-design_suite.ks | 6 +-
5 files changed, 53 insertions(+), 237 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 42fed30..c8caf28 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -26,22 +26,37 @@ clearpart --all
# Atomic differs from cloud - we want LVM
autopart
-<<<<<<< HEAD
ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia
--url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/
--ref=fedora-atomic/f21/x86_64/docker-host
reboot
-=======
-# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia
--url=http://kojipkgs.fedoraproject.org/mash/atomic/
--ref=fedora-atomic/rawhide/x86_64/docker-host
-
-reboot
-
->>>>>>> origin
%post --erroronfail
+# Create grub.conf for EC2. This used to be done by appliance creator but
+# anaconda doesn't do it. And, in case appliance-creator is used, we're
+# overriding it here so that both cases get the exact same file.
+# Note that the console line is different -- that's because EC2 provides
+# different virtual hardware, and this is a convenient way to act differently
+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,0)" >> /boot/grub/grub.conf
+ echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0
LANG=en_US.UTF-8" >> /boot/grub/grub.conf
+ echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
+ echo
+done
+
+
+#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
@@ -52,11 +67,31 @@ userdel -r none
# 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
# If you want to remove rsyslog and just use journald, remove this!
echo -n "Disabling persistent journal"
rmdir /var/log/journal/
echo .
+# this is installed by default but we don't need it in virt
+echo "Removing linux-firmware package."
+yum -C -y remove linux-firmware
+
+# Remove firewalld; was supposed to be optional in F18+, but is required to
+# be present for install/image building.
+echo "Removing firewalld."
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+# Another one needed at install time but not after that, and it pulls
+# in some unneeded deps (like, newt and slang)
+echo "Removing authconfig."
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+
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.
@@ -131,6 +166,15 @@ echo
"-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
+
+echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+mkdir -p /var/cache/yum
+chattr -i /boot/extlinux/ldlinux.sys
+/usr/sbin/fixfiles -R -a restore
+chattr +i /boot/extlinux/ldlinux.sys
+
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 || :
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 5d1fc85..78e5b93 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -13,10 +13,7 @@ firewall --disable
zerombr
clearpart --all
part / --size 3000 --fstype ext4
-<<<<<<< HEAD
network --bootproto=dhcp --device=link --activate --onboot=on
-=======
->>>>>>> origin
reboot
%packages --excludedocs --instLangs=en --nocore
diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks
index bf235e0..0ac874a 100644
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -25,8 +25,6 @@ repo --name=fedora-source
--mirrorlist=http://mirrors.fedoraproject.org/mirrorl
%include fedora-workstation-packages.ks
-%include fedora-workstation-packages.ks
-
# Package manifest for the compose. Uses repo group metadata to translate groups.
# (default groups for the configured repos are added by --default)
# @base got renamed to @standard, but @base is still included by default by pungi.
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index 549271f..c39da21 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -16,9 +16,6 @@ part / --size 8192
# graphics
blender
-# add blender plugins
-LuxRender-blender
-YafaRay-blender
bluefish
#cinepaint
cmyktool
@@ -28,7 +25,6 @@ entangle
fontforge
font-manager
gimp
-gimp-elsamuko
gimp-*-plugin
gimp-data-extras
gimp-gap
@@ -38,7 +34,7 @@ gimp-normalmap
gimp-resynthesizer
gimp-separate+
gpick
-gmic-gimp
+GREYCstoration-gimp
hugin
mypaint
inkscape