[spin-kickstarts] base: prevent unintended failures in the livesys initscript
by Matthias Clasen
commit 47eaac1dc1f15de620d5409ee817de8fdf30d133
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Mar 23 11:56:47 2011 -0400
base: prevent unintended failures in the livesys initscript
Some of the tweaks we do there may fail if the packages containing
the touched files are not present. Better be careful.
fedora-live-base.ks | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 96bd99b..f2d7766 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -188,21 +188,21 @@ chkconfig --level 345 firstboot off 2>/dev/null
echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
# don't start yum-updatesd for livecd boots
-chkconfig --level 345 yum-updatesd off 2>/dev/null
+chkconfig --level 345 yum-updatesd off 2>/dev/null || :
# turn off mdmonitor by default
-chkconfig --level 345 mdmonitor off 2>/dev/null
+chkconfig --level 345 mdmonitor off 2>/dev/null || :
# turn off setroubleshoot on the live image to preserve resources
-chkconfig --level 345 setroubleshoot off 2>/dev/null
+chkconfig --level 345 setroubleshoot off 2>/dev/null || :
# don't enable the gnome-settings-daemon packagekit plugin
-gsettings set org.gnome.settings-daemon.plugins.updates active 'false'
+gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || :
# don't start cron/at as they tend to spawn things which are
# disk intensive that are painful on a live image
-chkconfig --level 345 crond off 2>/dev/null
-chkconfig --level 345 atd off 2>/dev/null
+chkconfig --level 345 crond off 2>/dev/null || :
+chkconfig --level 345 atd off 2>/dev/null || :
# Stopgap fix for RH #217966; should be fixed in HAL instead
touch /media/.hal-mtab
13 years
[spin-kickstarts] fedora-live-kde-base.ks: create /root/.gtkrc-2.0 directly in the image (#689070) This needs to be do
by Kevin Kofler
commit 9a222daf121e1265a859850e2b064b61a929ca44
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Tue Mar 22 16:20:52 2011 +0100
fedora-live-kde-base.ks: create /root/.gtkrc-2.0 directly in the image (#689070)
This needs to be done directly in the file system image, not in the livesys
initscript, because it should persist on liveinst.
fedora-live-kde-base.ks | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 86e5410..872b4d8 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -33,6 +33,13 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
+# make oxygen-gtk the default GTK+ 2 theme for root (see #683855, #689070)
+cat > /root/.gtkrc-2.0 << EOF
+include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/etc/gtk-2.0/gtkrc"
+gtk-theme-name="oxygen-gtk"
+EOF
+
# add initscript
cat >> /etc/rc.d/init.d/livesys << EOF
@@ -115,13 +122,6 @@ 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
-
-# hack around https://bugzilla.redhat.com/683855
-cat > /root/.gtkrc-2.0 << GTKRC_EOF
-include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
-include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="oxygen-gtk"
-GTKRC_EOF
EOF
%end
13 years
Open action items from previous meetings
by Christoph Wickert
There are a few action items from previous meetings of the spins SIG
that should be addressed in order for us to advance:
>From the 2011-03-07 meeting (not in the minutes, only in the full log:
* jsmith to get in touch with rel-eng and tell them to give us
(the spins SIG) documentation on their compose process and a
list of things they require from us
>From the 2011-03-14 meeting:
* rdieter and the KDE SIG to make a formal spins page for the KDE
spin
Please resolve this issues and report back to us.
Thanks in advance,
Christoph
13 years
[spin-kickstarts] rename liveinst.desktop to anaconda.desktop
by Matthias Clasen
commit ddba2be8e208111b7f61b4c58d97fff01280c43b
Author: Ray Strode <rstrode(a)redhat.com>
Date: Tue Mar 15 12:35:08 2011 -0400
rename liveinst.desktop to anaconda.desktop
The shell requires the name to be the same as the wmclass
of the initial window.
fedora-live-desktop.ks | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index dc42c58..92ce90c 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -29,6 +29,9 @@ FOE
# Show harddisk install in shell dash
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+# need to move it to anaconda.desktop to make shell happy
+mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
[org.gnome.shell]
favorite-apps=['mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'liveinst.desktop']
13 years
[spin-kickstarts] Desktop: Don't use spawnDesktop in the shell extension
by Matthias Clasen
commit 750658b18a603d9cac34a64ef6e1618450ec8430
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Mar 16 23:59:54 2011 -0400
Desktop: Don't use spawnDesktop in the shell extension
Its future is mirky
fedora-live-desktop.ks | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 677c8c4..f722e99 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -51,8 +51,9 @@ const Main = imports.ui.main;
const Util = imports.misc.util;
function main() {
- let item = new PopupMenu.PopupMenuItem(Shell.AppSystem.get_default().get_app('anaconda.desktop').get_name());
- item.connect('activate', function() { Util.spawnDesktop('anaconda'); });
+ let app = Shell.AppSystem.get_default().get_app('anaconda.desktop');
+ let item = new PopupMenu.PopupMenuItem(app.get_name());
+ item.connect('activate', function() { app.launch(); });
Main.panel._statusmenu.menu.addMenuItem(item, Main.panel._statusmenu.menu._getMenuItems().length - 1);
}
13 years
[spin-kickstarts] New build for testing
by Bruno Wolff III
commit abe9a5fcb29edaf4f8735fb4b89086509b151fed
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Mar 16 19:56:51 2011 -0500
New build for testing
configure.ac | 2 +-
spin-kickstarts.spec.in | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 093e79b..2c99771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.15.2)
+AC_INIT([spin-kickstarts], 0.15.3)
AC_SUBST([RELEASE], 1)
ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW"
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 2d10eb0..a14a434 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/%{name}/l10n/README
%changelog
+* Wed Mar 16 2011 Bruno Wolff III <bruno(a)wolff.to> 0.15.3-1
+- Early beta build to facilitate testing
+- The alternate KDE ks file has been added to the package
+
* Mon Feb 14 2011 Bruno Wolff III <bruno(a)wolff.to> 0.15.2-1
- Rebuild to point to branched release
13 years
[spin-kickstarts] Add alternate kde ks file to the package.
by Bruno Wolff III
commit ede41e8a50c1c8e42c7acd4c8dfb093fa788a9f8
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Mar 16 19:53:19 2011 -0500
Add alternate kde ks file to the package.
Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 70f694c..12100eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ fedora_DATA = \
fedora-livecd-design-suite.ks \
fedora-live-desktop.ks \
fedora-livecd-desktop.ks \
+ fedora-live-kde.ks \
fedora-livecd-kde.ks \
fedora-livecd-lxde.ks \
fedora-livecd-meego.ks \
13 years
[spin-kickstarts] change desktop file in menu to anaconda too
by Matthias Clasen
commit 7613ad6ba1cea604d302c6d6596e1ceeb459e7ba
Author: Ray Strode <rstrode(a)redhat.com>
Date: Tue Mar 15 13:55:56 2011 -0400
change desktop file in menu to anaconda too
This is like the previous commit but for the menu,
not the dash.
fedora-live-desktop.ks | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 7a1b9eb..677c8c4 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -51,8 +51,8 @@ const Main = imports.ui.main;
const Util = imports.misc.util;
function main() {
- let item = new PopupMenu.PopupMenuItem(Shell.AppSystem.get_default().get_app('liveinst.desktop').get_name());
- item.connect('activate', function() { Util.spawnDesktop('liveinst'); });
+ let item = new PopupMenu.PopupMenuItem(Shell.AppSystem.get_default().get_app('anaconda.desktop').get_name());
+ item.connect('activate', function() { Util.spawnDesktop('anaconda'); });
Main.panel._statusmenu.menu.addMenuItem(item, Main.panel._statusmenu.menu._getMenuItems().length - 1);
}
13 years
[spin-kickstarts] change favorite in dash to be anaconda.desktop not liveinst.desktop
by Matthias Clasen
commit 5d5d8fe116cde005abe361aa41467293adf8a094
Author: Ray Strode <rstrode(a)redhat.com>
Date: Tue Mar 15 12:52:57 2011 -0400
change favorite in dash to be anaconda.desktop not liveinst.desktop
This is to compensate for commit
fb696616b70e3145f1a02a7c081244cd20c8cfe9
fedora-live-desktop.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 92ce90c..7a1b9eb 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -34,7 +34,7 @@ mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.des
cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
[org.gnome.shell]
-favorite-apps=['mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'liveinst.desktop']
+favorite-apps=['mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'anaconda.desktop']
FOE
glib-compile-schemas /usr/share/glib-2.0/schemas
13 years