Changeset c2b5aad


Ignore:
Timestamp:
02/28/14 12:58:11 (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
4f9718b
Parents:
0130b27
Message:

Fix a bug in warden doing pkgng bootstrap. Now use the jails "freebsd-version" command
to figure out which release we are boot-strapping for. This means it will only
boot strap on 10.0 and later, but that is the only real repos we have active anyway.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r58035e0 rc2b5aad  
    12771277src-qt4/pc-mounttray/i18n/MountTray_zh_TW.qm 
    12781278src-qt4/pc-mounttray/i18n/MountTray_zu.qm 
     1279src-qt4/life-preserver/lp-tray/Makefile 
     1280src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_af.qm 
     1281src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ar.qm 
     1282src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_az.qm 
     1283src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bg.qm 
     1284src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bn.qm 
     1285src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bs.qm 
     1286src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ca.qm 
     1287src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_cs.qm 
     1288src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_cy.qm 
     1289src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_da.qm 
     1290src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_de.qm 
     1291src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_el.qm 
     1292src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_GB.qm 
     1293src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_US.qm 
     1294src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_ZA.qm 
     1295src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_es.qm 
     1296src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_et.qm 
     1297src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_eu.qm 
     1298src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fa.qm 
     1299src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fi.qm 
     1300src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fr.qm 
     1301src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fr_CA.qm 
     1302src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fur.qm 
     1303src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_gl.qm 
     1304src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_he.qm 
     1305src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hi.qm 
     1306src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hr.qm 
     1307src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hu.qm 
     1308src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_id.qm 
     1309src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_is.qm 
     1310src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_it.qm 
     1311src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ja.qm 
     1312src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ka.qm 
     1313src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ko.qm 
     1314src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_lt.qm 
     1315src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_lv.qm 
     1316src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mk.qm 
     1317src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mn.qm 
     1318src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ms.qm 
     1319src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mt.qm 
     1320src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_nb.qm 
     1321src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ne.qm 
     1322src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_nl.qm 
     1323src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pa.qm 
     1324src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pl.qm 
     1325src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pt.qm 
     1326src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pt_BR.qm 
     1327src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ro.qm 
     1328src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ru.qm 
     1329src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sa.qm 
     1330src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sk.qm 
     1331src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sl.qm 
     1332src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sr.qm 
     1333src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sv.qm 
     1334src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sw.qm 
     1335src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ta.qm 
     1336src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_tg.qm 
     1337src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_th.qm 
     1338src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_tr.qm 
     1339src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_uk.qm 
     1340src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_uz.qm 
     1341src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_vi.qm 
     1342src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_CN.qm 
     1343src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_HK.qm 
     1344src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_TW.qm 
     1345src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zu.qm 
     1346src-qt4/life-preserver/lp-tray/life-preserver-tray 
     1347src-sh/lpreserver/install 
     1348src-sh/pbi-manager/pbifs/pbifs 
  • src-sh/warden/scripts/backend/functions.sh

    r13a6b08 rc2b5aad  
    791791  local outfile="${2}" 
    792792 
    793   local release="$(uname -r | cut -d '-' -f 1-2)" 
     793  if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then 
     794     echo "Missing /bin/freebsd-version in jail.." 
     795     echo "PKG bootstrap can only be done on 10.0 and higher, skipping..." 
     796     return 1 
     797  fi 
     798 
     799  local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`" 
    794800  local arch="$(uname -m)" 
    795801 
     
    838844  local outfile="${2}" 
    839845 
    840   local release="$(uname -r | cut -d '-' -f 1-2)" 
     846  if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then 
     847     echo "Missing /bin/freebsd-version in jail.." 
     848     echo "PKG bootstrap can only be done on 10.0 and higher, skipping..." 
     849     return 0 
     850  fi 
     851 
     852  local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`" 
    841853  local arch="$(uname -m)" 
    842854 
     
    911923    jailtype="standard" 
    912924  fi 
    913   local release="$(uname -r | cut -d '-' -f 1-2)" 
     925 
     926  if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then 
     927     echo "Missing /bin/freebsd-version in jail.." 
     928     echo "PKG bootstrap can only be done on 10.0 and higher, skipping..." 
     929     return 1 
     930  fi 
     931 
     932  local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`" 
    914933  local arch="$(uname -m)" 
    915934 
     
    923942 
    924943  mkdir -p ${jaildir}/usr/local/etc 
    925   pubcert="/usr/local/etc/pkg-pubkey.cert" 
    926  
    927   cp "${pubcert}" ${jaildir}/usr/local/etc 
    928   install_pc_extractoverlay "${jaildir}" 
     944 
    929945 
    930946  ${ffunc} "${jaildir}" "${jaildir}/bootstrap-pkgng" 
Note: See TracChangeset for help on using the changeset viewer.