Changeset 1558ce6


Ignore:
Timestamp:
01/08/14 10:41:04 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
9ee0290, d2cbe8c, d9e7564
Parents:
4eecf13 (diff), 544e6570 (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:
6 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbime/pbime.c

    ra7429d5 r544e6570  
    154154 
    155155                // Backwards compat check for old PBIs 
    156                 argoffset=4; 
    157                 if (chdir(argv[4]) == -1 ) { 
     156                argoffset=5; 
     157                if ( (argc > 5) && (strcmp(argv[5], "args") == 0) ) 
     158                { 
     159                        chdir(argv[4]); 
     160                } else { 
    158161                        // Running with old pbi wrapper 
    159162                        argoffset=3; 
    160                 } 
     163                } 
    161164 
    162165 
  • src-sh/pbi-manager/wrapper/main.c

    r8188062 r544e6570  
    2424    char pbime[MAX_SIZE]; 
    2525    char pbicwd[MAXPATHLEN]; 
     26    char argsflag[16]; 
    2627 
    2728    // Setup working variables 
     
    126127    strcpy(pbime, "/usr/pbi/.pbime"); 
    127128 
     129    // Setup the args flag 
     130    strcpy(argsflag, "args"); 
     131 
    128132    // Build new target argv 
    129133    char *targv[argc+5]; 
     
    133137    targv[3] = newtarget; 
    134138    targv[4] = getwd(pbicwd); 
    135     int i=5; 
     139    targv[5] = argsflag; 
     140    int i=6; 
    136141    int j=1; 
    137142    while(j < argc){ 
     
    147152    //printf( "Arg: %s \n", targv[3]); 
    148153    //printf( "Arg: %s \n", targv[4]); 
     154    //printf( "Arg: %s \n", targv[5]); 
    149155 
    150156    return execv(pbime, targv); 
  • src-sh/pc-sysinstall/backend/functions-zfsrestore.sh

    rbec1293 r35000f6  
    8686 
    8787  # First lets fetch the ZFS properties backup 
    88   ssh -p ${SSHPORT} ${SSHKEY} ${SSHUSER}@${SSHHOST} cat ${ZFSPROPS} > ${ZPFILE} 
     88  echo "ssh -p ${SSHPORT} ${SSHKEY} ${SSHUSER}@${SSHHOST} \"cat '$ZFSPROPS'\" > ${ZPFILE}" > ${TMPDIR}/.fetchProp 
     89  sh ${TMPDIR}/.fetchProp 
    8990  if [ $? -ne 0 ] ; then 
     91     rm ${TMPDIR}/.fetchProp 
    9092     exit_err "Unable to get ZFS properties file!" 
    9193  fi 
     94  rm ${TMPDIR}/.fetchProp 
    9295 
    9396  get_value_from_cfg zfsRemoteDataset 
  • src-qt4/PCDM/src/dialogKeyboard.cpp

    ra982a19 r4eecf13  
    3232{ 
    3333  slotUpdateKbOnSys(); 
     34  this->close(); 
    3435} 
    3536 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    ra7474ab r4eecf13  
    170170 
    171171// Function which lets us run setxkbmap 
    172 void Backend::changeKbMap(QString model, QString layout, QString variant) 
     172bool Backend::changeKbMap(QString model, QString layout, QString variant) 
    173173{ 
    174174   QProcess kbp; 
     175        kbp.setProcessChannelMode(QProcess::MergedChannels); 
    175176   QStringList args; 
    176177   QString prog; 
     
    182183   kbp.start(prog, args); 
    183184   kbp.waitForFinished(); 
     185   bool ok = (kbp.exitCode() == 0); 
     186   if(!ok){ 
     187     qDebug() << "Change KB Map Failed: "<<prog+" "+args.join(" "); 
     188     qDebug() << kbp.readAllStandardOutput(); 
     189   } 
     190   return ok; 
    184191} 
    185192 
  • src-qt4/PCDM/src/pcdm-backend.h

    ra982a19 r4eecf13  
    4040    static QStringList keyLayouts(); 
    4141    static QStringList keyVariants(const QString &layout, QStringList &savedKeyVariants); 
    42     static void changeKbMap(QString model, QString layout, QString variant); 
     42    static bool changeKbMap(QString model, QString layout, QString variant); 
    4343    static QStringList languages(); 
    4444    static void openLogFile(QString); 
Note: See TracChangeset for help on using the changeset viewer.