Changeset 5625306


Ignore:
Timestamp:
06/02/14 01:57:01 (7 months ago)
Author:
Eric Turgeon <ericturgeon.bsd@…>
Parents:
c70cb5f (diff), b115026 (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 b11502682bb06900e3d25bdc7161c920d77a3a6a into c70cb5f86611df9a24c6dd988b16228a343cd20a

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-sysinstall/backend/functions-extractimage.sh

    r3e87404 r7452e18  
    134134      ;; 
    135135    livecd)  
    136       cd / 
    137       find * -print -depth |grep -v uzip | grep -v media/ | grep -v proc/ | grep -v dist |  cpio -pudmv ${FSMNT}  >&1 2>&1 
     136      # Copying file to disk without /usr 
     137      rsync -avzH --exclude 'uzip' --exclude 'media/*' --exclude 'proc/*' --exclude 'mnt/*' --exclude 'tmp/*' --exclude 'dist/*' --exclude 'usr' / ${FSMNT} >&1 2>&1 
     138      if [ "$?" != "0" ] 
     139      then 
     140        exit_err "ERROR: Failed to copy files" 
     141      fi 
     142      # Copying /usr alone to disk 
     143      rsync -avzH /usr ${FSMNT}/ >&1 2>&1 
    138144      if [ "$?" != "0" ] 
    139145      then 
  • src-sh/pc-sysinstall/backend/functions-users.sh

    ra2c78bf rb115026  
    5050      AUTOU="${VAL}" 
    5151      # Adding the auto-login user line 
    52       sed -i "" "/default_user/s/ghostbsd/${AUTOU}/g" ${FSMNT}/usr/local/etc/gdm/custom.conf 
     52      sed -i "" "s/ghostbsd/${AUTOU}/g" ${FSMNT}/usr/local/etc/gdm/custom.conf 
    5353    else 
    5454      # Remmoving the auto-login & ghostbsd user line 
    55       sed -i "" "/AutomaticLoginEnable/s/true/false/g" ${FSMNT}/usr/local/etc/gdm/custom.conf 
    56       ( echo 'g/AutomaticLogin=ghostbsd/d' ; echo 'wq' ) | ex -s ${FSMNT}/etc/rc.conf 
     55      sed -i "" "s/AutomaticLoginEnable=true/AutomaticLoginEnable=false/g" ${FSMNT}/usr/local/etc/gdm/custom.conf 
     56      ( echo 'g/ghostbsd/d' ; echo 'wq' ) | ex -s ${FSMNT}/etc/rc.conf 
    5757    fi 
    5858  fi 
     
    6666 if [ -e "${FSMNT}/.tmpPass" ] 
    6767 then 
     68   # If it is GhostBSD remove the ghostbsd live user. 
     69   if [ "${INSTALLTYPE}" = "GhostBSD" ] 
     70   then 
     71     run_chroot_cmd "pw userdel -n ghostbsd" 
     72     run_chroot_cmd "rm -rf /home/ghostbsd" 
     73   fi 
    6874   # Add a user with a supplied password 
    6975   run_chroot_cmd "cat /.tmpPass | pw useradd ${ARGS}" 
    7076   rc_halt "rm ${FSMNT}/.tmpPass" 
    7177 else 
     78   # If it is GhostBSD remove the ghostbsd live user. 
     79   if [ "${INSTALLTYPE}" = "GhostBSD" ] 
     80   then 
     81     run_chroot_cmd "pw userdel -n ghostbsd" 
     82     run_chroot_cmd "rm -rf /home/ghostbsd" 
     83   fi 
    7284   # Add a user with no password 
    7385   run_chroot_cmd "cat /.tmpPass | pw useradd ${ARGS}" 
     
    198210 
    199211  done <${CFGF} 
    200  
    201 # If it is GhostBSD remove the ghostbsd live user. 
    202   if [ "${INSTALLTYPE}" = "GhostBSD" ] 
    203   then 
    204     rc_halt "pw userdel -n ghostbsd -r" 
    205   fi 
    206212   
    207213  # Check if we need to enable a user to auto-login to the desktop 
  • src-qt4/pc-controlpanel/backend/cp-item.cpp

    r9c68f8a rc70cb5f  
    2828#include "misc.h" 
    2929 
     30#include <unistd.h> 
     31 
    3032#include <QSettings> 
    3133#include <QLocale> 
     
    195197        return false; 
    196198 
     199    mExecPath= Reader.value("Path").toString(); 
     200 
    197201    //---------------- Get icon 
    198202    mIconFile=  Reader.value("Icon").toString(); 
     
    328332 
    329333/////////////////////////////////////////////////////////////////////////////// 
    330 void CControlPanelItem::launch() 
     334void CControlPanelItem::launch(bool useInternalLaunch) 
    331335{ 
    332336    if (mMsgBoxText.length()) 
     
    341345    } 
    342346    QProcess proc; 
    343     proc.startDetached("xdg-open",QStringList()<<mFile); 
     347 
     348    if (!useInternalLaunch) 
     349    { 
     350        proc.startDetached("xdg-open",QStringList()<<mFile); 
     351    } 
     352    else 
     353    { 
     354        pid_t RetVal = fork(); 
     355        if (!RetVal) 
     356        { 
     357            if (mExecPath.length()) 
     358            { 
     359                chdir(qPrintable(mExecPath)); 
     360            } 
     361            QString Str = mExecCommand; 
     362            Str.replace("%i", QString(" --icon ") + mIconFile); 
     363            Str.replace("%c", QString("\"") + displayName().toLocal8Bit() + QString("\"")); 
     364            Str.replace("%k", mFile); 
     365            Str.replace("%f",""); 
     366            Str.replace("%F",""); 
     367            Str.replace("%u",""); 
     368            Str.replace("%U",""); 
     369            exit (system(Str.toLatin1())); 
     370         } 
     371    }//if internal launch 
     372 
     373     
    344374} 
    345375 
  • src-qt4/pc-controlpanel/backend/cp-item.h

    r9c68f8a rc70cb5f  
    4040 
    4141    bool read(QString file, bool skipRootAccess= false); 
    42     void launch(); 
     42    void launch(bool useInternalLaunch=false); 
    4343 
    4444    QString file()       {return mFile;}; 
     
    7272    QString mDisplayComment; 
    7373    QString mExecCommand; 
     74    QString mExecPath; 
    7475    bool    misRootRequired; 
    7576    bool    misSudo; 
  • src-qt4/pc-controlpanel/mainwindow.cpp

    r22470d5 rc70cb5f  
    617617    CControlPanelItem* backend_item = (CControlPanelItem*)(item->data(Qt::UserRole).value<CControlPanelItem*>()); 
    618618    if (backend_item) 
    619         backend_item->launch(); 
     619        backend_item->launch( !(pcbsd::Utils::currentDesktop().isXDG) ); 
    620620} 
    621621 
Note: See TracChangeset for help on using the changeset viewer.