~ubuntu-branches/ubuntu/raring/ltspfs/raring-proposed

« back to all changes in this revision

Viewing changes to scripts/xinitrc.d/I10-delayedmounter

  • Committer: Bazaar Package Importer
  • Author(s): Vagrant Cascadian
  • Date: 2009-07-17 12:10:56 UTC
  • mfrom: (4.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090717121056-bfeil0wm4jz3lmhh
Tags: 0.5.13-1
* new upstream version:
  - fixes to local mounts
    + find ldm's Xauthority in /var/run.
    + support ldm Xauthority in a sub-dir.
    + mount in /media/root if local mounting is configured.
    + only run mount for localapps if user's home dir is mounted via sshfs.
    + drop delayedmounter from xinitrc.d, as udev scripts should be
      sufficient now.
    + relocate delayed-mounter ldm hooks so they run after the user is added
      to /etc/passwd, and before the user is removed from /etc/passwd.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Run delayed-mounter if LOCALDEV is enabled (ie /var/run/ltspfs_fstab exists)
2
 
#
3
 
# This is delayed mounter for non-ldm sessions
4
 
#
5
 
if [ -f /var/run/ltspfs_fstab ] && [ -x /usr/sbin/ltspfsmounter ]; then
6
 
    # COMMAND will be exported by xinitrc, but in case xinitrc is an
7
 
    # older version, let's look at screens 1 and 7 for ldm*
8
 
    [ -z "$COMMAND" ] && COMMAND="${SCREEN_01}${SCREEN_07}"
9
 
    case "$COMMAND" in 
10
 
        ldm*) ;;
11
 
        *)
12
 
            # Delayed-mounter
13
 
            unset SSH_CONNECTION
14
 
            [ -z "$USER" ] && USER=root
15
 
            export USER
16
 
            /usr/sbin/ltspfsmounter all cleanup 
17
 
        
18
 
            while read DEV DIR TYPE OPTIONS DUMP PASS; do
19
 
                /usr/sbin/ltspfsmounter ${DIR} add
20
 
            done < /var/run/ltspfs_fstab
21
 
        ;;
22
 
    esac
23
 
fi
24