Changeset dd823ef


Ignore:
Timestamp:
Oct 31, 2013 9:48:39 AM (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
287fef9
Parents:
4779efc (diff), 4e655ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDMd

    r1691c6a r71d919d  
    4444    (sleep 10 ; $vnccmd >/var/log/vncserver 2>/var/log/vncserver) & 
    4545  fi 
    46  
     46  setenv XAUTHORITY ${PCDMAUTHFILE} 
    4747  xinit /usr/local/bin/PCDM-session --once -- :0 -auth ${PCDMAUTHFILE} $XOPTS 
    4848done 
  • src-qt4/PCDM/src/main.cpp

    r1234f7c r4e655ec  
    173173  if(runonce){ neverquit = FALSE; } 
    174174  qDebug() << " -- PCDM Session Starting..."; 
     175  system("xauth -f "+TMPAUTHFILE.toUtf8()+" generate :0 ."); //Using MIT-MAGIC-COOKIE-1 protocol 
     176  //MIT-MAGIC-COOKIE-1 is good enough for our purposes since it is a single-user graphical system with no XDMCP 
    175177  int sid = -1; 
    176178  int pid = fork(); 
     
    198200  if(QFile::exists("/var/run/nologin")){ neverquit = FALSE; }  
    199201 } 
     202 system("xauth -f "+TMPAUTHFILE.toUtf8()+" remove :0"); 
    200203 return 0; 
    201204} 
  • src-sh/pc-extractoverlay/desktop-overlay/root/.cshrc

    rae23d60 r4779efc  
    1616umask 22 
    1717 
    18 set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) 
     18set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/pbi/bin /usr/local/sbin /usr/local/bin $HOME/bin) 
    1919 
    2020setenv  CLICOLOR true 
     
    3737        set history = 100 
    3838        set savehist = 100 
    39         set autorehash = always 
     39        # Use history to aid expansion 
     40        set autoexpand 
     41        set autorehash 
    4042        set mail = (/var/mail/$USER) 
    4143        if ( $?tcsh ) then 
  • src-sh/pc-extractoverlay/desktop-overlay/root/.profile

    r129cfcd r4779efc  
    77 
    88# remove /usr/games and /usr/X11R6/bin if you want 
    9 PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH 
     9PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/pbi/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH 
    1010 
    1111# Setting TERM is normally done through /etc/ttys.  Do only override 
  • src-sh/pc-extractoverlay/desktop-overlay/root/.xprofile

    r129cfcd r4779efc  
    11# Setup some extra PATH variables 
    2 PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin::$HOME/bin; export PATH 
     2PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/pbi/bin:/usr/local/sbin:/usr/local/bin::$HOME/bin; export PATH 
  • src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/dot.cshrc

    rae23d60 r4779efc  
    1616umask 22 
    1717 
    18 set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) 
     18set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/pbi/bin /usr/local/sbin /usr/local/bin $HOME/bin) 
    1919 
    2020setenv  CLICOLOR true 
     
    3838        set filec 
    3939        set autocorrect 
    40         set autorehash = always 
    4140        set filec 
    4241        set history = 100 
    4342        set savehist = 100 
     43        # Use history to aid expansion 
     44        set autoexpand 
     45        set autorehash 
    4446        set mail = (/var/mail/$USER) 
    4547        if ( $?tcsh ) then 
  • src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/dot.profile

    r129cfcd r4779efc  
    77 
    88# remove /usr/games and /usr/X11R6/bin if you want 
    9 PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:$HOME/bin:/usr/local/sbin:/usr/local/bin; export PATH 
     9PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:$HOME/bin:/usr/pbi/bin:/usr/local/sbin:/usr/local/bin; export PATH 
    1010 
    1111# Setting TERM is normally done through /etc/ttys.  Do only override 
  • src-sh/pc-extractoverlay/server-overlay/root/.cshrc

    r129cfcd r4779efc  
    1616umask 22 
    1717 
    18 set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) 
     18set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/pbi/bin /usr/local/sbin /usr/local/bin $HOME/bin) 
    1919 
    2020setenv  CLICOLOR true 
     
    3737        set history = 100 
    3838        set savehist = 100 
     39        # Use history to aid expansion 
     40        set autoexpand 
     41        set autorehash 
    3942        set mail = (/var/mail/$USER) 
    4043        if ( $?tcsh ) then 
  • src-sh/pc-extractoverlay/server-overlay/root/.profile

    r129cfcd r4779efc  
    77 
    88# remove /usr/games and /usr/X11R6/bin if you want 
    9 PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH 
     9PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/pbi/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH 
    1010 
    1111# Setting TERM is normally done through /etc/ttys.  Do only override 
  • src-sh/pc-extractoverlay/server-overlay/root/.xprofile

    r129cfcd r4779efc  
    11# Setup some extra PATH variables 
    2 PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin::$HOME/bin; export PATH 
     2PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/pbi/bin:/usr/local/sbin:/usr/local/bin::$HOME/bin; export PATH 
  • src-sh/pc-extractoverlay/server-overlay/usr/share/skel/dot.cshrc

    r129cfcd r4779efc  
    1616umask 22 
    1717 
    18 set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) 
     18set path = (/usr/local/share/pcbsd/bin /sbin /bin /usr/sbin /usr/bin /usr/games /usr/pbi/bin /usr/local/sbin /usr/local/bin $HOME/bin) 
    1919 
    2020setenv  CLICOLOR true 
     
    4141        set history = 100 
    4242        set savehist = 100 
     43        # Use history to aid expansion 
     44        set autoexpand 
     45        set autorehash 
    4346        set mail = (/var/mail/$USER) 
    4447        if ( $?tcsh ) then 
  • src-sh/pc-extractoverlay/server-overlay/usr/share/skel/dot.profile

    r129cfcd r4779efc  
    77 
    88# remove /usr/games and /usr/X11R6/bin if you want 
    9 PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:$HOME/bin:/usr/local/sbin:/usr/local/bin; export PATH 
     9PATH=/usr/local/share/pcbsd/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:$HOME/bin:/usr/pbi/bin:/usr/local/sbin:/usr/local/bin; export PATH 
    1010 
    1111# Setting TERM is normally done through /etc/ttys.  Do only override 
Note: See TracChangeset for help on using the changeset viewer.