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

Merge branch 'master' into __group

Browse source
This commit is contained in:
Jake Guffey 2012-06-22 11:09:34 -04:00
commit 2aee33fe06
2 changed files with 8 additions and 8 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

6
conf/type/__package_pacman/gencode-remote
View file

@ -25,8 +25,6 @@
# exec >&2 # exec >&2
# set -x # set -x
pacopts="--needed --noconfirm --noprogressbar"
if [ -f "$__object/parameter/name" ]; then if [ -f "$__object/parameter/name" ]; then
name="$__object/parameter/name" name="$__object/parameter/name"
else else
@ -57,10 +55,10 @@ fi
case "$state_should" in case "$state_should" in
present) present)
echo pacman "$pacopts" -S \"$name\" echo pacman --needed --noconfirm --noprogressbar -S \"$name\"
;; ;;
absent) absent)
echo pacman "$pacopts" -R \"$name\" echo pacman --noconfirm --noprogressbar -R \"$name\"
;; ;;
*) *)
echo "Unknown state: $state_should" >&2 echo "Unknown state: $state_should" >&2