Merge branch 'master' into toutatis

This commit is contained in:
Rubén Rodríguez 2013-01-25 13:00:30 +01:00
commit 1cd2107515
2 changed files with 2 additions and 0 deletions

View file

@ -175,6 +175,7 @@ do
mv \$i \$i.real
cp /bin/true \$i
done
export DEBIAN_FRONTEND=noninteractive
apt-get --force-yes -y dist-upgrade
umount /proc
EOF

View file

@ -108,6 +108,7 @@ then
# echo Upstream version in $UPSTREAM: $upstream 1>&2
[ $package = "grub2" -a $UPSTREAM = natty ] && continue
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
[ $package = "grub2" -a $UPSTREAM = precise ] && continue
[ $package = "yelp" -a $UPSTREAM = natty ] && continue
echo Current version in $DISTRO: $current