summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmove/make_live4
-rw-r--r--move/move.pm2
-rwxr-xr-xmove/tree/startkde_move2
3 files changed, 2 insertions, 6 deletions
diff --git a/move/make_live b/move/make_live
index 24631d5d4..1cba4a4ba 100755
--- a/move/make_live
+++ b/move/make_live
@@ -150,10 +150,6 @@ symlinkf('/var/lib/xkb', "$::prefix/etc/X11/xkb/compiled");
#- Xsession wants to start first-time
unlink "$::prefix/usr/X11R6/bin/drakfw";
-substInFile {
- s|startkde\b|startkde_move|;
-} "$::prefix/etc/X11/wmsession.d/01KDE";
-
#- KDE
diff --git a/move/move.pm b/move/move.pm
index 8e131c826..cd3ef6274 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -653,7 +653,7 @@ sub install2::startMove {
$ENV{XDM_MANAGED} = '/var/run/rebootctl,maysd,mayfn,sched'; #- for reboot/halt availability of "logout" by kde
$ENV{GDMSESSION} = 1; #- disable ~/.xsession-errors in Xsession (waste of usb key writes)
chdir;
- exec '/etc/X11/Xsession', 'KDE'; #- call it with KDE parameter to keep background
+ exec 'startkde_move';
} else {
exec 'xwait', '-permanent' or c::_exit(0);
}
diff --git a/move/tree/startkde_move b/move/tree/startkde_move
index f4bde8cba..3b1b55ab5 100755
--- a/move/tree/startkde_move
+++ b/move/tree/startkde_move
@@ -11,7 +11,7 @@ while true; do
xwait -permanent &
xdim=`xdpyinfo | perl -ne 'print $1 if /dimensions:\s*(\d+)/'`
qiv --root /image/move/BOOT-$xdim-MOVE.jpg
- startkde
+ /etc/X11/Xsession KDE #- call it with KDE parameter to keep background image
sudo killall X
sleep 2
done
); if ((size=res_mkquery(QUERY,dname,class,type,0,0,0,packet,512))<0) { h_errno=NO_RECOVERY; return -1; } { { int i; /* current server */ int j; /* timeout count down */ struct pollfd duh; struct timeval last,now; #ifdef WANT_IPV6_DNS int tmpfd; /* the warning gcc issues here is bogus */ #else duh.fd=__dns_fd; #endif i=0; duh.events=POLLIN; last.tv_sec=0; for (j=120; j>0; --j) { gettimeofday(&now,0); if (now.tv_sec-last.tv_sec>10) { #ifdef WANT_IPV6_DNS struct sockaddr* s=(struct sockaddr*)&(_res.nsaddr_list[i]); if (s->sa_family==AF_INET6) { __dns_make_fd6(); tmpfd=__dns_fd6; } else { __dns_make_fd(); tmpfd=__dns_fd; } duh.fd=tmpfd; if (sendto(tmpfd,packet,size,0,s,sizeof(struct sockaddr_in6))==0) gettimeofday(&last,0); #else if (sendto(__dns_fd,packet,size,0,(struct sockaddr*)&(_res.nsaddr_list[i]),sizeof(struct sockaddr))==0) gettimeofday(&last,0); #endif last=now; } if (++i >= _res.nscount) i=0; if (poll(&duh,1,1000) == 1) { /* read and parse answer */ unsigned char inpkg[1500]; #ifdef WANT_IPV6_DNS int len=read(tmpfd,inpkg,1500); #else int len=read(__dns_fd,inpkg,1500); #endif /* header, question, answer, authority, additional */ if (inpkg[0]!=packet[0] || inpkg[1]!=packet[1]) continue; /* wrong ID */ if ((inpkg[2]&0xf9) != (_res.options&RES_RECURSE?0x81:0x80)) continue; /* not answer */ if ((inpkg[3]&0x0f) != 0) { h_errno=HOST_NOT_FOUND; return -1; } /* error */ if (len>anslen) { h_errno=NO_RECOVERY; return -1; } memmove(answer,inpkg,len); return len; } /*kaputt:*/ } } } h_errno=NO_DATA; return -1; }