Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Put all PBI mount dirs in "", in the offchance we have a PBI with a
Browse files Browse the repository at this point in the history
space in it
  • Loading branch information
Kris Moore committed Nov 8, 2013
1 parent a9ab1d6 commit eeafa1b
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src-sh/pbi-manager10/pbime/pbimount
Expand Up @@ -37,33 +37,33 @@ mount_pbifile() {
}

mount_dirs() {
is_mounted "${pDir}/virtbase" || $NULLFS / ${pDir}/virtbase
is_mounted "${pDir}/virtbase/dev" || mount -t devfs devfs ${pDir}/virtbase/dev
is_mounted "${pDir}/virtbase/usr/local" || $NULLFS ${1}/local ${pDir}/virtbase/usr/local
is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run ${pDir}/virtbase/var/run
is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux ${pDir}/virtbase/compat/linux
is_mounted "${pDir}/virtbase" || $NULLFS / "${pDir}/virtbase"
is_mounted "${pDir}/virtbase/dev" || mount -t devfs devfs "${pDir}/virtbase/dev"
is_mounted "${pDir}/virtbase/usr/local" || $NULLFS ${1}/local "${pDir}/virtbase/usr/local"
is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run "${pDir}/virtbase/var/run"
is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux "${pDir}/virtbase/compat/linux"
if [ -d "${pDir}/virtbase/usr/local/etc/fonts" ] ; then
is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || $NULLFS /usr/local/etc/fonts ${pDir}/virtbase/usr/local/etc/fonts
is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || $NULLFS /usr/local/etc/fonts "${pDir}/virtbase/usr/local/etc/fonts"
fi
if [ -d "${pDir}/virtbase/usr/local/lib/X11/fonts" ] ; then
is_mounted "${pDir}/virtbase/usr/local/lib/X11/fonts" || $NULLFS /usr/local/lib/X11/fonts ${pDir}/virtbase/usr/local/lib/X11/fonts
is_mounted "${pDir}/virtbase/usr/local/lib/X11/fonts" || $NULLFS /usr/local/lib/X11/fonts "${pDir}/virtbase/usr/local/lib/X11/fonts"
fi
if [ -d "${pDir}/virtbase/usr/local/lib/X11/icons" ] ; then
is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" || $NULLFS /usr/local/lib/X11/icons ${pDir}/virtbase/usr/local/lib/X11/icons
is_mounted "${pDir}/virtbase/usr/local/lib/X11/icons" || $NULLFS /usr/local/lib/X11/icons "${pDir}/virtbase/usr/local/lib/X11/icons"
fi
is_mounted "${pDir}/virtbase/tmp" || $NULLFS /tmp ${pDir}/virtbase/tmp
is_mounted "${pDir}/virtbase/usr/home" || $NULLFS /usr/home ${pDir}/virtbase/usr/home
is_mounted "${pDir}/virtbase/tmp" || $NULLFS /tmp "${pDir}/virtbase/tmp"
is_mounted "${pDir}/virtbase/usr/home" || $NULLFS /usr/home "${pDir}/virtbase/usr/home"
for i in `ls -d /usr/home/* 2>/dev/null`
do
is_mounted "${i}"
if [ $? -eq 0 ] ;then
is_mounted "${pDir}/virtbase${i}" || $NULLFS ${i} ${pDir}/virtbase${i}
is_mounted "${pDir}/virtbase${i}" || $NULLFS ${i} "${pDir}/virtbase${i}"
fi

done

cp /usr/pbi/.ldconfig ${pDir}/virtbase/var/run/ldconfig
chroot ${pDir}/virtbase /var/run/ldconfig start >/dev/null 2>/dev/null
cp /usr/pbi/.ldconfig "${pDir}/virtbase/var/run/ldconfig"
chroot "${pDir}/virtbase" /var/run/ldconfig start >/dev/null 2>/dev/null
}

umount_pbidir() {
Expand Down

0 comments on commit eeafa1b

Please sign in to comment.