[spin-kickstarts/f21] Revert "design: add LuxRender and YaraRay plugin for Blender"
by Bruno Wolff III
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
9 years, 6 months
[spin-kickstarts/f21] Revert "dd extlinux mbr during post as temporary workaround for bug #1147998"
by Bruno Wolff III
commit de82df00d21651f0a7831d953dc7317f663407fc
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Oct 15 06:26:48 2014 -0500
Revert "dd extlinux mbr during post as temporary workaround for bug #1147998"
This reverts commit 58b06553fadb53c95f83915e81db1379e3dc5f36.
We need to go back to the broken merge.
fedora-cloud-atomic.ks | 9 ---------
fedora-cloud-base.ks | 8 --------
fedora-cloud-bigdata.ks | 7 -------
fedora-cloud-experimental.ks | 8 --------
4 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 2680b19..42fed30 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -131,15 +131,6 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
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-cloud-base.ks b/fedora-cloud-base.ks
index a61e82e..1cbfdc4 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -194,14 +194,6 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 1a9ef6a..b8315bb 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -200,13 +200,6 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
echo "Fixing SELinux contexts."
touch /var/log/cron
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index fb902a5..b865c4c 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -192,14 +192,6 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
9 years, 6 months
[spin-kickstarts/f21] Revert "Dropping bigdata cloud spin from f21"
by Bruno Wolff III
commit 7517d88f12cbb1faac5c2d583ae2799745518d0c
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Oct 15 06:26:10 2014 -0500
Revert "Dropping bigdata cloud spin from f21"
This reverts commit 1d4a252ed6495f3d6abf95ec4350efbc8100c631.
We need to go back to the broken merge.
fedora-cloud-bigdata.ks | 226 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 226 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
new file mode 100644
index 0000000..1a9ef6a
--- /dev/null
+++ b/fedora-cloud-bigdata.ks
@@ -0,0 +1,226 @@
+# This is a Fedora 21 spin designed based on the Fedora Cloud Base Image
+# but tailored specifically for Big Data processing out-of-the-box.
+# Primarily, it builds on that image but adds extra packages, but over
+# time may have additional focus.
+#
+# It's configured with cloud-init so it will take advantage of
+# ec2-compatible metadata services for provisioning ssh keys. Cloud-init
+# creates a user account named "fedora" with passwordless sudo access. The
+# root password is empty and locked by default.
+#
+# Note that unlike the standard F20 install, this image has /tmp on disk
+# rather than in tmpfs, since memory is usually at a premium.
+
+text
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --enablemd5
+selinux --enforcing
+rootpw --lock --iscrypted locked
+user --name=none
+
+firewall --disabled
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+
+network --bootproto=dhcp --device=eth0 --activate --onboot=on
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+
+zerombr
+clearpart --all
+part / --size 3000 --fstype ext4
+
+%include fedora-repo.ks
+
+
+reboot
+
+# Package list.
+%packages
+
+fedora-release-cloud
+
+kernel-core
+@core
+@cloud-server
+
+# Needed initially, but removed below.
+firewalld
+
+# rescue mode generally isn't useful in the cloud context
+-dracut-config-rescue
+
+# Some things from @core we can do without in a minimal install
+-biosdevname
+-plymouth
+-NetworkManager
+-iprutils
+-kbd
+-uboot-tools
+-kernel
+-grub2
+
+%end
+
+
+
+%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
+# remove the user anaconda forces us to make
+userdel -r none
+
+# 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
+
+# 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.
+# 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.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+PERSISTENT_DHCLIENT="yes"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# 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.
+#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
+#users: []
+#disable_root: 0
+#EOF
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/random-seed
+
+echo "Cleaning old yum repodata."
+yum history new
+yum clean all
+truncate -c -s 0 /var/log/yum.log
+
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
+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 || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+%end
+
9 years, 6 months
[spin-kickstarts] dd extlinux mbr during post as temporary workaround for bug #1147998
by Matthew Miller
commit 7f202a0e531ea178243c563a721c0c248af87219
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Oct 14 16:00:42 2014 -0400
dd extlinux mbr during post as temporary workaround for bug #1147998
fedora-cloud-atomic.ks | 9 +++++++++
fedora-cloud-base.ks | 8 ++++++++
fedora-cloud-bigdata.ks | 7 +++++++
fedora-cloud-experimental.ks | 8 ++++++++
4 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index c77ffec..ae288b3 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -122,6 +122,15 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
+
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
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-cloud-base.ks b/fedora-cloud-base.ks
index 6a5a1de..f086a4b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -194,6 +194,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index b8315bb..1a9ef6a 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -200,6 +200,13 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
echo "Fixing SELinux contexts."
touch /var/log/cron
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index b865c4c..fb902a5 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -192,6 +192,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
9 years, 6 months
[spin-kickstarts/f21] Dropping bigdata cloud spin from f21
by Matthew Miller
commit 1d4a252ed6495f3d6abf95ec4350efbc8100c631
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Oct 14 16:02:32 2014 -0400
Dropping bigdata cloud spin from f21
fedora-cloud-bigdata.ks | 226 -----------------------------------------------
1 files changed, 0 insertions(+), 226 deletions(-)
9 years, 6 months
[spin-kickstarts/f21] dd extlinux mbr during post as temporary workaround for bug #1147998
by Matthew Miller
commit 58b06553fadb53c95f83915e81db1379e3dc5f36
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Oct 14 16:00:42 2014 -0400
dd extlinux mbr during post as temporary workaround for bug #1147998
fedora-cloud-atomic.ks | 9 +++++++++
fedora-cloud-base.ks | 8 ++++++++
fedora-cloud-bigdata.ks | 7 +++++++
fedora-cloud-experimental.ks | 8 ++++++++
4 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 42fed30..2680b19 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -131,6 +131,15 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
+
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
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-cloud-base.ks b/fedora-cloud-base.ks
index 1cbfdc4..a61e82e 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -194,6 +194,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index b8315bb..1a9ef6a 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -200,6 +200,13 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
echo "Fixing SELinux contexts."
touch /var/log/cron
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index b865c4c..fb902a5 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -192,6 +192,14 @@ echo "-----------------------------------------------------------------------"
rm -f /var/lib/rpm/__db*
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
9 years, 6 months
[spin-kickstarts/f21: 62/62] design: add LuxRender and YaraRay plugin for Blender
by Luya Tshimbalanga
commit 6e96869ce304327eb980112da6ce05d758820258
Merge: 9142cc2 8d5f9bb
Author: luya <luya(a)kwetu.telus1603>
Date: Mon Oct 13 23:50:42 2014 -0700
design: add LuxRender and YaraRay plugin for Blender
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, 237 insertions(+), 53 deletions(-)
---
diff --cc fedora-cloud-atomic.ks
index c8caf28,c77ffec..42fed30
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@@ -26,36 -26,12 +26,21 @@@ clearpart --al
# 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
+
+
+
- %post --erroronfail
++=======
+ # 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
- # 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
++>>>>>>> origin
+ %post --erroronfail
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
diff --cc fedora-docker-base.ks
index 78e5b93,44022d9..5d1fc85
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@@ -13,7 -13,6 +13,10 @@@ firewall --disabl
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 --cc fedora-install-workstation.ks
index 0ac874a,69a3ab8..bf235e0
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@@ -16,15 -16,15 +16,17 @@@
# use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
# In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+
+%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.
9 years, 6 months
[spin-kickstarts/f21] (62 commits) ...design: add LuxRender and YaraRay plugin for Blender
by Luya Tshimbalanga
Summary of changes:
b5c6a92... fedora-release-cloud in cloud images (*)
44dd601... put experimental cloud spin back to same as base cloud spin (*)
2fa7a61... remove growroot in arm images to test 1109603 (*)
b73614d... atomic: Use ostreesetup instead of %repo (*)
04ec881... atomic: Drop %packages section (*)
e8ca958... atomic: Strip GRUB1/EC2 bits (*)
ceba259... atomic: default.target is set in the tree (*)
56085be... atomic: No need to strip out packages post-install (*)
7d8b302... atomic: Remove %post which calls fixfiles (*)
bc28d4e... Server: Use server-product-environment by default (*)
022cc88... Add kickstart for Docker base image (*)
8180b56... fix up the options to the bootloader config, make the rootf (*)
b085015... license files have moved, and we no longer ship the collect (*)
a493743... workstation: Install workstation firewalld config (*)
5c326c7... workstation: Don't install icedtea-web by default (*)
89a63ee... atomic: Switch to autopart (*)
2b64928... First cut at reducing size of Xfce spin this cycle. (*)
cf21afd... design-suite: add gmic (*)
e04141e... make sure that teh cloud and workstation install trees do n (*)
a23371e... make sure cloud install tree has heat-cfntools TODO, fix in (*)
d2b1c2a... workstation: Install the workstation-product group (*)
ff66f18... workstation: Rely on comps for package selection (*)
47e7a46... workstation: Sync groups with workstation-product-environme (*)
745387e... live-base: Drop a redundant package inclusion (*)
72304db... workstation: Use the package list from workstation-packages (*)
ad74864... atomic folks decided to willy nilly change things so adjust (*)
629c193... set up tmpfs in fstab, not livesys service (fixes #1135475) (*)
e65263f... Merge branch 'master' of ssh://git.fedorahosted.org/git/spi (*)
22c7c00... use 'cmdline' for text-based install for docker image (*)
6140729... Add @domain-client to the Fedora Server kickstart (*)
a7e8a12... Add the server environment to the fedora-install-server.ks (*)
cece80a... docker: Add fakesystemd to %packages to keep systemd out of (*)
5e49468... we don't need to nix hwclock-save.service any more... (*)
dcb9dc8... f21, mate-compiz: temporarily fix for theme issue with anac (*)
0edeedb... mate livecd: clean up file list (*)
cc5246b... fixes from Ian McLeod to make composes work using new schem (*)
94283bf... Revert "docker: Add fakesystemd to %packages to keep system (*)
d338e14... CLOUD: install the cloud-server-environment, dont't install (*)
d3a2195... make sure all the groups from the cloud-serevr-environment (*)
3eafe88... rename kickstarts for new naming policy (*)
731df44... cloud: do not explicitly remove jruby (*)
ca1c772... explain why it's not safe to drop jruby (*)
9d66334... fix exclusion of generic packages to not also exclude gener (*)
91e15f7... CLOUD: install the environment correctly (*)
7df1d7a... from kparal: fix Test Day browser configuration (*)
fdacfc4... mate: fix fallout from kickstart renaming (*)
fff32ba... fedora-livecd-kde.ks: update CJK font blacklist (#1142512) (*)
96a16ee... from spot: add comfortaa fonts to live-base to fix #1116497 (*)
ef40475... kde: -system-config-users (*)
151836c... kde: -system-config-services (prefer kcm_systemd) (*)
8ba8270... only english to keep the locale archive down until there's (*)
f64b8c7... Drop some more large ibus stuff to try and get back under s (*)
3ae4c41... workstation: Sync the list of favourite apps with upstream (*)
5f0fcd1... put the remove-firewalld code back -- apparently still need (*)
30680a9... SoaS: fix naming (once and for all) (*)
09661de... Try and prune some more space on Xfce spin (*)
79fef84... Remove supertuxcart to get under size again (*)
3b362be... Try some more removals to get Xfce under size (*)
5f7ca87... xfce: fix typo (*)
395757c... mate: sync master with f21 branch (*)
8d5f9bb... add LuxRender and Yafaray plugiins for Blender (*)
6e96869... design: add LuxRender and YaraRay plugin for Blender
(*) This commit already existed in another branch; no separate mail sent
9 years, 6 months
[spin-kickstarts] add LuxRender and Yafaray plugiins for Blender
by Luya Tshimbalanga
commit 8d5f9bb3211a4a969630e27b7c3ec406f8c7b9bf
Author: luya <luya(a)kwetu.telus1603>
Date: Mon Oct 13 23:43:26 2014 -0700
add LuxRender and Yafaray plugiins for Blender
fedora-live-design_suite.ks | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index b690bd1..549271f 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -16,6 +16,9 @@ part / --size 8192
# graphics
blender
+# add blender plugins
+LuxRender-blender
+YafaRay-blender
bluefish
#cinepaint
cmyktool
9 years, 6 months
[spin-kickstarts] mate: sync master with f21 branch
by Wolfgang Ulbrich
commit 395757c4b67b706591301ca57786ca9b4be189d8
Author: raveit65 <chat-to-me(a)raveit.de>
Date: Mon Oct 13 19:17:11 2014 +0200
mate: sync master with f21 branch
fedora-live-mate_compiz.ks | 3 ---
fedora-livecd-mate_compiz.ks | 26 ++++++++++++++++++++++++--
fedora-mate-packages.ks | 1 -
3 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-mate_compiz.ks b/fedora-live-mate_compiz.ks
index 2acf78a..331d1d5 100644
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -19,9 +19,6 @@ fi
mkdir /home/liveuser/Desktop
cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-# temporarily fix for theme issue with anaconda rhbz (#1136994)
-sed -i "s/^gtk-theme='BlueMenta'/gtk-theme='Adwaita'/" /usr/share/glib-2.0/schemas/mate-fedora.gschema.override
-
# rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas
diff --git a/fedora-livecd-mate_compiz.ks b/fedora-livecd-mate_compiz.ks
index a8af381..2582ed4 100644
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -26,10 +26,29 @@
-@mate-applications
-mate-icon-theme-faenza
-transmission-gtk
+-samba-client
+-gnome-themes
+-fedora-icon-theme
+-espeak
+-gstreamer-plugins-espeak
+-ibus-typing-booster
+-ibus-kkc
+-libkkc
+-libkkc-data #save 30MB
+-skkdic # save 25MB
+-ibus-libpinyin
+-libpinyin
+-libpinyin-data #save 31MB
+-colord
# Drop oversized fonts that aren't needed
--cjkuni-uming-fonts
--wqy-zenhei-fonts
+-adobe-source-han-* # save 94MB
+-naver-nanum-gothic-fonts # save 14MB
+-stix-fonts
+-vlgothic-fonts
+-paratype-pt-sans-fonts
+-jomolhari-fonts
+-sil-abyssinica-fonts
# Drop the Java plugin
-icedtea-web
@@ -41,6 +60,9 @@
# No printing
-foomatic-db-ppds
-foomatic
+-gutenprint
+-gutenprint-cups
+-gutenprint-libs
# Dictionaries are big
# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
diff --git a/fedora-mate-packages.ks b/fedora-mate-packages.ks
index 6818cad..9b9a273 100644
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -11,7 +11,6 @@ compiz-plugins-extra
compiz-manager
compizconfig-python
compiz-plugins-unsupported
-compiz-bcop
compiz-mate
libcompizconfig
compiz-plugins-main
9 years, 6 months