Add template reinstall support
Issue #2061 Simple implementation checks for --action=reinstall but adds no sanity checks.
This commit is contained in:
parent
30aac6b6a8
commit
6b315b1dad
@ -22,13 +22,11 @@ if [ "$1" = "--help" ]; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Prevent template upgrade - this would override user changes
|
|
||||||
TEMPLATE_EXCLUDE_OPTS="--exclude=`rpm -qa --qf '%{NAME},' qubes-template-\*`"
|
|
||||||
PKGS=
|
PKGS=
|
||||||
YUM_OPTS="$TEMPLATE_EXCLUDE_OPTS"
|
YUM_OPTS=
|
||||||
GUI=
|
GUI=
|
||||||
CHECK_ONLY=
|
CHECK_ONLY=
|
||||||
ALL_OPTS="$TEMPLATE_EXCLUDE_OPTS $*"
|
ALL_OPTS="$*"
|
||||||
YUM_ACTION=
|
YUM_ACTION=
|
||||||
QVMRUN_OPTS=
|
QVMRUN_OPTS=
|
||||||
CLEAN=
|
CLEAN=
|
||||||
@ -63,6 +61,15 @@ while [ $# -gt 0 ]; do
|
|||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Prevent template upgrade - this would override user changes -
|
||||||
|
# but do allow explicit template reinstalls
|
||||||
|
if [ "$YUM_ACTION" == "reinstall" ] ; then
|
||||||
|
TEMPLATE_EXCLUDE_OPTS=""
|
||||||
|
else TEMPLATE_EXCLUDE_OPTS="--exclude=`rpm -qa --qf '%{NAME},' qubes-template-\*`"
|
||||||
|
fi
|
||||||
|
YUM_OPTS="$TEMPLATE_EXCLUDE_OPTS $YUM_OPTS"
|
||||||
|
ALL_OPTS="$TEMPLATE_EXCLUDE_OPTS $ALL_OPTS"
|
||||||
|
|
||||||
ID=$(id -ur)
|
ID=$(id -ur)
|
||||||
if [ $ID != 0 -a -z "$GUI" -a -z "$CHECK_ONLY" ] ; then
|
if [ $ID != 0 -a -z "$GUI" -a -z "$CHECK_ONLY" ] ; then
|
||||||
echo "This script should be run as root (when used in console mode), use sudo." >&2
|
echo "This script should be run as root (when used in console mode), use sudo." >&2
|
||||||
|
Loading…
Reference in New Issue
Block a user