aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChmouel Boudjnah <chmouel@mandriva.org>2000-05-06 20:55:26 +0000
committerChmouel Boudjnah <chmouel@mandriva.org>2000-05-06 20:55:26 +0000
commitdfa48caee7add65ee252e60dd2eba4e8a4de077e (patch)
tree7e752c8169def0d33ee92930b4030575721447cd
parent718bb8f220bda28a974de2da0cce721216d440ae (diff)
downloadcommon-data-dfa48caee7add65ee252e60dd2eba4e8a4de077e.tar
common-data-dfa48caee7add65ee252e60dd2eba4e8a4de077e.tar.gz
common-data-dfa48caee7add65ee252e60dd2eba4e8a4de077e.tar.bz2
common-data-dfa48caee7add65ee252e60dd2eba4e8a4de077e.tar.xz
common-data-dfa48caee7add65ee252e60dd2eba4e8a4de077e.zip
* sbin/chksession: if icewm is not here by default launch twm.
-rw-r--r--ChangeLog4
-rw-r--r--mandrake_desk.spec6
-rw-r--r--sbin/chksession8
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d6f79bd..99236c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-06 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+ * sbin/chksession: if icewm is not here by default launch twm.
+
2000-04-30 Stefan Siegel <siegel@linux-mandrake.com>
* icon cleanup
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 8af039d..89386e0 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,5 +1,4 @@
-# DO NOT MODIFY HERE, modify in the CVS
-%define release 14mdk
+%define release 15mdk
%define name mandrake_desk
%define version 1.0.3
@@ -55,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/man/*/*
%changelog
+* Sat May 6 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.3-15mdk
+- sbin/chksession: if icewm is not here by default launch twm.
+
* Fri May 5 2000 Pixel <pixel@mandrakesoft.com> 1.0.3-14mdk
- fix for kdeDesktopCleanup
diff --git a/sbin/chksession b/sbin/chksession
index d0bec64..db3bdd4 100644
--- a/sbin/chksession
+++ b/sbin/chksession
@@ -123,7 +123,13 @@ if ($xsession) {
print $script{$xsession}
} else {
print "xterm -geometry 100x25+0+0 &\n";
- -x '/usr/X11R6/bin/icewm' ? print "icewm\n" : print "xterm -geometry 67x14+384+446\n";
+ if ( -x '/usr/X11R6/bin/icewm' ) {
+ print "icewm\n";
+ } elsif ( -x '/usr/X11R6/bin/twm' ) {
+ print "twm\n";
+ } else {
+ print "xterm -geometry 67x14+384+446\n";
+ }
}
exit (0);
}