Changeset b7e7efd


Ignore:
Timestamp:
04/25/14 06:25:08 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
eaea8ff
Parents:
12b4844 (diff), 0192545 (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
  • lumina/lumina-desktop/Globals.h

    r214f3d5 rec454bd  
    1919public: 
    2020        //Current Username 
    21         static QString user(){ return QString(getlogin()); } 
     21        static QString user(){ return QString::fromLocal8Bit(getlogin()); } 
    2222        //Current Hostname 
    2323        static QString hostname(){  
    24           char name[50]; 
    25           gethostname(name,sizeof(name)); 
    26           return QString(name); 
     24          char name[BUFSIZ]; 
     25          int count = gethostname(name,sizeof(name)); 
     26          if (count < 0) { 
     27            return QString::null; 
     28          } 
     29          return QString::fromLocal8Bit(name,count); 
    2730        } 
    2831        //Shutdown the system 
  • src-sh/pc-extractoverlay/pc-extractoverlay

    raac9523 r12b4844  
    1111case $PACKAGE_SET in 
    1212   PRODUCTION|EDGE) ;; 
     13  CUSTOM) # Using a custom package set? 
     14          # Lets check that we have a URL provided 
     15          _urlChk="`sed -n 's/PACKAGE_URL: //p' ${PCBSD_ETCCONF} 2>/dev/null | awk '{print $1}'`" 
     16          if [ -z "${_urlChk}" ] ; then 
     17             echo "Warning: PACKAGE_SET is CUSTOM, but no PACKAGE_URL set!" 
     18             echo "Reverting back to PRODUCTION repo..." 
     19             sleep 3 
     20             CUSTOM_URL="" 
     21             PACKAGE_SET="PRODUCTION" 
     22          else 
     23             CUSTOM_URL="$_urlChk" 
     24          fi 
     25          ;; 
    1326       *) echo "Warning: Invalid PACKAGE_SET!"  
    1427          PACKAGE_SET="PRODUCTION" ;;  
     
    5063  echo -e "Extracting ports overlay data...\c" 
    5164  cd / 
    52   tar xvmf ${distFile} 2>/dev/null 
     65  tar xvm --no-same-owner -f ${distFile} 2>/dev/null 
    5366  if [ $? -eq 0 ] ; then 
    5467    echo -e "DONE" 
     
    7184  echo -e "Extracting desktop overlay data...\c" 
    7285  cd / 
    73   tar xvmf ${distFile} ${excludeOpt} 2>/dev/null 
     86  tar xvm --no-same-owner -f ${distFile} ${excludeOpt} 2>/dev/null 
    7487  if [ $? -eq 0 ] ; then 
    7588    echo -e "DONE" 
     
    96109  echo -e "Extracting server overlay data...\c" 
    97110  cd / 
    98   tar xvmf ${distFile} ${excludeOpt} 2>/dev/null 
     111  tar xvm --no-same-owner -f ${distFile} ${excludeOpt} 2>/dev/null 
    99112  if [ $? -eq 0 ] ; then 
    100113    echo -e "DONE" 
     
    144157  esac 
    145158 
    146   # Setup new pcbsd.conf repo file 
    147   cat /usr/local/etc/pkg/repos/pcbsd.conf.dist \ 
     159  if [ "$PACKAGE_SET" = "CUSTOM" ] ; then 
     160     # Setup the custom pcbsd.conf repo 
     161     cat << EOF >/usr/local/etc/pkg/repos/pcbsd.conf 
     162pcbsd: { 
     163               url: "$CUSTOM_URL", 
     164               signature_type: "fingerprints", 
     165               fingerprints: "/usr/local/etc/pkg/fingerprints/pcbsd", 
     166               enabled: true 
     167              } 
     168EOF 
     169  else 
     170     # Using PC-BSD CDN 
     171     cat /usr/local/etc/pkg/repos/pcbsd.conf.dist \ 
    148172        | sed "s|VERSION|$FBSDVER|g" \ 
    149173        | sed "s|ARCH|$ARCH|g" > /usr/local/etc/pkg/repos/pcbsd.conf 
     174  fi 
    150175} 
    151176 
Note: See TracChangeset for help on using the changeset viewer.