evilham/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't symlink multiple times

Browse source 
Was checking for existence of $jaildir/home -- never exists; will always create new symlink
Changed to look for directory or symlink at $jaildir/base/home and respond accordingly
This commit is contained in:
Jake Guffey 2012-06-21 11:59:53 -04:00
parent 37eabffd9c
commit ba576b3931
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/type/__jail/gencode-remote
View file

@ -185,12 +185,14 @@ cat <<EOF
if [ ! -d "${jaildir}/base/usr/home" ]; then if [ ! -d "${jaildir}/base/usr/home" ]; then
mkdir -p "${jaildir}/base/usr/home" mkdir -p "${jaildir}/base/usr/home"
fi fi
if [ ! -d "${jaildir}/home" ]; then if [ ! -d "${jaildir}/base/home" ]; then
if [ ! -L "${jaildir}/base/home" ]; then
SAVE=\$PWD; cd ${jaildir}/base SAVE=\$PWD; cd ${jaildir}/base
ln -s usr/home home ln -s usr/home home
cd \$SAVE; unset SAVE cd \$SAVE; unset SAVE
fi fi
fi fi
fi
if [ ! -d "${jaildir}/rw" ]; then if [ ! -d "${jaildir}/rw" ]; then
mkdir "${jaildir}/rw" mkdir "${jaildir}/rw"
fi fi