Changeset 408039b


Ignore:
Timestamp:
Aug 26, 2013 8:38:12 AM (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
22f21be
Parents:
52fa6eb (diff), 7ae348f (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:
8 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    ra5d7e1d r449dfba  
    3232# Enable VIMAGE for virtualbox 
    3333virtualbox-ose-kmod_SET=VIMAGE 
     34 
     35# VirtualBox Options 
     36virtualbox_SET=VNC WEBSERVICE VDE 
    3437 
    3538# Set some k3b options 
     
    9396php5_SET=APACHE 
    9497 
    95 virtualbox_SET=VNC WEBSERVICE 
    96  
    9798# Options requested by FreeNAS 
    9899nginx_SET=HTTP_FLV HTTP_SSL PASSENGER 
  • src-qt4/pc-installgui/scripts/get-zfs-restore-list.sh

    r93572be r7ae348f  
    2121cd /root 
    2222 
    23 ssh ${SSHKEY} -p $SSHPORT -o PasswordAuthentication=no -o NumberOfPasswordPrompts=0 $SSHUSER@$SSHHOST 'ls .lp-props* 2>/dev/null' 2>/dev/null 
     23ssh ${SSHKEY} -p $SSHPORT -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o NumberOfPasswordPrompts=0 $SSHUSER@$SSHHOST 'ls .lp-props* 2>/dev/null' 2>/dev/null 
    2424exit $? 
  • src-qt4/pc-sounddetect/rc.d/pc-sounddetect

    r1620346 rb43f017  
    88 
    99name="snddetect" 
    10 rcvar=`set_rcvar` 
     10rcvar=snddetect_enable 
    1111 
    1212stop_cmd="snddetect_stop" 
  • src-sh/pc-sysinstall/examples/README

    r9caf430 r6963fbe  
    1313a hostname such as freebsd-XXXX or pcbsd-XXXX 
    1414 
    15 # installMode=(fresh/upgrade/extract) 
     15# installMode=(fresh/upgrade/extract/zfsrestore) 
    1616 
    1717Set the type of install we are doing. 
     
    3333for file extraction. When using the "extract" option, /etc/fstab 
    3434on the installed system will *not* be automatically configured.  
     35 
     36'zfsrestore' will use zfs send / recv to replicate a remote ZFS 
     37dataset to your local install. It requires several other flags 
     38documented below in the ZFS RESTORE section.  
    3539 
    3640# installLocation= 
     
    294298The specified components to install, view available with "./pc-sysinstall list-components" 
    295299 
     300# installPackages=xorg cabextract 
     301 
     302List of packages to install, can be either pkgng or old style packages 
     303 
     304# pkgExt=.txz 
     305 
     306Set the file-extension uses for packages, usually .txz or .tbz 
    296307 
    297308######################################################################## 
     
    401412automatically without entering a password 
    402413 
    403 $FreeBSD: head/usr.sbin/pc-sysinstall/examples/README 247705 2013-03-03 09:47:47Z jpaetzel $ 
     414######################################################################## 
     415# ZFS RESTORE 
     416######################################################################## 
     417 
     418When setting installMode=zfsrestore, the following options are also required 
     419 
     420# sshHost=mybackupserver 
     421 
     422Hostname or IP address of the machine to pull data via SSH from 
     423 
     424# sshPort=22 
     425 
     426Port to use for SSH 
     427 
     428# sshUser=kdeskbackup 
     429 
     430Username to log into SSH with 
     431 
     432# sshKey=/root/id_rsa 
     433 
     434SSH key file to use with auth into the remote server 
     435 
     436# zfsProps=.lp-props-tank1#backups#krisbackup 
     437 
     438Location of dataset properties file, usually created by "Life-Preserver" during replication 
     439 
     440# zfsRemoteDataset=tank1/backups/krisbackup 
     441 
     442Location of remote dataset we will be restoring from 
     443 
  • src-sh/pc-thinclient/pc-thinclient

    rec35fb2b rb5e5e3e  
    306306 
    307307        # Start by adding pcbsd-utils 
    308         pkg -c ${PXEWORLD} install -y pcbsd-utils 
     308        rc_halt "pkg -c ${PXEWORLD} install -y pcbsd-utils" 
    309309         
    310310        # Remove old pc-sysinstall so we use new one in /usr/local/sbin 
     
    317317 
    318318        # Install Xorg 
    319         pkg -c ${PXEWORLD} install -y xorg 
     319        rc_halt "pkg -c ${PXEWORLD} install -y xorg" 
    320320 
    321321        # Need to install / use GDM on the base system 
    322322        if [ ! -e "/usr/local/sbin/gdm" ] ; then 
    323                 pkg install -y gdm 
     323                rc_halt "pkg install -y gdm" 
    324324        fi 
    325325 
     
    395395 
    396396        echo "Installing $DHCPPORT" 
    397         pkg install -y ${DHCPPORT} 
    398         if [ "$?" != "0" ] ; then exit_err "Failed installing ${DHCPPORT}"; fi 
     397        rc_halt "pkg install -y ${DHCPPORT}" 
    399398} 
    400399 
  • src-sh/warden/scripts/rc.d/wardenrc

    r1620346 rb43f017  
    88 
    99name="warden" 
    10 rcvar=`set_rcvar` 
     10rcvar="warden_enable" 
    1111 
    1212stop_cmd="warden_stop" 
  • src-qt4/pc-softwaremanager/processManager.cpp

    r31283ea r52fa6eb  
    8484    qDebug() << "Removal Process Started:" << cmd; 
    8585    remLog.clear(); 
     86    if( cmd.contains("pbi_delete") ){ remStrictErrChecking = true; } 
     87    else{ remStrictErrChecking=false; } 
    8688    remProc->start(cmd);                   
    8789  }else if( ID == DOWNLOAD ){ 
     
    233235 
    234236void ProcessManager::slotRemProcFinished(){ 
    235   if(remProc->exitStatus() != QProcess::NormalExit || remProc->exitCode() != 0){ 
     237  if(remProc->exitStatus() != QProcess::NormalExit || (remProc->exitCode() != 0 && remStrictErrChecking) ){ 
    236238    qDebug() << "Removal Process Error Log:\n"<<remLog.join("\n"); 
    237239    emit ProcessError(REMOVE, remLog); 
  • src-qt4/pc-softwaremanager/processManager.h

    r74c359f r52fa6eb  
    3434        QProcess *upProc, *remProc, *dlProc, *inProc, *otProc; 
    3535        QStringList upLog, remLog, dlLog, inLog; 
     36        bool remStrictErrChecking; 
    3637 
    3738private slots: 
Note: See TracChangeset for help on using the changeset viewer.