Changeset 6927a85


Ignore:
Timestamp:
01/05/15 04:58:33 (6 months ago)
Author:
Eric Turgeon <ericturgeon.bsd@…>
Parents:
4c601f1 (diff), 5635cdb (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 5635cdbbe9e402228e9ca0dc186b87920476cf08 into 4c601f1e6b124c84c437d7689ed38e66327d2b17

Location:
src-sh
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pcbsd-utils/pc-sysinstall/backend/functions-users.sh

    rea12c5c r5635cdb  
    5050      AUTOU="${VAL}" 
    5151      # Adding the auto-login user line 
    52       sed -i "" "s/ghostbsd/${AUTOU}/g" ${FSMNT}/usr/local/etc/gdm/custom.conf 
     52      sed -i "" "s/ghostbsd/${AUTOU}/g" ${FSMNT}/usr/local/share/PCDM/pcdm.conf 
    5353    else 
    5454      # Remmoving the auto-login & ghostbsd user line 
    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 
     55      sed -i "" "s/ENABLE_AUTO_LOGIN=TRUE/ENABLE_AUTO_LOGIN=FALSE/g" ${FSMNT}/usr/local/share/PCDM/pcdm.conf 
     56      sed -i "" "s/ghostbsd/no-username/g" ${FSMNT}/usr/local/share/PCDM/pcdm.conf 
    5757    fi 
    5858  fi 
  • src-sh/syscache/daemon/syscache-daemon.cpp

    r6725dfa rf47654d  
    77    connect(server, SIGNAL(newConnection()), this, SLOT(checkForConnections())); 
    88  DATA = new DB(this); 
    9     QTimer::singleShot(60000, DATA, SLOT(startSync()) ); //wait one minute to start the initial sync 
     9    QTimer::singleShot(300000, DATA, SLOT(startSync()) ); //wait five minutes to start the initial sync 
    1010} 
    1111 
Note: See TracChangeset for help on using the changeset viewer.