cinnamon: increase the underlying filesystem to 6.5G since 6G is a tad too small

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

SparkleShare.txt

@@ -1,9 +0,0 @@
-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! :)

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\n%end\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"
 

fedora-arm-base.ks

@@ -23,7 +23,6 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 @standard
 @hardware-support
 @dial-up
-@fedora-release-nonproduct
 
 kernel
 

fedora-arm-server.ks

@@ -4,7 +4,6 @@
 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

fedora-cinnamon-packages.ks

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

fedora-cloud-atomic-vagrant.ks

@@ -6,6 +6,7 @@
 services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
 user --name=vagrant --password=vagrant
+rootpw vagrant
 
 %post --erroronfail
 

fedora-cloud-base-vagrant.ks

@@ -28,6 +28,10 @@ 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

fedora-cloud-base.ks

@@ -20,7 +20,7 @@
 # 
 #   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
 #   tempfile=$(mktemp --suffix=.ks)
-#   ksflatten -v F22 fedora-cloud-base.ks > ${tempfile}
+#   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
 #
 
@@ -43,7 +43,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --size 3000 --fstype ext4 --grow
 
 %include fedora-repo.ks
 

fedora-docker-base.ks

@@ -16,9 +16,10 @@
 #
 
 cmdline
-bootloader --location=none
+bootloader --disabled
 timezone --isUtc --nontp Etc/UTC
-rootpw --plaintext qweqwe
+rootpw --lock --iscrypted locked
+user --name=none
 
 keyboard us
 zerombr
@@ -44,6 +45,9 @@ 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
 

fedora-live-base.ks

@@ -24,7 +24,6 @@ services --enabled=NetworkManager --disabled=network,sshd
 @guest-desktop-agents
 @standard
 @core
-@fedora-release-nonproduct
 @fonts
 @input-methods
 @dial-up

fedora-live-cinnamon.ks

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

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/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
+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
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
@@ -80,23 +80,13 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable the update notifications of apper 
+# Disable plasma-pk-updates
-cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
+sed -i \
-[CheckUpdate]
+    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-autoUpdate=0
+    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
-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/.kde/share/config/baloofilerc << BALOO_EOF
+cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 [Basic Settings]
 Indexing-Enabled=false
 BALOO_EOF
@@ -111,11 +101,6 @@ 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

fedora-live-kde.ks

@@ -1,8 +1,7 @@
-# fedora-live-kde.ks
+# fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
-#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -12,33 +11,62 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=8192
+part / --size=4096
 
 
 %packages
-# ship KDE wallpapers instead of GNOME ones
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
 -desktop-backgrounds-basic
-kde-wallpapers
+-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-desktop but useful
+# Additional packages that are not default in kde-* groups, 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)
 
-# kdeedu apps
+# only include kdegames-minimal
-@kde-education
+-kdegames
+kdegames-minimal
 
-# Cantor backends
+### space issues
-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
 
-# KDE 4 translations
+# fonts (we make no bones about admitting we're english-only)
-kde-l10n-*
+wqy-microhei-fonts			# a compact CJK font, to replace:
-calligra-l10n-*
+-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
 

fedora-live-mate_compiz.ks

@@ -1,11 +1,53 @@
+# 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 
+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
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -40,4 +82,7 @@ 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

fedora-livecd-kde.ks

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

fedora-livecd-mate_compiz.ks

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

fedora-mate-packages.ks

@@ -21,6 +21,30 @@ 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

fedora-virt-server.ks.in

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

fedora-workstation-packages.ks

@@ -2,7 +2,6 @@
 
 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
--@fedora-release-nonproduct
 -@input-methods
 -@standard
 
@@ -10,6 +9,7 @@
 # workstation-product-environment in comps
 @base-x
 @core
+@firefox
 @fonts
 @guest-desktop-agents
 @hardware-support