dom0/qvm-dom0-update: Filter yum options in dom0
Eg. don't pass --enablerepo to yum install.
This commit is contained in:
parent
fde8bc35fa
commit
029e3fc098
@ -29,8 +29,26 @@ qvm-run -a $UPDATEVM true || exit 1
|
|||||||
qvm-run --pass_io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh --doit --nogui $*" || exit 1
|
qvm-run --pass_io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh --doit --nogui $*" || exit 1
|
||||||
# Wait for download completed
|
# Wait for download completed
|
||||||
while pidof -x qubes-receive-updates >/dev/null; do sleep 0.5; done
|
while pidof -x qubes-receive-updates >/dev/null; do sleep 0.5; done
|
||||||
if [ $# -gt 0 ]; then
|
PKGS=
|
||||||
|
OPTS=
|
||||||
|
# Filter out some yum options and collect packages list
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case "$1" in
|
||||||
|
--enablerepo=*|\
|
||||||
|
--disablerepo=*|\
|
||||||
|
--clean)
|
||||||
|
;;
|
||||||
|
-*)
|
||||||
|
OPTS="$OPTS $1"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
PKGS="$PKGS $1"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "x$PKGS" != "x" ]; then
|
||||||
ID=$(id -ur)
|
ID=$(id -ur)
|
||||||
if [ $ID != 0 ] ; then
|
if [ $ID != 0 ] ; then
|
||||||
echo "This script should be run as root, use sudo next time."
|
echo "This script should be run as root, use sudo next time."
|
||||||
@ -38,7 +56,7 @@ if [ $# -gt 0 ]; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
yum install $@
|
yum $OPTS install $PKGS
|
||||||
elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
|
elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
|
||||||
# Above file exists only when at least one package was downloaded
|
# Above file exists only when at least one package was downloaded
|
||||||
yum check-update
|
yum check-update
|
||||||
@ -50,7 +68,7 @@ elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
|
|||||||
echo "Now you can manually run yum update (use sudo again)."
|
echo "Now you can manually run yum update (use sudo again)."
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
yum update
|
yum $OPTS update
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "No updates avaliable"
|
echo "No updates avaliable"
|
||||||
|
Loading…
Reference in New Issue
Block a user