← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ltsp/gutsy-security

« back to all changes in this revision

Viewing changes to client/ltsp_config

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert, Oliver Grawert, Scott Balneaves
  • Date: 2007-09-13 16:10:50 UTC
  • Revision ID: james.westby@ubuntu.com-20070913161050-tsrmnr8ax9nuhnpb
Tags: 5.0.29
https://launchpad.net/bugs/139059
[Oliver Grawert <ogra@ubuntu.com>]
* fix setting of SERVER with nbd roots, closes LP: #139059
* remove screensaver handling from ldm, gnome-screensaver konws what to do
  now

[Scott Balneaves <sbalneav@ltsp.org>]
* enable compiz by default (leave it to Xsession on the server to decide)

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/ltsp_config
14
14
 
15
15
# Ensure a default for SERVER
16
16
if [ -z "$SERVER" -o "$SERVER" = "auto" ]; then
17
 
    nfs_server=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
18
 
    SERVER="${nfs_server:-192.168.0.254}"
 
17
    nbd_pid=$(pgrep -f $(cat /proc/mounts|grep /rofs|grep nbd|cut -d" " -f1) 2>/dev/null)
 
18
 
 
19
    if [ -n "$nbd_pid" ]; then
 
20
        nbd_command=$(ps -o cmd $nbd_pid|grep -v CMD)
 
21
        server=$(echo $nbd_command|sed 's/[a-z\-]*. //'|sed 's/ .*//')
 
22
    else
 
23
        server=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
 
24
    fi
 
25
 
 
26
    SERVER="${server:-192.168.0.254}"
19
27
    export SERVER
20
28
fi
21
29