Changeset eeafa1b


Ignore:
Timestamp:
11/07/13 16:28:16 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
87ba9df
Parents:
a9ab1d6
Message:

Put all PBI mount dirs in "", in the offchance we have a PBI with a
space in it

File:
1 edited

Legend:

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

    r7e583de reeafa1b  
    3838 
    3939mount_dirs() { 
    40    is_mounted "${pDir}/virtbase" || $NULLFS / ${pDir}/virtbase 
    41    is_mounted "${pDir}/virtbase/dev" || mount -t devfs devfs ${pDir}/virtbase/dev 
    42    is_mounted "${pDir}/virtbase/usr/local" || $NULLFS ${1}/local ${pDir}/virtbase/usr/local 
    43    is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run ${pDir}/virtbase/var/run 
    44    is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux ${pDir}/virtbase/compat/linux 
     40   is_mounted "${pDir}/virtbase" || $NULLFS / "${pDir}/virtbase" 
     41   is_mounted "${pDir}/virtbase/dev" || mount -t devfs devfs "${pDir}/virtbase/dev" 
     42   is_mounted "${pDir}/virtbase/usr/local" || $NULLFS ${1}/local "${pDir}/virtbase/usr/local" 
     43   is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run "${pDir}/virtbase/var/run" 
     44   is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux "${pDir}/virtbase/compat/linux" 
    4545   if [ -d "${pDir}/virtbase/usr/local/etc/fonts" ] ; then 
    46       is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || $NULLFS /usr/local/etc/fonts ${pDir}/virtbase/usr/local/etc/fonts 
     46      is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || $NULLFS /usr/local/etc/fonts "${pDir}/virtbase/usr/local/etc/fonts" 
    4747   fi 
    4848   if [ -d "${pDir}/virtbase/usr/local/lib/X11/fonts" ] ; then 
    49       is_mounted "${pDir}/virtbase/usr/local/lib/X11/fonts" || $NULLFS /usr/local/lib/X11/fonts ${pDir}/virtbase/usr/local/lib/X11/fonts 
     49      is_mounted "${pDir}/virtbase/usr/local/lib/X11/fonts" || $NULLFS /usr/local/lib/X11/fonts "${pDir}/virtbase/usr/local/lib/X11/fonts" 
    5050   fi 
    5151   if [ -d "${pDir}/virtbase/usr/local/lib/X11/icons" ] ; then 
    52       is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" || $NULLFS /usr/local/lib/X11/icons ${pDir}/virtbase/usr/local/lib/X11/icons 
     52      is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" || $NULLFS /usr/local/lib/X11/icons "${pDir}/virtbase/usr/local/lib/X11/icons" 
    5353   fi 
    54    is_mounted "${pDir}/virtbase/tmp" || $NULLFS /tmp ${pDir}/virtbase/tmp 
    55    is_mounted "${pDir}/virtbase/usr/home" || $NULLFS /usr/home ${pDir}/virtbase/usr/home 
     54   is_mounted "${pDir}/virtbase/tmp" || $NULLFS /tmp "${pDir}/virtbase/tmp" 
     55   is_mounted "${pDir}/virtbase/usr/home" || $NULLFS /usr/home "${pDir}/virtbase/usr/home" 
    5656   for i in `ls -d /usr/home/* 2>/dev/null` 
    5757   do 
    5858      is_mounted "${i}"  
    5959      if [ $? -eq 0 ] ;then 
    60          is_mounted "${pDir}/virtbase${i}" || $NULLFS ${i} ${pDir}/virtbase${i} 
     60         is_mounted "${pDir}/virtbase${i}" || $NULLFS ${i} "${pDir}/virtbase${i}" 
    6161      fi 
    6262 
    6363   done 
    6464 
    65    cp /usr/pbi/.ldconfig ${pDir}/virtbase/var/run/ldconfig 
    66    chroot ${pDir}/virtbase /var/run/ldconfig start >/dev/null 2>/dev/null 
     65   cp /usr/pbi/.ldconfig "${pDir}/virtbase/var/run/ldconfig" 
     66   chroot "${pDir}/virtbase" /var/run/ldconfig start >/dev/null 2>/dev/null 
    6767} 
    6868 
Note: See TracChangeset for help on using the changeset viewer.