[Fedora-spins] [spin-kickstarts/f21: 62/62] design: add LuxRender and YaraRay plugin for Blender

[Luya Tshimbalanga]

commit 6e96869ce304327eb980112da6ce05d758820258
Merge: 9142cc2 8d5f9bb
Author: luya <luya at 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.