Attachment 247101 Details for Bug 331731 – bzr diff bring 10-runlevel-hack and 14-kdmrc-update uptodate

[patch] bzr diff bring 10-runlevel-hack and 14-kdmrc-update uptodate

ltsp-server-bzr.diff (text/plain), 2.24 KB, created by Patrice Dumas on 2007-11-02 21:51:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-11-02 21:51:40 UTC

Size: 2.24 KB

patch

obsolete

>=== modified file 'dist/src/usr/share/ltsp5/scripts.d/10-runlevel-hack'
>--- dist/src/usr/share/ltsp5/scripts.d/10-runlevel-hack	2007-10-31 16:19:51 +0000
>+++ dist/src/usr/share/ltsp5/scripts.d/10-runlevel-hack	2007-11-02 21:16:14 +0000
>@@ -1,5 +1,8 @@
> #!/bin/sh
> 
>+# when runlevel is set to 3, this scripts arranges to start up the 
>+# display manager, without starting an X server on a display.
>+
> RUNLEVEL="`grep ^id: /etc/inittab | cut -d':' -f2`"
> 
> if [ "$RUNLEVEL" -eq "3" ]
>@@ -11,16 +14,25 @@
> 		perl -i.ltsp -p -e "s,x:5:respawn:/etc/X11/prefdm -nodaemon,x:35:respawn:/etc/X11/prefdm -nodaemon,"  $FILE
> 	fi
> 
>-	FILE=/etc/X11/gdm/gdm.conf
>+# settings in /etc/gdm/custom.conf, defaults in /usr/share/gdm/defaults.conf 
>+# 
>+#	FILE=/etc/X11/gdm/gdm.conf
>+#	if [ -f $FILE ]
>+#	then
>+#		perl -i.ltsp -p -e "s,0=/usr/bin/X11/X,#0=/usr/bin/X11/X,"  $FILE
>+#	fi
>+	FILE=/etc/gdm/custom.conf
> 	if [ -f $FILE ]
> 	then
>-		perl -i.ltsp -p -e "s,0=/usr/bin/X11/X,#0=/usr/bin/X11/X,"  $FILE
>+		if grep -vq '^0=Terminal' $FILE; then 
>+			perl -i.ltsp -ne 'if (/^\[servers\]/) {print $_."0=Terminal\n"} else {print}' $FILE
>+		fi
> 	fi
> 
> 	FILE=/etc/X11/xdm/Xservers
> 	if [ -f $FILE ]
> 	then
>-		perl -i.ltsp -p -e "s,:0 local /usr/X11R6/bin/X,#:0 local /usr/X11R6/bin/X,"  $FILE
>+		perl -i.ltsp -p -e "s,:0 local /usr/bin/X,#:0 local /usr/bin/X,"  $FILE
> 	fi
> 
> fi
>
>=== modified file 'dist/src/usr/share/ltsp5/scripts.d/14-kdmrc-update'
>--- dist/src/usr/share/ltsp5/scripts.d/14-kdmrc-update	2007-10-31 16:19:51 +0000
>+++ dist/src/usr/share/ltsp5/scripts.d/14-kdmrc-update	2007-11-02 10:11:21 +0000
>@@ -1,10 +1,10 @@
> #!/bin/sh
> 
>-# this script changes the default window resize/move behavior to be
>-# "box" rather than than "opaque". This saves a ton of bandwidth on
>-# diskless clients.
>+# this script enables xdmcp in kdm, turn off the possibility to halt
>+# or reboot and do some performance tuning by removing the clock from
>+# kdm that generates unnneeded traffic.
> 
>-FILE=/etc/X11/xdm/kdmrc
>+FILE=/etc/kde/kdm/kdmrc
> 
> if [ -f $FILE ]
> then
>@@ -26,10 +26,6 @@
> 	if ($_ =~ /^RebootCmd=/i) {
> 		$_ = "#" . $_ ; 
> 	}
>-	# add ICEwm to the session list
>-	if ($_ =~ /^SessionTypes=/i && $_ !~ /icewm/ ) {
>-		s/$/,icewm/;
>-	}
> 	# turn off the clock
> 	if ($_ =~ /^LogoArea=Clock/ ) {
> 		$_ =  "#" . $_  ;
>

Actions: View | Diff

Attachments on bug 331731: 228351 | 228381 | 228421 | 228431 | 229461 | 229471 | 243871 | 243881 | 247101