Compare commits

..

57 Commits

Author SHA1 Message Date
Bruno Wolff III
79fef84e8f Remove supertuxcart to get under size again 2014-10-11 01:06:06 -05:00
Kevin Fenzi
09661de452 Try and prune some more space on Xfce spin 2014-10-05 11:03:18 -06:00
Peter Robinson
30680a984e SoaS: fix naming (once and for all) 2014-10-03 10:32:48 +01:00
Matthew Miller
5f0fcd1d5e put the remove-firewalld code back -- apparently still needed and having it
there is breaking openstack
2014-10-02 13:23:32 -04:00
Kalev Lember
3ae4c4139a workstation: Sync the list of favourite apps with upstream 2014-10-01 17:48:56 +02:00
Kevin Fenzi
f64b8c7353 Drop some more large ibus stuff to try and get back under size on xfce. 2014-09-27 12:05:26 -06:00
Matthew Miller
8ba8270ff8 only english to keep the locale archive down until there's a better solution 2014-09-27 09:06:06 -04:00
Rex Dieter
151836c00d kde: -system-config-services (prefer kcm_systemd) 2014-09-26 20:32:41 -05:00
Rex Dieter
ef404752a2 kde: -system-config-users
update comment about gnome-disk-utility
add comment about removing system-config-date someday
2014-09-26 20:23:16 -05:00
Adam Williamson
96a16eefc4 from spot: add comfortaa fonts to live-base to fix #1116497 2014-09-19 11:06:36 -07:00
Kevin Kofler
fff32ba339 fedora-livecd-kde.ks: update CJK font blacklist (#1142512)
Also change the comment to document the limit as 1 GB (as listed in the
specs) rather than 1 GiB.
2014-09-18 00:01:41 +02:00
Rex Dieter
fdacfc48cd mate: fix fallout from kickstart renaming
should help fix recent mate spin compose failures
2014-09-17 12:40:17 -05:00
Adam Williamson
7df1d7ab82 from kparal: fix Test Day browser configuration 2014-09-15 09:08:54 -07:00
Dennis Gilmore
91e15f750c CLOUD: install the environment correctly 2014-09-11 18:42:37 -05:00
Adam Williamson
9d66334a55 fix exclusion of generic packages to not also exclude generic-jms-ra 2014-09-11 15:12:10 -07:00
Adam Williamson
ca1c7727aa explain why it's not safe to drop jruby 2014-09-11 15:01:59 -07:00
Dennis Gilmore
731df4402e cloud: do not explicitly remove jruby 2014-09-11 16:58:08 -05:00
Dennis Gilmore
3eafe889d9 rename kickstarts for new naming policy 2014-09-10 19:02:57 -05:00
Dennis Gilmore
d3a2195d57 make sure all the groups from the cloud-serevr-environment are in the install tree 2014-09-10 13:14:07 -05:00
Dennis Gilmore
d338e1456a CLOUD: install the cloud-server-environment, dont't install firewalld
select the cloud-server-environment instead of the different groups.
don't install and uninstall firewalld since anaconda allows us to not need it
2014-09-10 13:13:59 -05:00
Dennis Gilmore
94283bfff2 Revert "docker: Add fakesystemd to %packages to keep systemd out of base image"
This reverts commit f42fe5d85a.
2014-09-10 13:13:48 -05:00
Matthew Miller
cc5246b9ba fixes from Ian McLeod to make composes work using new scheme.
NOTE: this WILL NOT WORK without other changes to coms and spin/install (but
the current ones are broken anyway so I'm committing this).

See https://lists.fedoraproject.org/pipermail/cloud/2014-September/004207.html
for details
2014-09-09 14:07:02 -04:00
raveit65
0edeedbde3 mate livecd: clean up file list 2014-09-07 08:42:24 +02:00
raveit65
dcb9dc8ec8 f21, mate-compiz: temporarily fix for theme issue with anaconda rhbz 1136994 2014-09-07 08:37:40 +02:00
Adam Williamson
5e49468d39 we don't need to nix hwclock-save.service any more...
...because systemd dropped it in 2011:
http://lists.freedesktop.org/archives/systemd-commits/2011-May/001088.html
2014-09-06 18:11:51 -07:00
Vaclav Pavlin
cece80a91b docker: Add fakesystemd to %packages to keep systemd out of base image 2014-09-05 08:37:18 -05:00
Stephen Gallagher
a7e8a12ce7 Add the server environment to the fedora-install-server.ks 2014-09-04 10:49:47 -04:00
Stephen Gallagher
6140729189 Add @domain-client to the Fedora Server kickstart
Also drop @multimedia as we don't need it on Server
2014-09-03 16:44:29 -04:00
Matthew Miller
22c7c00a6b use 'cmdline' for text-based install for docker image 2014-09-03 13:20:26 -04:00
Adam Williamson
e65263fa4a Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts 2014-09-02 09:53:05 -07:00
Adam Williamson
629c19368c set up tmpfs in fstab, not livesys service (fixes #1135475) 2014-09-02 09:27:29 -07:00
Dennis Gilmore
ad74864bd6 atomic folks decided to willy nilly change things so adjust appropriately
Conflicts:
	fedora-cloud-atomic.ks
2014-09-02 11:10:05 -05:00
Kalev Lember
72304db676 workstation: Use the package list from workstation-packages.ks for netinstall
https://bugzilla.redhat.com/show_bug.cgi?id=1134524
2014-08-29 17:53:19 +02:00
Kalev Lember
745387e20e live-base: Drop a redundant package inclusion
Don't explicitly include qemu-guest-agent; it's is already listed in
@guest-desktop-agents comps group that is also pulled in to
fedora-live-base.
2014-08-29 17:53:18 +02:00
Kalev Lember
47e7a468e0 workstation: Sync groups with workstation-product-environment in comps 2014-08-29 14:37:07 +02:00
Kalev Lember
ff66f181a8 workstation: Rely on comps for package selection
Drop most package removals / additions from the kickstart file and rely
on the @workstation-product comps group pulling in the correct packages.

We'll need package selection done in comps in order to make Workstation
netinstall work properly.

https://bugzilla.redhat.com/show_bug.cgi?id=1134524
2014-08-29 14:37:06 +02:00
Kalev Lember
d2b1c2a323 workstation: Install the workstation-product group 2014-08-26 23:27:36 +02:00
Dennis Gilmore
a23371ece0 make sure cloud install tree has heat-cfntools
TODO, fix in a much better way
2014-08-26 00:17:55 -05:00
Dennis Gilmore
e04141ef29 make sure that teh cloud and workstation install trees do not remove java 2014-08-26 00:15:52 -05:00
Luya Tshimbalanga
cf21afd8b0 design-suite: add gmic 2014-08-23 11:13:15 -07:00
Kevin Fenzi
2b64928357 First cut at reducing size of Xfce spin this cycle. 2014-08-23 11:08:01 -06:00
Colin Walters
89a63ee25a atomic: Switch to autopart
We actually want LVM for atomic by default, since it allows a lot more
storage flexibility.
2014-08-21 18:24:27 -04:00
Elad Alfassa
5c326c797b workstation: Don't install icedtea-web by default
icedtea-web clutters the application view with two launchers for config
dialogs which are not really apps as we define the term.

It used to be excluded previously but accidentally slipped back in with
the live-desktop -> live-workstation kickstart renames; this commit
takes it out again.

https://bugzilla.redhat.com/show_bug.cgi?id=1131248
2014-08-19 08:51:56 +02:00
Bastien Nocera
a493743f9e workstation: Install workstation firewalld config
So that we use our workstation specific firewall:
http://www.hadess.net/2014/06/firewalls-and-per-network-sharing.html
2014-08-12 12:37:11 +02:00
Dennis Gilmore
b0850152d8 license files have moved, and we no longer ship the collection as GPL but MIT 2014-08-01 12:05:44 -05:00
Dennis Gilmore
8180b563f1 fix up the options to the bootloader config, make the rootfs smaller. 2014-07-30 02:29:54 -05:00
Vaclav Pavlin
022cc883c0 Add kickstart for Docker base image 2014-07-30 02:29:51 -05:00
Miloslav Trmač
bc28d4e272 Server: Use server-product-environment by default
Most importantly, cause fedora-release-server to be installed.
2014-07-23 17:03:16 +02:00
Colin Walters
7d8b302b9f atomic: Remove %post which calls fixfiles
This should be handled correctly at installation time.  If it's not, I
think what we really want is a %post --relabel or something option to
have Anaconda take care of this.
2014-07-21 14:09:24 -04:00
Colin Walters
56085be1db atomic: No need to strip out packages post-install
Anaconda doesn't require firewalld at least anymore, and in any case
we can't strip packages from the tree.
2014-07-21 14:08:46 -04:00
Colin Walters
ceba259b5a atomic: default.target is set in the tree
The compose process sets it.
2014-07-21 14:08:22 -04:00
Colin Walters
e8ca9581eb atomic: Strip GRUB1/EC2 bits
These don't work, because OSTree doesn't understand GRUB1 config
files.  We should focus on HVM.
2014-07-21 14:07:32 -04:00
Colin Walters
04ec88194a atomic: Drop %packages section
Not relevant when doing an OSTree install.
2014-07-21 14:07:03 -04:00
Colin Walters
b73614d1e1 atomic: Use ostreesetup instead of %repo
Since we're doing an OSTree install
2014-07-21 14:06:35 -04:00
Peter Robinson
2fa7a61c8e remove growroot in arm images to test 1109603 2014-07-16 10:28:48 +01:00
Matthew Miller
44dd601bc4 put experimental cloud spin back to same as base cloud spin exept for i18n/docs 2014-07-11 11:54:19 -04:00
Matthew Miller
b5c6a9265b fedora-release-cloud in cloud images 2014-07-11 11:01:56 -04:00
11 changed files with 239 additions and 76 deletions

View File

@@ -26,37 +26,13 @@ clearpart --all
# Atomic differs from cloud - we want LVM # Atomic differs from cloud - we want LVM
autopart autopart
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 # 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 reboot
%post --erroronfail %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 # older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root passwd -l root
@@ -67,31 +43,11 @@ userdel -r none
# 0 means wait forever, so instead we'll go with 1. # 0 means wait forever, so instead we'll go with 1.
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf 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! # If you want to remove rsyslog and just use journald, remove this!
echo -n "Disabling persistent journal" echo -n "Disabling persistent journal"
rmdir /var/log/journal/ rmdir /var/log/journal/
echo . 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" echo -n "Getty fixes"
# although we want console output going to the serial console, we don't # although we want console output going to the serial console, we don't
# actually have the opportunity to login there. FIX. # actually have the opportunity to login there. FIX.
@@ -166,15 +122,6 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted # Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db* 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." echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files # This forces the filesystem to reclaim space from deleted files
dd bs=1M if=/dev/zero of=/var/tmp/zeros || : dd bs=1M if=/dev/zero of=/var/tmp/zeros || :

View File

@@ -25,7 +25,7 @@ firewall --disabled
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
network --bootproto=dhcp --device=link --activate --onboot=on network --bootproto=dhcp --device=eth0 --activate --onboot=on
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
zerombr zerombr

219
fedora-cloud-bigdata.ks Normal file
View File

@@ -0,0 +1,219 @@
# 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*
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

View File

@@ -13,7 +13,6 @@ firewall --disable
zerombr zerombr
clearpart --all clearpart --all
part / --size 3000 --fstype ext4 part / --size 3000 --fstype ext4
network --bootproto=dhcp --device=link --activate --onboot=on
reboot reboot
%packages --excludedocs --instLangs=en --nocore %packages --excludedocs --instLangs=en --nocore

View File

@@ -16,12 +16,12 @@
# use the source repo, we can't just include fedora-repo.ks # use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented. # 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 --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-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
# In non-master branches the fedora repo commands should be uncommented # 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 --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-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
# Package manifest for the compose. Uses repo group metadata to translate groups. # Package manifest for the compose. Uses repo group metadata to translate groups.
# (default groups for the configured repos are added by --default) # (default groups for the configured repos are added by --default)

View File

@@ -16,12 +16,12 @@
# use the source repo, we can't just include fedora-repo.ks # use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented. # 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 --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-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
# In non-master branches the fedora repo commands should be uncommented # 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 --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-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
# Package manifest for the compose. Uses repo group metadata to translate groups. # Package manifest for the compose. Uses repo group metadata to translate groups.
# (default groups for the configured repos are added by --default) # (default groups for the configured repos are added by --default)

View File

@@ -16,12 +16,12 @@
# use the source repo, we can't just include fedora-repo.ks # use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented. # 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 --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-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
# In non-master branches the fedora repo commands should be uncommented # 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 --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-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
%include fedora-workstation-packages.ks %include fedora-workstation-packages.ks

View File

@@ -25,6 +25,7 @@ entangle
fontforge fontforge
font-manager font-manager
gimp gimp
gimp-elsamuko
gimp-*-plugin gimp-*-plugin
gimp-data-extras gimp-data-extras
gimp-gap gimp-gap
@@ -34,7 +35,7 @@ gimp-normalmap
gimp-resynthesizer gimp-resynthesizer
gimp-separate+ gimp-separate+
gpick gpick
GREYCstoration-gimp gmic-gimp
hugin hugin
mypaint mypaint
inkscape inkscape

View File

@@ -11,6 +11,7 @@ compiz-plugins-extra
compiz-manager compiz-manager
compizconfig-python compizconfig-python
compiz-plugins-unsupported compiz-plugins-unsupported
compiz-bcop
compiz-mate compiz-mate
libcompizconfig libcompizconfig
compiz-plugins-main compiz-plugins-main

View File

@@ -3,7 +3,7 @@
# Exactly one of the following should be uncommented # Exactly one of the following should be uncommented
# For the master branch the following should be uncommented # For the master branch the following should be uncommented
#%include fedora-repo-rawhide.ks %include fedora-repo-rawhide.ks
# For non-master branches the following should be uncommented # For non-master branches the following should be uncommented
%include fedora-repo-not-rawhide.ks # %include fedora-repo-not-rawhide.ks

View File

@@ -29,10 +29,6 @@
-realmd -realmd
-eekboard-libs -eekboard-libs
-open-vm-tools* -open-vm-tools*
-gfs2-utils
-abrt-cli
-ibus*
-hyperv-daemons
# == Core Sugar Platform == # == Core Sugar Platform ==
@sugar-desktop @sugar-desktop