Revert "kde: Enable folderview on kde live"

This reverts commit 769827f2e7.

It didn't work reliably, and we have a better solution,
https://admin.fedoraproject.org/updates/FEDORA-2015-8453

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-arm-xfce.ks

@@ -1,7 +1,8 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-part / --size=3500 --fstype ext4
+
+part / --size=4000 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

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-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/22/ --ref=fedora-atomic/f22/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/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/22/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -48,10 +48,6 @@ 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.
@@ -59,6 +55,13 @@ 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*

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

@@ -7,9 +7,22 @@
 # 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 appliance-creator and
+# This kickstart file is designed to be used with ImageFactory (in Koji).
-# 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.
+# 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
+#
 
 cmdline
 lang en_US.UTF-8
@@ -30,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-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 --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-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 --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-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)

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 --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-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 --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-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)

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 --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-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 --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-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
 

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-design_suite.ks

@@ -110,10 +110,6 @@ 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
@@ -126,8 +122,6 @@ 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

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-livedvd-scientific_kde.ks

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

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

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