Changeset e1112df3


Ignore:
Timestamp:
02/05/14 13:25:35 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
0a2ab92
Parents:
6310240
Message:

Add some extra checks when doing PBI container setup on a host system with no linux compat,
or some xorg directories

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbime/pbimount

    rc494b93 re1112df3  
    100100     is_mounted "${pDir}/virtbase/var/run/dbus" || ( mkdir ${pDir}/virtbase/var/run/dbus 2>/dev/null ; $NULLFS /var/run/dbus "${pDir}/virtbase/var/run/dbus" ; $MNTSLEEP ) 
    101101   fi 
    102    is_mounted "${pDir}/virtbase/compat/linux" || ($NULLFS ${1}/linux "${pDir}/virtbase/compat/linux" ; $MNTSLEEP ) 
     102 
     103   # If the host has Linux compat 
     104   if [ -d "${pDir}/virtbase/compat/linux" ] ; then 
     105     is_mounted "${pDir}/virtbase/compat/linux" || ($NULLFS ${1}/linux "${pDir}/virtbase/compat/linux" ; $MNTSLEEP ) 
     106   fi 
    103107 
    104108   # Sort out the items to mount into the PBI container 
     
    110114 
    111115   # Mount any system-wide fonts / cursors / icons into the PBI container 
    112    if [ -d "${pDir}/virtbase/usr/local/etc/fonts" ] ; then 
     116   if [ -d "${pDir}/virtbase/usr/local/etc/fonts" -a -d "/usr/local/etc/fonts" ] ; then 
    113117      is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || ($NULLFS /usr/local/etc/fonts "${pDir}/virtbase/usr/local/etc/fonts" ; $MNTSLEEP ) 
    114118   fi 
    115    if [ -d "${pDir}/virtbase/usr/local/lib/X11/fonts" ] ; then 
     119   if [ -d "${pDir}/virtbase/usr/local/lib/X11/fonts" -a -d "/usr/local/lib/X11/fonts" ] ; then 
    116120      is_mounted "${pDir}/virtbase/usr/local/lib/X11/fonts" || ($NULLFS /usr/local/lib/X11/fonts "${pDir}/virtbase/usr/local/lib/X11/fonts" ; $MNTSLEEP ) 
    117121   fi 
    118    if [ -d "${pDir}/virtbase/usr/local/lib/X11/icons" ] ; then 
     122   if [ -d "${pDir}/virtbase/usr/local/lib/X11/icons" -a -d "/usr/local/lib/X11/icons" ] ; then 
    119123      is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" || ($NULLFS /usr/local/lib/X11/icons "${pDir}/virtbase/usr/local/lib/X11/icons" ; $MNTSLEEP ) 
    120124   fi 
    121    if [ -d "${pDir}/virtbase/usr/local/share/icons" ] ; then 
     125   if [ -d "${pDir}/virtbase/usr/local/share/icons" -a -d "/usr/local/share/icons" ] ; then 
    122126      is_mounted "${pDir}/virtbase/usr/local/share/icons" || ($NULLFS /usr/local/share/icons "${pDir}/virtbase/usr/local/share/icons" ; $MNTSLEEP ) 
    123127   fi 
Note: See TracChangeset for help on using the changeset viewer.