Changeset 9eeeabd


Ignore:
Timestamp:
07/17/13 06:51:32 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
e49ab68
Parents:
e949bab (diff), db74f56 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/virtualbox.desktop

    rd483bc2 rdb74f56  
    22Encoding=UTF-8 
    33Version=1.0 
    4 Name=Oracle VM VirtualBox 
    5 GenericName=Virtual Machine 
    64Type=Application 
    75Exec=pc-su VirtualBox 
     
    97Icon=VBox 
    108Categories=Emulator;System; 
     9Name=Oracle VM VirtualBox 
     10Name[fr]=Oracle VM VirtualBox 
     11Name[fr_CA]=Oracle VM VirtualBox 
     12GenericName=Virtual Machine 
     13GenericName[fr]=Machine Virtuelle 
     14GenericName[fr_CA]=Machine Virtuelle 
    1115Comment=Run several virtual systems on a single host computer 
    1216Comment[de]=Windows und andere Betriebssysteme unter FreeBSD ausfÃŒhren 
     17Comment[fr]=Exécuter plusieurs systÚmes virtuels sur un seul ordinateur hÃŽte 
     18Comment[fr_CA]=Exécuter plusieurs systÚmes virtuels sur un seul ordinateur hÃŽte 
    1319Comment[it]=Esegui più macchine virtuali su un singolo computer 
     20Comment[ko]=가상 ëšžì‹  
    1421Comment[pl]=Uruchamianie wielu systemów wirtualnych na jednym komputerze gospodarza 
    1522Comment[sv]=Kör flera virtuella system pÃ¥ en enda vÀrddator 
    16 Comment[ko]=가상 ëšžì‹  
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r820babc re949bab  
    77 
    88#include <sys/types.h> 
     9#include <sys/wait.h> 
    910#include <unistd.h> 
    1011#include <pwd.h> 
     
    176177  //Save the current user/desktop as the last login 
    177178  Backend::saveLoginInfo(Backend::getDisplayNameFromUsername(xuser),xde); 
     179 
     180  // We will now fork off, so the child can drop root perms and do its thing 
     181  int pid = fork(); 
     182  if(pid < 0){ 
     183    Backend::log("Error: Could not fork for user permissions"); 
     184    return; 
     185  }else if( pid !=0 ){ 
     186    //Parent (calling) process 
     187    int status; 
     188    sleep(2); 
     189    waitpid(pid,&status,0); //wait for the child (session) to finish 
     190 
     191    // Child is all done, lets close down the pam session and cleanup 
     192    pam_shutdown(); 
     193    exit(0); 
     194  } 
    178195   
    179196  // Get the users uid/gid information 
     
    243260    
    244261  //Now start the process 
    245   qDebug() << "Start the desktop"; 
    246262  system(cmd.toLatin1()); 
    247   pam_close_session(pamh, 0); 
    248   pam_end(pamh, PAM_SUCCESS); 
    249263} 
    250264 
Note: See TracChangeset for help on using the changeset viewer.