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
kde: Enable folderview on kde live
2025-12-09 00:20:31 +08:00 · 2015-05-21 11:35:08 -05:00 · 2015-05-18 09:31:01 -05:00 · 2015-05-15 17:35:52 -04:00 · 2015-05-13 17:33:07 -04:00 · 2015-05-06 14:36:59 -04:00
12 changed files with 21 additions and 111 deletions
--- a/SparkleShare.txt
+++ b/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! :)
--- 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\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"

--- a/fedora-arm-base.ks
+++ b/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

--- a/fedora-arm-server.ks
+++ b/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
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/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

--- a/fedora-cloud-base-vagrant.ks
+++ b/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
--- a/fedora-cloud-base.ks
+++ b/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

--- a/fedora-docker-base.ks
+++ b/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

--- a/fedora-live-base.ks
+++ b/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
--- 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/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 
-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 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 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
--- a/fedora-virt-server.ks.in
+++ b/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
--- a/fedora-workstation-packages.ks
+++ b/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
Author	SHA1	Message	Date
Rex Dieter	a40ab7b175	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	2015-05-21 11:35:08 -05:00
Rex Dieter	769827f2e7	kde: Enable folderview on kde live workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1220862	2015-05-18 09:31:01 -05:00
Colin Walters	4dc7946ad4	docker: Use bootloader --none to work around Anaconda regression We were getting grub2 in the base image again. Apparently for a while Anaconda has supported a cleaner syntax for this, and since it fixes the bug, let's use it. https://bugzilla.redhat.com/show_bug.cgi?id=1222132	2015-05-15 17:35:52 -04:00
Colin Walters	ed4f6a9e88	cloud-atomic-vagrant: Set root's password to vagrant too This matches the Base box, and is standard per the Vagrant Base Box guidelines: http://docs.vagrantup.com/v2/boxes/base.html https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2015-May/msg00046.html	2015-05-13 17:33:07 -04:00
Colin Walters	6ba647a663	docker: Don't use a hardcoded root password Best practice is to use unprivileged service daemons inside Docker containers. But with this hardcoded root password, in the case of remote code execution, an attacker could trivially escalate their privileges to root/uid 0. And while that's uid 0 inside a container, that's a much larger attack surface. Instead, do the same thing we're doing for the Cloud images: lock the root password, create a user to make Anaconda happy, then delete the user in %post. https://bugzilla.redhat.com/show_bug.cgi?id=1175997	2015-05-06 14:36:59 -04:00
Rex Dieter	77955c8fc4	kde: drop plasma-netbook hack plasma-netbook no longer exists	2015-05-05 12:06:24 -05:00
Rex Dieter	5a5764090a	kde: Disable plasma-pk-updates on live image See also saga at: https://bugzilla.redhat.com/show_bug.cgi?id=1206760	2015-05-05 12:01:20 -05:00
Rex Dieter	9390940213	kde: drop apper references, fix baloofilerc	2015-05-05 11:49:44 -05:00
Rex Dieter	21696187bb	kde: fix browser link	2015-05-05 11:40:10 -05:00
Ian McLeod	1e1a531b9b	grow base partition for cloud and vagrant images We control the actual size of the virtual disks with options on the koji command line. This change will allow the Vagrant root partition to grow to the 40 GB we allocate in the koji image build while the base cloud image will remain essentially unchanged, as it is set to 3 GB in the rel-eng koji call.	2015-05-04 14:35:23 -05:00
Ian McLeod	ca057bc830	add rsync to non-atomic vagrant box It gets installed at box launch time anyway. Save users the annoyance of having to wait. This is in line with the Atomic Vagrant images as well, which contain rsync in the composed tree.	2015-05-04 14:25:11 -05:00
Amit Saha	1dd0bbf214	Small fix for local cloud image creation instruction ksflatten expects a "-c" option to point to the kickstart.	2015-04-27 14:10:55 +10:00
Kalev Lember	1b5f493b33	workstation: Sync included groups with comps Comps commit b802fd1c8472bcf5eb2587cd9ba20fb301bbaa6e changed workstation-product-environment to include the whole of @firefox group, as opposed to just including the firefox package in the workstation-product group. This commit syncs the change here too.	2015-04-24 22:38:03 +02:00
Kalev Lember	181d3e9f8c	Drop any references to fedora-release-nonproduct The package is gone in F22+ and folded into fedora-release.	2015-04-24 22:28:29 +02:00
Colin Walters	561734e70a	fedora-virt-server.ks.in: Delete, obsoleted by the cloud image I committed this 5 years ago with only a minimum of review, its main feature was easier SSH key injection, a problem which has been solved much better by the cloud image which uses `cloud-init`, as well as the Vagrant boxes which use hardcoded vagrant SSH keys.	2015-04-23 12:20:46 -04:00
Dennis Gilmore	16945e23fd	this file does not belong in the spin-kickstarts repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-04-23 11:13:21 -05:00
Colin Walters	a5726d984b	atomic-installer: Set the default origin Matching what we do in the cloud image, we also need to set the default URL for updates. Reported-by: Dennis Gilmore <dennis@ausil.us>	2015-04-23 11:21:54 -04:00