Skip to content
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 4a54eef + 84878ce commit 07e9b0fbfbfab3f4ba1eba25f89b001d8d3195a6 @beanpole135 beanpole135 committed
View
75 .gitignore
@@ -186,6 +186,80 @@ src-qt4/libpcbsd/ui/i18n/libpcbsd_zu.qm
src-qt4/libpcbsd/ui/ui_dialogInfoBox.h
src-qt4/libpcbsd/ui/ui_dialogMetaProgress.h
src-qt4/libpcbsd/ui/ui_dialogwpaenterprise.h
+src-qt4/life-preserver/i18n/LifePreserver_af.qm
+src-qt4/life-preserver/i18n/LifePreserver_ar.qm
+src-qt4/life-preserver/i18n/LifePreserver_az.qm
+src-qt4/life-preserver/i18n/LifePreserver_bg.qm
+src-qt4/life-preserver/i18n/LifePreserver_bn.qm
+src-qt4/life-preserver/i18n/LifePreserver_bs.qm
+src-qt4/life-preserver/i18n/LifePreserver_ca.qm
+src-qt4/life-preserver/i18n/LifePreserver_cs.qm
+src-qt4/life-preserver/i18n/LifePreserver_cy.qm
+src-qt4/life-preserver/i18n/LifePreserver_da.qm
+src-qt4/life-preserver/i18n/LifePreserver_de.qm
+src-qt4/life-preserver/i18n/LifePreserver_el.qm
+src-qt4/life-preserver/i18n/LifePreserver_en_GB.qm
+src-qt4/life-preserver/i18n/LifePreserver_en_US.qm
+src-qt4/life-preserver/i18n/LifePreserver_en_ZA.qm
+src-qt4/life-preserver/i18n/LifePreserver_es.qm
+src-qt4/life-preserver/i18n/LifePreserver_et.qm
+src-qt4/life-preserver/i18n/LifePreserver_eu.qm
+src-qt4/life-preserver/i18n/LifePreserver_fa.qm
+src-qt4/life-preserver/i18n/LifePreserver_fi.qm
+src-qt4/life-preserver/i18n/LifePreserver_fr.qm
+src-qt4/life-preserver/i18n/LifePreserver_fr_CA.qm
+src-qt4/life-preserver/i18n/LifePreserver_fur.qm
+src-qt4/life-preserver/i18n/LifePreserver_gl.qm
+src-qt4/life-preserver/i18n/LifePreserver_he.qm
+src-qt4/life-preserver/i18n/LifePreserver_hi.qm
+src-qt4/life-preserver/i18n/LifePreserver_hr.qm
+src-qt4/life-preserver/i18n/LifePreserver_hu.qm
+src-qt4/life-preserver/i18n/LifePreserver_id.qm
+src-qt4/life-preserver/i18n/LifePreserver_is.qm
+src-qt4/life-preserver/i18n/LifePreserver_it.qm
+src-qt4/life-preserver/i18n/LifePreserver_ja.qm
+src-qt4/life-preserver/i18n/LifePreserver_ka.qm
+src-qt4/life-preserver/i18n/LifePreserver_ko.qm
+src-qt4/life-preserver/i18n/LifePreserver_lt.qm
+src-qt4/life-preserver/i18n/LifePreserver_lv.qm
+src-qt4/life-preserver/i18n/LifePreserver_mk.qm
+src-qt4/life-preserver/i18n/LifePreserver_mn.qm
+src-qt4/life-preserver/i18n/LifePreserver_ms.qm
+src-qt4/life-preserver/i18n/LifePreserver_mt.qm
+src-qt4/life-preserver/i18n/LifePreserver_nb.qm
+src-qt4/life-preserver/i18n/LifePreserver_ne.qm
+src-qt4/life-preserver/i18n/LifePreserver_nl.qm
+src-qt4/life-preserver/i18n/LifePreserver_pa.qm
+src-qt4/life-preserver/i18n/LifePreserver_pl.qm
+src-qt4/life-preserver/i18n/LifePreserver_pt.qm
+src-qt4/life-preserver/i18n/LifePreserver_pt_BR.qm
+src-qt4/life-preserver/i18n/LifePreserver_ro.qm
+src-qt4/life-preserver/i18n/LifePreserver_ru.qm
+src-qt4/life-preserver/i18n/LifePreserver_sa.qm
+src-qt4/life-preserver/i18n/LifePreserver_sk.qm
+src-qt4/life-preserver/i18n/LifePreserver_sl.qm
+src-qt4/life-preserver/i18n/LifePreserver_sr.qm
+src-qt4/life-preserver/i18n/LifePreserver_sv.qm
+src-qt4/life-preserver/i18n/LifePreserver_sw.qm
+src-qt4/life-preserver/i18n/LifePreserver_ta.qm
+src-qt4/life-preserver/i18n/LifePreserver_tg.qm
+src-qt4/life-preserver/i18n/LifePreserver_th.qm
+src-qt4/life-preserver/i18n/LifePreserver_tr.qm
+src-qt4/life-preserver/i18n/LifePreserver_uk.qm
+src-qt4/life-preserver/i18n/LifePreserver_uz.qm
+src-qt4/life-preserver/i18n/LifePreserver_vi.qm
+src-qt4/life-preserver/i18n/LifePreserver_zh_CN.qm
+src-qt4/life-preserver/i18n/LifePreserver_zh_HK.qm
+src-qt4/life-preserver/i18n/LifePreserver_zh_TW.qm
+src-qt4/life-preserver/i18n/LifePreserver_zu.qm
+src-qt4/life-preserver/ui_LPConfig.h
+src-qt4/life-preserver/ui_LPWizard.h
+src-qt4/life-preserver/ui_mainUI.h
+src-qt4/pc-firstbootgui/ui_dialogHelp.h
+src-qt4/pc-firstbootgui/ui_dialogInfoBox.h
+src-qt4/pc-firstbootgui/ui_dialogKeyboard.h
+src-qt4/pc-firstbootgui/ui_firstboot.h
+src-qt4/pc-firstbootgui/ui_netKey.h
src-qt4/pc-controlpanel/i18n/pc-controlpanel_af.qm
src-qt4/pc-controlpanel/i18n/pc-controlpanel_ar.qm
src-qt4/pc-controlpanel/i18n/pc-controlpanel_az.qm
@@ -622,3 +696,4 @@ src-qt4/pc-firstbootgui/pc-firstboot
src-sh/pc-fbsdupdatecheck/pc-fbsdupdatecheck
src-qt4/pc-netmanager/src/NetworkManager/pc-netmanager
src-qt4/pc-mounttray/pc-mounttray
+src-qt4/life-preserver/life-preserver
View
0 src-qt4/life-preserver/scripts/setup-ssh-keys.sh 100644 → 100755
File mode changed.
View
3 src-sh/pc-sysinstall/backend/functions-zfsrestore.sh
@@ -147,6 +147,9 @@ restore_zfs_from_remote()
val="`echo $zLine | awk '{print $3}'`"
dChk="`echo $zLine | awk '{print $1}'`"
+ # Don't need to set empty props
+ if [ -z "$val" ] ; then continue ; fi
+
# We can skip setting mountpoint on BEs
echo $dSet | grep -q '^ROOT/'
if [ $? -eq 0 -a "$prop" = "mountpoint" ] ; then continue; fi

0 comments on commit 07e9b0f

Please sign in to comment.
Something went wrong with that request. Please try again.