summaryrefslogtreecommitdiffstats
path: root/rescue/Flash/scripts/upgrade
diff options
context:
space:
mode:
Diffstat (limited to 'rescue/Flash/scripts/upgrade')
-rwxr-xr-xrescue/Flash/scripts/upgrade3
1 files changed, 3 insertions, 0 deletions
diff --git a/rescue/Flash/scripts/upgrade b/rescue/Flash/scripts/upgrade
index e597d22cb..d5ec8fb9a 100755
--- a/rescue/Flash/scripts/upgrade
+++ b/rescue/Flash/scripts/upgrade
@@ -177,6 +177,9 @@ function merge_config_files() {
#- reapply lang configuration, mostly to rewrite kdeglobals
chroot $tmpdir/union perl -I/usr/lib/libDrakX -Mlang -e "lang::write(lang::read())" &>/dev/null
+ #- remove KDE sessions file so that previous compiz usage does not break session
+ rm -f $tmpdir/union/home/*/.kde/share/config/ksmserverrc &>/dev/null
+
return 0
}
href='#n111'>111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
#include "vesamode.h"
#ident "$Id$"

/* Known standard VESA modes. */
struct vesa_mode_t known_vesa_modes[] = {
	/* VESA 1.0/1.1 ? */
	{0x100,	640, 400, 256,	"640x400x256"},
	{0x101,	640, 480, 256,	"640x480x256"},
	{0x102,	800, 600, 16,	"800x600x16"},
	{0x103,	800, 600, 256,	"800x600x256"},
	{0x104,	1024, 768, 16,	"1024x768x16"},
	{0x105,	1024, 768, 256,	"1024x768x256"},
	{0x106,	1280, 1024, 16,	"1280x1024x16"},
	{0x107,	1280, 1024, 256,"1280x1024x256"},
	{0x108,	80, 60, 16,	"80x60 (text)"},
	{0x109,	132, 25, 16,	"132x25 (text)"},
	{0x10a,	132, 43, 16,	"132x43 (text)"},
	{0x10b,	132, 50, 16,	"132x50 (text)"},
	{0x10c,	132, 60, 16,	"132x60 (text)"},
	/* VESA 1.2+ */
	{0x10d,	320, 200, 32768,	"320x200x32k"},
	{0x10e,	320, 200, 65536,	"320x200x64k"},
	{0x10f,	320, 200, 16777216,	"320x200x16m"},
	{0x110,	640, 480, 32768,	"640x480x32k"},
	{0x111,	640, 480, 65536,	"640x480x64k"},
	{0x112,	640, 480, 16777216,	"640x480x16m"},
	{0x113,	800, 600, 32768,	"800x600x32k"},