Changeset 9cc4a77


Ignore:
Timestamp:
11/09/13 16:29:45 (18 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
d540652
Parents:
93a6564 (diff), 7374c7b (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 remote-tracking branch 'upstream/master'

Files:
28 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-firstbootgui/firstboot.cpp

    rda0f8902 r57e8c23  
    461461 
    462462  // Enable Flash for the new user 
    463   QProcess::execute("su", QStringList() << "-m" << lineUsername->text() << "-c" << "/usr/local/bin/flashpluginctl on" ); 
     463  QProcess::execute("su", QStringList() << lineUsername->text() << "-c" << "/usr/local/bin/flashpluginctl on" ); 
    464464   
    465465  // Encrypt the users home-directory? 
  • src-qt4/pc-usermanager/usermanagerback.cpp

    r83428f0 r7374c7b  
    456456                if ( chroot.isEmpty() ) { 
    457457                   qDebug() << "Enabling Flash Plugin for " << userIt->getUsername(); 
    458                    QString flashCmd = "su -m " + userIt->getUsername() + " -c \"flashpluginctl on\""; 
     458                   QString flashCmd = "su " + userIt->getUsername() + " -c \"flashpluginctl on\""; 
    459459                   system(flashCmd.toLatin1()); 
    460460                } 
Note: See TracChangeset for help on using the changeset viewer.