Merge branch 'master' into toutatis
This commit is contained in:
commit
1cd2107515
2 changed files with 2 additions and 0 deletions
|
|
@ -175,6 +175,7 @@ do
|
||||||
mv \$i \$i.real
|
mv \$i \$i.real
|
||||||
cp /bin/true \$i
|
cp /bin/true \$i
|
||||||
done
|
done
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
apt-get --force-yes -y dist-upgrade
|
apt-get --force-yes -y dist-upgrade
|
||||||
umount /proc
|
umount /proc
|
||||||
EOF
|
EOF
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@ then
|
||||||
# echo Upstream version in $UPSTREAM: $upstream 1>&2
|
# echo Upstream version in $UPSTREAM: $upstream 1>&2
|
||||||
[ $package = "grub2" -a $UPSTREAM = natty ] && continue
|
[ $package = "grub2" -a $UPSTREAM = natty ] && continue
|
||||||
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
|
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
|
||||||
|
[ $package = "grub2" -a $UPSTREAM = precise ] && continue
|
||||||
[ $package = "yelp" -a $UPSTREAM = natty ] && continue
|
[ $package = "yelp" -a $UPSTREAM = natty ] && continue
|
||||||
|
|
||||||
echo Current version in $DISTRO: $current
|
echo Current version in $DISTRO: $current
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue