diff --git a/cdist/conf/type/__package_update_index/gencode-remote b/cdist/conf/type/__package_update_index/gencode-remote index a120121d..8ee837eb 100755 --- a/cdist/conf/type/__package_update_index/gencode-remote +++ b/cdist/conf/type/__package_update_index/gencode-remote @@ -22,6 +22,7 @@ # type="$__object/parameter/type" + if [ -f "$type" ]; then type="$(cat "$type")" else @@ -40,8 +41,8 @@ fi case "$type" in yum) ;; - apt) echo "apt-get update" ;; - pacman) echo "pacman --sync --refresh" ;; + apt) echo "apt-get --quiet update" ;; + pacman) echo "pacman --noprogressbar --sync --refresh" ;; *) echo "Don't know how to manage packages on: $os" >&2 exit 1 diff --git a/cdist/conf/type/__package_upgrade_all/gencode-remote b/cdist/conf/type/__package_upgrade_all/gencode-remote index 09404af9..57676a57 100755 --- a/cdist/conf/type/__package_upgrade_all/gencode-remote +++ b/cdist/conf/type/__package_upgrade_all/gencode-remote @@ -23,6 +23,7 @@ # type="$__object/parameter/type" + if [ -f "$type" ]; then type="$(cat "$type")" else @@ -39,18 +40,20 @@ else esac fi +aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\"" + case "$type" in yum) - echo "yum --assumeyes update" - echo "yum clean all" + echo "yum --quiet --assumeyes update" + echo "yum --quiet clean all" ;; apt) - echo "apt-get --yes dist-upgrade" - echo "apt-get autoclean" + echo $aptget dist-upgrade + echo "apt-get --quiet autoclean" ;; pacman) - echo "pacman --noconfirm --sync --sysupgrade" - echo "pacman --noconfirm --sync --clean" + echo "pacman --noprogressbar --noconfirm --sync --sysupgrade" + echo "pacman --noprogressbar --noconfirm --sync --clean" ;; *) echo "Don't know how to manage packages on: $os" >&2