Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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.
  • Loading branch information...
commit c2b5aad0887d5ebd7c0835a6d9aeb786f2557b38 1 parent 0130b27
@kmoore134 kmoore134 authored
Showing with 92 additions and 6 deletions.
  1. +70 −0 .gitignore
  2. +22 −6 src-sh/warden/scripts/backend/functions.sh
View
70 .gitignore
@@ -1276,3 +1276,73 @@ src-qt4/pc-mounttray/i18n/MountTray_zh_CN.qm
src-qt4/pc-mounttray/i18n/MountTray_zh_HK.qm
src-qt4/pc-mounttray/i18n/MountTray_zh_TW.qm
src-qt4/pc-mounttray/i18n/MountTray_zu.qm
+src-qt4/life-preserver/lp-tray/Makefile
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_af.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ar.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_az.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bg.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bn.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bs.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ca.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_cs.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_cy.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_da.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_de.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_el.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_GB.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_US.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_ZA.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_es.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_et.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_eu.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fa.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fi.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fr.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fr_CA.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fur.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_gl.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_he.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hi.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hr.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hu.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_id.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_is.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_it.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ja.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ka.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ko.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_lt.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_lv.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mk.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mn.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ms.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mt.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_nb.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ne.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_nl.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pa.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pl.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pt.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pt_BR.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ro.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ru.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sa.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sk.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sl.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sr.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sv.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sw.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ta.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_tg.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_th.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_tr.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_uk.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_uz.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_vi.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_CN.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_HK.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_TW.qm
+src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zu.qm
+src-qt4/life-preserver/lp-tray/life-preserver-tray
+src-sh/lpreserver/install
+src-sh/pbi-manager/pbifs/pbifs
View
28 src-sh/warden/scripts/backend/functions.sh
@@ -790,7 +790,13 @@ make_bootstrap_pkgng_file_standard()
local jaildir="${1}"
local outfile="${2}"
- local release="$(uname -r | cut -d '-' -f 1-2)"
+ if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then
+ echo "Missing /bin/freebsd-version in jail.."
+ echo "PKG bootstrap can only be done on 10.0 and higher, skipping..."
+ return 1
+ fi
+
+ local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`"
local arch="$(uname -m)"
cat<<__EOF__>"${outfile}"
@@ -837,7 +843,13 @@ make_bootstrap_pkgng_file_pluginjail()
local jaildir="${1}"
local outfile="${2}"
- local release="$(uname -r | cut -d '-' -f 1-2)"
+ if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then
+ echo "Missing /bin/freebsd-version in jail.."
+ echo "PKG bootstrap can only be done on 10.0 and higher, skipping..."
+ return 0
+ fi
+
+ local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`"
local arch="$(uname -m)"
get_mirror
@@ -910,7 +922,14 @@ bootstrap_pkgng()
if [ -z "${jailtype}" ] ; then
jailtype="standard"
fi
- local release="$(uname -r | cut -d '-' -f 1-2)"
+
+ if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then
+ echo "Missing /bin/freebsd-version in jail.."
+ echo "PKG bootstrap can only be done on 10.0 and higher, skipping..."
+ return 1
+ fi
+
+ local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`"
local arch="$(uname -m)"
local ffunc="make_bootstrap_pkgng_file_standard"
@@ -922,10 +941,7 @@ bootstrap_pkgng()
echo "Boot-strapping pkgng"
mkdir -p ${jaildir}/usr/local/etc
- pubcert="/usr/local/etc/pkg-pubkey.cert"
- cp "${pubcert}" ${jaildir}/usr/local/etc
- install_pc_extractoverlay "${jaildir}"
${ffunc} "${jaildir}" "${jaildir}/bootstrap-pkgng"
chmod 755 "${jaildir}/bootstrap-pkgng"
Please sign in to comment.
Something went wrong with that request. Please try again.