design-suite: fix design suite info

remove the electronic_lab kickstart it has failed to compose the whole f22 cycle
Server installs in anaconda default to / on xfs so do so on arm also
2025-12-09 16:40:30 +08:00 · 2015-04-21 18:26:00 -07:00 · 2015-04-21 14:03:13 -05:00 · 2015-04-21 08:39:22 -05:00 · 2015-04-18 18:37:18 +01:00 · 2015-04-01 22:15:39 -05:00
33 changed files with 316 additions and 266 deletions
--- a/SparkleShare.txt
+++ b/SparkleShare.txt
@@ -0,0 +1,9 @@
+Congratulations, you've successfully created a SparkleShare repository!
+
+Any files you add or change in this folder will be automatically synced to 
+ssh://luya@git.fedorahosted.org/git/spin-kickstarts.git and everyone connected to it.
+
+SparkleShare is an Open Source software program that helps people collaborate and 
+share files. If you like what we do, consider buying us a beer: http://www.sparkleshare.org/
+
+Have fun! :)
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\n%end\n"

--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -23,6 +23,7 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
@standard
@hardware-support
@dial-up
+@fedora-release-nonproduct

 kernel

--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -4,6 +4,7 @@
 part / --size=3000 --fstype xfs

 %packages
+-@fedora-release-nonproduct
 -@dial-up
 # install the default groups for the server evironment since installing the environment is not working
@server-product
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -1,8 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-
-part / --size=4000 --fstype ext4
+part / --size=3500 --fstype ext4

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-cinnamon-packages.ks
+++ b/fedora-cinnamon-packages.ks
@@ -1,33 +0,0 @@
-# fedora-cinnamon-packages.ks
-#
-# Description:
-# - Fedora package set for the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%packages
-
-@networkmanager-submodules
-@cinnamon-desktop
-@libreoffice
-
-# internet and multimedia
-pidgin
-hexchat
-transmission
-totem
-
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
-# save some space
-fedora-icon-theme
-PackageKit*                # we switched to yumex, so we don't need this
-
-# no bluetooth support
-bluez
-bluez-cups
-NetworkManager-bluetooth
-
-
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/fedora-cloud-atomic-vagrant.ks
@@ -6,7 +6,6 @@
 services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final

 user --name=vagrant --password=vagrant
-rootpw vagrant

 %post --erroronfail

--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -33,14 +33,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos

 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host

 reboot

 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -48,6 +48,10 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

+# We can lead the way with the internal DHCP, see
+# https://lists.fedoraproject.org/pipermail/cloud/2015-March/005119.html
+echo "dhcp=internal" >> /etc/NetworkManager/NetworkManager.conf
+
 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.
@@ -55,13 +59,6 @@ echo -n "Getty fixes"
 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*
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -28,10 +28,6 @@ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,11520
 # layer for dnf
 # TODO: Teach vagrant about dnf
 dnf-yum
-# rsync gets installed when the Vagrant box is first launched on the
-# users setup. This can actually take a bit of time.  Just fold it
-# in to the base box disk image
-rsync
 %end

 %post --erroronfail
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -7,22 +7,9 @@
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To do a local build, you'll need to install ImageFactory.  See
-# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
-#
-# For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# (Koji generates one internally...what we really want is Koji to publish it statically)
-# 
-# Once you have imagefactory and imagefactory-plugins installed, run:
-# 
-#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
-#   tempfile=$(mktemp --suffix=.ks)
-#   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
-#   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
-#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.

 cmdline
 lang en_US.UTF-8
@@ -43,7 +30,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config

 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4 --grow
+part / --size 3000 --fstype ext4

 %include fedora-repo.ks

--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -16,10 +16,9 @@
 #

 cmdline
-bootloader --disabled
+bootloader --location=none
 timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
+rootpw --plaintext qweqwe

 keyboard us
 zerombr
@@ -45,9 +44,6 @@ dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 # Set the language rpm nodocs transaction flag persistently in the
 # image yum.conf and rpm macros

-# remove the user anaconda forces us to make
-userdel -r none
-
 LANG="en_US"
 echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf

--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -16,12 +16,12 @@
 # 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 --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # 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 --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -16,12 +16,12 @@
 # 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -16,12 +16,12 @@
 # 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 # 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 %include fedora-workstation-packages.ks

--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -24,6 +24,7 @@ services --enabled=NetworkManager --disabled=network,sshd
@guest-desktop-agents
@standard
@core
+@fedora-release-nonproduct
@fonts
@input-methods
@dial-up
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -1,56 +0,0 @@
-# fedora-live-cinnamon.ks
-#
-# Description:
-# - Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-cinnamon-packages.ks
-
-# DVD payload
-part / --size=6656
-
-%post
-# cinnamon configuration
-
-# create /etc/sysconfig/desktop (needed for installation)
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/cinnamon-session
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-# exclude GNOME-specific menu items
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/fedora-release-notes.webapp.desktop
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/yelp.desktop
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Cinnamon as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# and mark it as executable
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# this goes at the end after all other changes. 
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
-
-%end
-
-
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -110,6 +110,10 @@ cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
 Name=Design Suite Info
 GenericName=About Design Suite
 Comment=Wiki page of Design Suite
+Name=About Design Team 
+GenericName=About Design Team 
+Comment=Wiki page of Design Team
+>>>>>>> d4d001c54999e8f5401ca3f7b5d9b6a2d0132093
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
@@ -122,6 +126,8 @@ cat >> /usr/share/applications/fedora-design-team.desktop << FOE
 [Desktop Entry]
 Name=Design Team Info
 GenericName=About Design Team 
+Name=About Design Suite
+GenericName=About Design Suite Wiki Page
 Comment=Wiki page of Design Team
 Exec=xdg-open http://fedoraproject.org/wiki/Design
 Type=Application
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -55,7 +55,7 @@ fi
 mkdir -p /home/liveuser/.config/
 cat > /home/liveuser/.config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF

 # show liveinst.desktop on desktop and in menu
@@ -80,13 +80,23 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF

-# Disable plasma-pk-updates
-sed -i \
-    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+# Disable the update notifications of apper 
+cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
+[CheckUpdate]
+autoUpdate=0
+distroUpgrade=0
+interval=0
+APPER_EOF
+
+# Disable some kded modules
+# apperd: http://bugzilla.redhat.com/948099
+cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
+[Module-apperd]
+autoload=false
+KDEDRC_EOF

 # Disable baloo
-cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
+cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
 [Basic Settings]
 Indexing-Enabled=false
 BALOO_EOF
@@ -101,6 +111,11 @@ KRES_EOF
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/

+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
 EOF

 %end
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -1,7 +1,8 @@
-# fedora-livecd-kde.ks
+# fedora-live-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
+#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -11,62 +12,33 @@
 %include fedora-live-minimization.ks

 # DVD payload
-part / --size=4096
+part / --size=8192


 %packages
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
+# ship KDE wallpapers instead of GNOME ones
 -desktop-backgrounds-basic
-kdeaccessibility*
-kdeartwork-screensavers	# screensavers are not needed on live images
-#-ktorrent			# kget has also basic torrent features (~3 megs)
-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
-kipi-plugins			# ~8 megs + drags in Marble
-#-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
+kde-wallpapers

-# Additional packages that are not default in kde-* groups, but useful
+# Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
 liveusb-creator
+#pavucontrol			# pavucontrol has duplicate functionality with kmix
+krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)

-# only include kdegames-minimal
-kdegames
-kdegames-minimal
+# kdeedu apps
+@kde-education

-### space issues
+# Cantor backends
+cantor-R		# Cantor R backend, built against R-core at compile time
+maxima			# runtime dependency of the Cantor Maxima backend
+octave			# runtime dependency of the Cantor Octave backend

-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
-naver-nanum-gothic-fonts		# Korean
-vlgothic-fonts				# Japanese
-adobe-source-han-sans-cn-fonts		# simplified Chinese
-adobe-source-han-sans-twhk-fonts	# traditional Chinese
-
-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
-# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
-
-# save some space (from @standard)
-make
-
-# admin-tools
-gnome-disk-utility
-# kcm_clock still lacks some features, so keep system-config-date around
-#-system-config-date
-# prefer kcm_systemd
-system-config-services
-# prefer/use kusers
-system-config-users
+# KDE 4 translations
+kde-l10n-*
+calligra-l10n-*

 ## avoid serious bugs by omitting broken stuff

--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -1,53 +1,11 @@
-# Desktop with customizations to fit in a CD (package removals, etc.)
 # Maintained by the Fedora Desktop SIG:
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org

 %include fedora-live-base.ks
 %include fedora-mate-packages.ks
-%include fedora-live-minimization.ks

-part / --size 6144
-
-%packages
-
-# Drop things for size
-@3d-printing
-brasero
-bluez
-bluez-cups
-colord
-fedora-icon-theme
-GConf2
-gnome-bluetooth-libs
-gnome-icon-theme
-gnome-icon-theme-symbolic
-gnome-software
-gnome-themes
-gnome-themes-standard
-gnome-user-docs
-
-@mate-applications
-mate-icon-theme-faenza
-NetworkManager-bluetooth
-
-# Drop oversized fonts that aren't needed
-
-# Drop things that pull in perl
-
-# Dictionaries are big
-# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
-# strong preference to giving it a go on #fedora-desktop.
-# also see http://bugzilla.gnome.org/681084
-
-# Help and art can be big, too
-gnome-user-docs
-evolution-help
-
-# Legacy cmdline things we don't want
-telnet
-
-%end
+part / --size 6144 

 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -82,7 +40,4 @@ chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF

-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 %end
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -0,0 +1,76 @@
+# fedora-livecd-kde.ks
+#
+# Description:
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+#
+# Maintainer(s):
+# - Sebastian Vahl <fedora@deadbabylon.de>
+# - Fedora KDE SIG, http://fedoraproject.org/wiki/SIGs/KDE, kde@lists.fedoraproject.org
+
+%include fedora-live-kde-base.ks
+%include fedora-live-minimization.ks
+
+# DVD payload
+part / --size=4096
+
+
+%packages
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+-kdeartwork-screensavers	# screensavers are not needed on live images
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+k3b				# ~15 megs
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+liveusb-creator
+
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @standard)
+-make
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
+## avoid serious bugs by omitting broken stuff
+
+%end
+
+%post
+%end
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -0,0 +1,77 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-mate_compiz.ks
+%include fedora-live-minimization.ks
+
+%packages
+
+# some apps from mate-applications
+caja-actions
+mate-disk-usage-analyzer
+mate-netspeed
+mate-themes-extras
+
+# more backgrounds
+f22-backgrounds-mate
+f21-backgrounds-extras-base
+f21-backgrounds-extras-mate
+
+# system tools
+system-config-printer
+system-config-printer-applet
+
+# audio player
+audacious
+
+# office
+@libreoffice
+
+# dsl tools
+rp-pppoe
+
+# Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-colord
+-fedora-icon-theme
+-GConf2
+-gnome-bluetooth-libs
+-gnome-icon-theme
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-themes
+-gnome-themes-standard
+-gnome-user-docs
+
+-@mate-applications
+-mate-icon-theme-faenza
+-NetworkManager-bluetooth
+
+# Drop oversized fonts that aren't needed
+
+# Drop things that pull in perl
+
+# Dictionaries are big
+# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
+# strong preference to giving it a go on #fedora-desktop.
+# also see http://bugzilla.gnome.org/681084
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+
+# Legacy cmdline things we don't want
+-telnet
+
+%end
+
+%post
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
--- a/fedora-livedvd-scientific_kde.ks
+++ b/fedora-livedvd-scientific_kde.ks
@@ -171,6 +171,10 @@ hevea
 #Include Mozilla Firefox
 firefox

+# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
+-kde-l10n-*
+-calligra-l10n-*
+
 %end

 %post
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -21,30 +21,6 @@ fusion-icon-gtk
@libreoffice
@networkmanager-submodules

-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-mate-netspeed
-mate-themes-extras
-
-# more backgrounds
-f22-backgrounds-mate
-f21-backgrounds-extras-base
-f21-backgrounds-extras-mate
-
-# system tools
-system-config-printer
-system-config-printer-applet
-
-# audio player
-audacious
-
-# office
-@libreoffice
-
-# dsl tools
-rp-pppoe
-
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of 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
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks
--- a/fedora-virt-server.ks.in
+++ b/fedora-virt-server.ks.in
@@ -0,0 +1,72 @@
+# Kickstart file to create a small "base" Fedora image install suitable
+# for use as e.g. an application server.
+# 
+# Maintainer: fedora-cloud-list@fedoraproject.org
+#
+# REQUIRED variables:
+#   @@PUBLIC_KEY@@ - ssh public key
+# 
+# You must search for all required variables and replace them.
+# Example usage:
+# sed -e s,@@PUBLIC_KEY@@,"$(cat ~/.ssh/authorized_keys)", fedora-virt-server.ks.in > my-fedora-server.ks
+
+lang C
+keyboard us
+timezone --utc GMT/Zulu
+auth --useshadow --enablemd5
+firewall --service=ssh
+bootloader --timeout=1 --append="acpi=force"
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+
+## IMPORTANT ##
+## EDIT HERE ##
+# ROOT PASSWORD:
+# Setting a root password is NOT RECOMMENDED, especially if your
+# server will be accessible to the public internet.  This is
+# because of the rise of automated ssh password guessing attacks.
+# You should instead (if you don't have one already)
+# generate a public ssh key:
+# http://sial.org/howto/openssh/publickey-auth/
+# 
+# See comment below in %post for authorizing your public
+# key for the root account.
+
+rootpw ""
+
+# However, if you choose instead to make a password,
+# you will need to replace the above line with one like
+# rootpw --iscrypted @@ROOT_PASSWORD_CRYPTED@@
+# If you do neither of these things, you will not be able to log
+# into your machine.
+
+clearpart --all --initlabel
+part / --size=550 --grow --fstype=ext4
+# You may change this if you don't want swap
+part swap --recommended
+
+%packages
+@standard
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post
+
+## EDIT HERE ##
+cd /root
+if ! test -d .ssh; then
+  mkdir --mode=700 .ssh
+fi
+cat >> .ssh/authorized_keys << END_AUTHORIZED_KEYS
+@@PUBLIC_KEY@@
+END_AUTHORIZED_KEYS
+chmod 600 .ssh/authorized_keys
+if -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
+  chcon -R -h -t home_ssh_t .ssh
+fi
+
+%end
+
+reboot
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -2,6 +2,7 @@

 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
+-@fedora-release-nonproduct
 -@input-methods
 -@standard

@@ -9,7 +10,6 @@
 # workstation-product-environment in comps
@base-x
@core
-@firefox
@fonts
@guest-desktop-agents
@hardware-support
Author	SHA1	Message	Date
Luya Tshimbalanga	782967ccba	design-suite: fix design suite info	2015-04-21 18:26:00 -07:00
Dennis Gilmore	cd947e0c4a	remove the electronic_lab kickstart it has failed to compose the whole f22 cycle	2015-04-21 14:03:13 -05:00
Dennis Gilmore	e17d3d0ba4	Server installs in anaconda default to / on xfs so do so on arm also Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-04-21 08:39:22 -05:00
Peter Robinson	1c25cb6171	ARM minimal: adjust image size now X isn't being pulled in again	2015-04-18 18:37:18 +01:00
Ian McLeod	e171dabdc5	tested refinements to non-atomic vagrant	2015-04-01 22:15:39 -05:00
Stephen Gallagher	d7ef245b83	Fedora Server: re-add @hardware-support	2015-03-31 07:46:29 -04:00
Dan Horák	48296d16ae	update Server kickstart to match recent comps updates about hardware support	2015-03-30 18:07:34 +01:00
Kushal Das	b71f67490e	Adds DEVTIMEOUT option to /etc/sysconfig/network. #1204612 https://bugzilla.redhat.com/show_bug.cgi?id=1204612	2015-03-27 19:58:26 +05:30
raveit65	9308b5da94	Mate: bump size for livecd creation to 6MB	2015-03-27 13:16:59 +01:00
raveit65	500b85c343	Revert " drop nfs-utils temporarily to avoid slow boot" This reverts commit `2bd8c367cf`. nfs-utils-1.3.2-2.0.fc22 is in stable	2015-03-26 19:30:10 +01:00
Colin Walters	7f06442f8f	Revert "Revert "docker-base: Add dnf-yum" it is not yet acked by FESCo" Was now agreed http://meetbot.fedoraproject.org/fedora-meeting/2015-03-25/fesco.2015-03-25-18.00.log.html This reverts commit `9245751e67`.	2015-03-25 15:32:01 -04:00
Luya Tshimbalanga	02e041303b	design-suite: remove commented packages	2015-03-22 21:09:45 -07:00
Bruno Wolff III	5cb276a2f1	Games: Add back boswars boswars is building again and no longer has a library conflict. Hower this will put the games spin very close to 4 GiB and some more tweaking might be needed.	2015-03-22 22:21:47 -05:00
Colin Walters	7fcc4df93a	cloud-atomic: Drop old initscripts network bit Has never been needed with NM.	2015-03-20 14:08:15 -04:00
Colin Walters	cde583e3a2	cloud-atomic: use dhcp=internal for NetworkManager This uses systemd's DHCP library, and drops dhclient out of the picture, which saves RAM.	2015-03-20 14:08:15 -04:00
Dennis Gilmore	9245751e67	Revert "docker-base: Add dnf-yum" it is not yet acked by FESCo This reverts commit `cd820f7630`.	2015-03-19 20:06:57 -05:00
Colin Walters	5e9e250c1d	cloud-atomic: Disable network.service https://lists.fedoraproject.org/pipermail/cloud/2015-March/005131.html	2015-03-19 21:03:34 -04:00
Colin Walters	ba3bedacb3	cloud-atomic: Add a more explanatory comment header	2015-03-19 21:03:23 -04:00
Colin Walters	cd820f7630	docker-base: Add dnf-yum Per the FESCo ticket.	2015-03-19 18:12:16 -04:00
Colin Walters	fb6bcce1be	docker-base: Add some instructions for local builds	2015-03-19 18:12:13 -04:00
Colin Walters	d7d0e5ad95	atomic-installer: Update scripts These are now based on https://github.com/rhinstaller/lorax/pull/8	2015-03-19 18:11:54 -04:00
Brendan Jones	9fa38d0117	jam: change kde config location	2015-03-19 05:38:03 +01:00
Matthew Miller	cf9444b682	add fedora-cloud-base-vagrant.ks based on fedora-cloud-atomic-vagrant THIS IS JUST A STARTING POINT — untested!	2015-03-18 15:37:20 -04:00
Colin Walters	bfc2901422	lorax-embed-repo: Update to use HTTP-based location rpm-ostree-toolbox always uses this code path now; we spawn an "ostree trivial-httpd" even for local use. That way the same template can be used for both remote repositories and local ones.	2015-03-16 14:00:04 -05:00
Colin Walters	47ab710fe2	atomic-installer/: New subdirectory with Lorax template This is migrated from https://github.com/projectatomic/rpm-ostree-toolbox/blob/master/src/py/lorax-embed-repo.tmpl It is a command template to embed content into the installer.	2015-03-16 13:59:55 -05:00
Dennis Gilmore	0959478eab	Remove the firewall line as it causes anaconda to add firewalld to the package set. revert back to fedora-release	2015-03-16 13:59:47 -05:00
Dennis Gilmore	427657159d	pull in fedora-release-cloud to make the docker base image smaller during install dnf was pulling in fedora-release-server which added a lot of bloat	2015-03-11 16:15:10 -05:00
Rex Dieter	dbe507bd91	kde: nuke nepomuk references	2015-03-11 12:56:39 -05:00
Rex Dieter	0b6884a62e	kde: s/oxygen-gtk/Adwaita/	2015-03-11 12:55:10 -05:00
Rex Dieter	3677a24bd9	kde-base: fix kickstart favorites for plasma5	2015-03-11 08:39:48 -05:00
Brendan Jones	4675f6f6fd	jam: modify favourites location	2015-03-11 07:22:33 +01:00
raveit65	2bd8c367cf	drop nfs-utils temporarily to avoid slow boot	2015-03-09 16:23:42 +01:00
luya	a7d928767c	design-suite: fix correct url for both Design Suite and Design Team shorcuts	2015-03-09 02:39:43 -07:00
luya	f7d3da2878	design-suite: fix correct url for both Design Suite and Design Team shorcuts	2015-03-09 02:35:10 -07:00
luya	131565566b	design-suite: fix correct url for both Design Suite and Design Team shorcuts	2015-03-09 02:32:24 -07:00
raveit65	d4d001c549	Mate: add more packages	2015-03-08 15:13:15 +01:00
Dennis Gilmore	db8c33a53f	switch teh docker base image to dnf	2015-03-07 11:13:34 -06:00
Kevin Fenzi	16b8801b8e	Try this as a fix for ldconfig being so slow on boot on live media. bug 1195998	2015-03-07 07:00:31 -07:00
Colin Walters	264303aac1	atomic-vagrant: Mask cloud-init instead of using rm on /etc Now that cloud-init is enabled in the systemd unit, that change goes in /usr/lib...which we can't easily change. There are two potentially sane solutions: - Refactor the kickstarts here - Some support for systemd presets in kickstart files would allow us to have a later override here	2015-03-04 17:36:32 -05:00
Amit Saha	7c328c9965	Fedora Scientific: Remove the translation packages for now Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1197940	2015-03-04 12:01:25 +10:00
Adam Williamson	66b3b50b89	fedora-live-kde-base.ks: follow-up to autologin session fix There's two places where the session name is referenced, Kev only fixed one.	2015-03-02 18:22:30 -08:00
Colin Walters	341e2f56f9	atomic-pxetolive: Enable cloud-init Now that it's properly disabled by default in the package, we need to enable it here.	2015-03-01 13:33:37 -05:00
raveit65	b1c14531ce	Mate: add libreoffice suite + drop some removes	2015-03-01 03:49:03 +01:00
Luya Tshimbalanga	9c52c11e9a	design-suite: remove conflict text in ks	2015-02-27 20:15:15 -08:00
Luya Tshimbalanga	37dc4aa02f	design-suite: add design team and suite page minor revision	2015-02-27 20:12:44 -08:00
Luya Tshimbalanga	a8e9553e5c	design-suite: add design team and suite page shortcut	2015-02-27 20:10:36 -08:00
Kevin Kofler	75e15f1dd2	fedora-live-kde-base.ks: Change the autologin Session to plasma.desktop. Plasma 5 uses plasma.desktop instead of kde-plasma.desktop.	2015-02-26 20:07:56 +01:00
Colin Walters	9eed55b9e5	cloud-atomic-pxetolive: New file For the Atomic Host PXE-to-Live feature.	2015-02-25 22:22:03 -05:00
Dennis Gilmore	eae3708bca	add arm server image	2015-02-25 19:17:36 -06:00
Colin Walters	ee4bc19ae7	fedora-cloud-atomic-vagrant: New file for Changes/Vagrant_Box_Atomic See https://fedoraproject.org/wiki/Changes/Vagrant_Box_Atomic	2015-02-25 17:26:42 -05:00
Colin Walters	51d4c8ee45	atomic: Change the URLs to point to F22 content	2015-02-25 12:50:20 -05:00
luya	9defdef6cd	design-suite: fixed typo on open-sans-fonts	2015-02-25 03:33:02 -08:00
Stephen Gallagher	efab044d00	Fedora Server: Remove development packages Fedora Server is targeted at deployment environments. We'll save space on the DVD by skipping a lot of development tools.	2015-02-24 13:17:53 -05:00
Adam Williamson	13f09fe7d6	fix double ? in fedora-repo files	2015-02-20 09:12:36 -08:00
Fabian Affolter	38321a2d35	remove old packages	2015-02-20 14:43:53 +01:00
Dennis Gilmore	b5ab8fc9bb	disable rawhide on the workstation install tree	2015-02-19 10:54:19 -06:00
Dennis Gilmore	6881942927	enable the fedora repos and disable the rawhide ones	2015-02-19 08:25:54 -06:00
Bruno Wolff III	c00926fcb5	Games: Temporarily remove boswars, since it isn't building	2015-02-18 22:56:46 -06:00
Kevin Fenzi	66c69f4243	Add a few packages requested to xfce spin and increase base size	2015-02-18 19:17:01 -07:00
Peter Robinson	6633c8f661	XFCE: increase size of ARM image	2015-02-18 16:50:40 +00:00
Dennis Gilmore	84b8cd7926	enable the branched repos	2015-02-11 08:20:27 -06:00
Dennis Gilmore	f1cfec3f1b	choose more secure options for the repos	2015-02-11 08:19:33 -06:00