Revert "kde: Enable folderview on kde live"

This reverts commit 16a5bf2a4d. 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-10 00:50:32 +08:00 · 2015-05-21 11:36:04 -05:00 · 2015-05-18 09:31:40 -05:00 · 2015-05-16 08:35:09 -04:00 · 2015-05-15 14:51:06 -07:00 · 2015-05-12 10:13:44 -07:00
9 changed files with 20 additions and 36 deletions
--- 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
@@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux

-part /boot --size=300 --fstype ext3
+part /boot --size=512 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4

@@ -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-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,5 +1,6 @@
 %include fedora-arm-base.ks

+part /boot --size=300 --fstype ext3
 part swap --size=256 --fstype swap
 part / --size=1200 --fstype ext4

--- 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-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-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -110,10 +110,9 @@ 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
+Name=About Design Suite
+GenericName=About Design Suite 
+Comment=Wiki page of Design Suite
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
@@ -126,8 +125,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
+Name=About Design Team
+GenericName=About Design Team Wiki Page
 Comment=Wiki page of Design Team
 Exec=xdg-open http://fedoraproject.org/wiki/Design
 Type=Application
@@ -140,4 +139,3 @@ chmod a+x /usr/share/applications/fedora-design-team.desktop
 glib-compile-schemas /usr/share/glib-2.0/schemas

 %end
-
--- 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-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
Author	SHA1	Message	Date
Rex Dieter	c033c03c08	Revert "kde: Enable folderview on kde live" This reverts commit `16a5bf2a4d`. It didn't work reliably, and we have a better solution, https://admin.fedoraproject.org/updates/FEDORA-2015-8453	2015-05-21 11:36:04 -05:00
Rex Dieter	16a5bf2a4d	kde: Enable folderview on kde live workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1220862	2015-05-18 09:31:40 -05:00
Colin Walters	6ef2d02a30	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-16 08:35:09 -04:00
Luya Tshimbalanga	b8947535a2	design-suite: fixes correct name of page icons	2015-05-15 14:51:06 -07:00
Luya Tshimbalanga	72a583d4a4	design-suite: fixes documentation links only for f22	2015-05-12 10:13:44 -07:00
Colin Walters	7a6f83699b	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:37:19 -04:00
Rex Dieter	76d2df7147	kde: drop plasma-netbook hack plasma-netbook no longer exists	2015-05-05 12:07:20 -05:00
Rex Dieter	1fd1f6d138	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:07:20 -05:00
Rex Dieter	94ab41ccd3	kde: drop apper references, fix baloofilerc	2015-05-05 12:07:20 -05:00
Rex Dieter	5f90422b0e	kde: fix browser link	2015-05-05 12:07:20 -05:00
Kalev Lember	c7094bf8ab	Drop any references to fedora-release-nonproduct The package is gone in F22+ and folded into fedora-release.	2015-04-24 22:27:31 +02:00
Peter Robinson	906bbfee12	Merge branch 'f22' of ssh://git.fedorahosted.org/git/spin-kickstarts into f22	2015-04-23 16:56:16 +01:00
Peter Robinson	a9325d0503	ARM: the /boot change was meant just to be for minimal	2015-04-23 16:55:56 +01:00
Colin Walters	0a2751d382	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:46:37 -04:00