Changeset 4adbef9


Ignore:
Timestamp:
07/14/14 09:40:17 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
19bab26, 00ce020
Parents:
b1f38ed (diff), 51d5fd5 (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:
36 added
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • build-files/conf/README

    r7a096e3 r903489b  
    2727List of port build options we use for our Poudriere runs, make changes 
    2828here to adjust package options when using pcbsd-build scripts. 
     29 
     30trueos/ 
     31-------------------- 
     32Sub-directory of the same files, specific to the TrueOS builds 
  • overlays/install-overlay/root/PCBSDStart.sh

    ra97b854 r014de73  
    11#!/bin/sh 
    2 # Copyright 2013 PC-BSD Software 
    3 # http://www.pcbsd.com 
     2# Copyright 2014 PC-BSD Software 
     3# http://www.pcbsd.org 
    44# Author: Kris Moore 
    55########################################################################### 
     
    9393# Check if we should be going to the console instead of X directly 
    9494kenv xconsole 2>/dev/null | grep -q "YES" 
    95 if [ $? -eq 0 ]; then 
     95if [ $? -eq 0 -o -e "/root/trueos-installonly" ]; then 
    9696  /root/PCBSDtext.sh 
    9797  reboot -q 
  • pbi-modules/games/flare/xdg-desktop/flare.desktop

    r9bac9c9 r22c1d14  
    2020GenericName[gl]=Xogo de acción e rol 
    2121GenericName[ja]=Flare (アクションRPG) 
    22 GenericName[pl]=Flare (Action Role-Playing Game) 
     22GenericName[pl]=Flare (fabularna gra akcji - RPG) 
    2323GenericName[pt_BR]=Flare (RPG de ação) 
    2424GenericName[ru]=Flare (рПлевая Огра) 
     
    2929Comment[gl]=Xogo individual de acción e rol cunha vista isométrica en dúas dimensións. 
    3030Comment[ja]=2Dアむ゜メリックビュヌの䞀人甚アクションRPG 
    31 Comment[pl]=A single player, 2D-isometric, action Role-Playing Game 
     31Comment[pl]=Fabularna (RPG) gra akcji dla jednego gracza, izometryczna 2D 
    3232Comment[pt_BR]=Um RPG de ação em 2D isométrico para um jogador 
    3333Comment[ru]=ИзПЌетрОческОй рПлевПй бПевОк Ўля ПЎМПгП ОгрПка 
  • pbi-modules/games/flare/xdg-menu/flare.desktop

    r9bac9c9 r22c1d14  
    4040Comment[gl]=Xogo individual de acci\xc3\xb3n e rol cunha vista isom\xc3\xa9trica 
    4141Comment[ja]=2Dアむ゜メリックビュヌの䞀人甚アクションRPG 
    42 Comment[pl]=A single player, 2D-isometric, action Role-Playing Game 
     42Comment[pl]=Fabularna (RPG) gra akcji dla jednego gracza, izometryczna 2D 
    4343Comment[pt_BR]=Um RPG de ação em 2D isométrico para um jogador 
    4444Comment[ru]=\xd0\x98\xd0\xb7\xd0\xbe\xd0\xbc\xd0\xb5\xd1\x82\xd1\x80\xd0\xb8\xd1 
  • src-qt4/pc-controlpanel/items/system/kde-kcm_polkitactions.desktop

    r0f823c0 r22c1d14  
    133133Comment[nl]=Beleid voor vertrouwde acties in het systeem configureren 
    134134Comment[pa]=àšžàš¿àšžàšŸàš® àšµàš¿à©±àšš àšŸàš°à©±àšžàšŸ àš•à©€àš€à©‡ àšàš•àšžàšŒàšš àš²àšˆ àšžà©°àš°àššàššàšŸ àšªàšŸàš²àšžà©€ 
    135 Comment[pl]=Konfiguruj Działania zaufanych akcji w Systemie 
     135Comment[pl]=Konfiguruj zasady  dla zaufanych akcji w Systemie 
    136136Comment[pt]=Configurar as políticas para as acções fidedignas no sistema 
    137137Comment[pt_BR]=Configurar políticas para ações confiáveis no sistema 
  • src-sh/pbi-manager/pbi-manager

    r37e71e4f r544ed61f  
    573573# Function to create a new jail via warden and setup install into it 
    574574do_pbi_create_new_jail() { 
     575 
     576        local newjname="pbijail-`echo $PBI_ORIGIN | cut -d '/' -f 2`" 
     577 
    575578        # Look for the first available pbijail nickname 
    576579        num=0 
    577580        while : 
    578581        do 
    579                 warden list | grep -q "^pbijail${num}" 
     582                warden list | grep -q "^${newjname}${num}" 
    580583                if [ $? -ne 0 ] ; then break ; fi 
    581584                num=`expr $num + 1` 
    582585        done 
    583586 
    584         warden create pbijail${num} --autoipv4  --startauto --portjail 
     587        warden create ${newjname}${num} --autoipv4  --startauto --portjail 
    585588        if [ $? -ne 0 ] ; then 
    586589                exit_err "Failed creating new jail automatically!" 
    587590        fi 
    588591 
    589         set_jail_mode "pbijail${num}" 
     592        set_jail_mode "${newjname}${num}" 
    590593} 
    591594 
     
    597600        parse_add_pbi_cmdline "$@" 
    598601 
    599         # If this isn't a container request, switch to package mode 
    600602        load_pbi_info_index "$PBI_FILENAME" 
    601603        if [ $? -ne 0 ] ; then 
  • src-qt4/pc-softwaremanager/pbiNgBackend.cpp

    rf3fda6b rb1f38ed  
    266266  //Now emit the signal that items have changed or been added 
    267267  emit LocalPBIChanges(); 
     268} 
     269 
     270void PBIBackend::installAppIntoJail(QString appID){ 
     271  NGApp app; 
     272    if(APPHASH.contains(appID)){ app = APPHASH[appID]; } 
     273    else if(PKGHASH.contains(appID)){ app = PKGHASH[appID]; } 
     274    else{ qDebug() << "Invalid application ID:" << appID; return; } 
     275  if(app.pbiorigin.isEmpty()){ 
     276    qDebug() << "Installing into a new jail only works with PBI's!!"; 
     277    return; 
     278  } 
     279  PENDING << appID+"::::"+"pbi_add -J "+appID+"::::--newjail"; 
     280  //Now check/start the process 
     281  QTimer::singleShot(0,this,SLOT(checkProcesses()) ); 
    268282} 
    269283 
     
    801815   bool injail = !PKGJAIL.isEmpty(); 
    802816   QHash<QString, NGApp> hash; 
    803    if(JAILPKGS.contains(PKGJAIL)){ hash = JAILPKGS[PKGJAIL]; } 
     817   if(JAILPKGS.contains(PKGJAIL) && PKGJAIL!="--newjail"){ hash = JAILPKGS[PKGJAIL]; } 
    804818   else if(APPHASH.contains(PKGRUN)){ hash = APPHASH; } 
    805819   else if(PKGHASH.contains(PKGRUN)){ hash = PKGHASH; } 
     
    807821   bool skip = false; //need to skip this PENDING entry for some reason 
    808822   if( hash.isEmpty() ){ skip = true; qDebug() << PKGRUN+":" << "pkg not on repo";} //invalid pkg on the repo 
    809    else if( PROCTYPE==0 && hash.value(PKGRUN).isInstalled ){ skip = true; qDebug() << PKGRUN+":"  << "already installed"; } //already installed 
     823   else if( PROCTYPE==0 && hash.value(PKGRUN).isInstalled && PKGJAIL!="--newjail"){ skip = true; qDebug() << PKGRUN+":"  << "already installed"; } //already installed 
    810824   else if( PROCTYPE==1 && !hash.value(PKGRUN).isInstalled ){ skip = true; qDebug() << PKGRUN+":"  << "already uninstalled"; } //not installed 
    811825   if(skip){ 
     
    820834   if(PROCTYPE==1 && !injail && PKGCMD.startsWith("pc-pkg ") ){ 
    821835     Extras::getCmdOutput("pbi_icon del-desktop del-menu del-mime "+PKGRUN); //don't care about result 
    822    }else if( PROCTYPE==0 && injail && RUNNINGJAILS.contains(PKGJAIL)){ 
     836   }else if( PROCTYPE==0 && injail && RUNNINGJAILS.contains(PKGJAIL) && PKGJAIL!="--newjail"){ 
    823837     //For installations, make sure the jail pkg config is synced with the current system pkg config 
    824838     qDebug() << "Syncing pkg config in jail:" << PKGJAIL; 
     
    899913    //update the local system info 
    900914    slotSyncToDatabase(true); 
     915  }else if(PKGJAIL=="--newjail"){ 
     916    //Check for the new jail 
     917    checkForJails(); 
    901918  }else{ 
    902     //Just update the pkg list for the jail 
     919    //Just update the pkg list for this particular jail 
    903920    checkForJails(PKGJAIL); 
    904921  } 
     
    935952      //populate the list of base dependencies that cannot be removed 
    936953      BASELIST = listDependencies("misc/pcbsd-base"); 
     954      BASELIST.prepend("misc/pcbsd-base"); 
    937955      BASELIST.removeDuplicates(); 
    938956      firstrun = true; 
  • src-qt4/pc-softwaremanager/pbiNgBackend.h

    r04cd6c8 rb1f38ed  
    6767        void removePBI(QStringList appID, QString injail=""); //start the removal process 
    6868        void installApp(QStringList appID, QString injail=""); //install application from the repo 
     69        void installAppIntoJail(QString appID);                 //install application into a new jail 
    6970        void lockApp(QStringList appID, QString injail="");    //Lock current version of application 
    7071        void unlockApp(QStringList appID, QString injail=""); //unlock an application 
Note: See TracChangeset for help on using the changeset viewer.