Merge branch 'master' into __user

conf/type/__jail/gencode-remote

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

conf/type/__package_pacman/gencode-remote

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