Starting mods for template upgrade support

This commit is contained in:
Christopher Laprise 2017-03-12 23:15:45 -04:00
parent 05b57f4960
commit ad404bfbe6
No known key found for this signature in database
GPG Key ID: 448568C8B281C952

View File

@ -61,11 +61,12 @@ while [ $# -gt 0 ]; do
shift shift
done done
# Prevent template upgrade - this would override user changes - # Prevent implicit update of template - this would override user changes -
# but do allow explicit template reinstalls # but do allow explicit template upgrade, downgrade, reinstall
if [ "$YUM_ACTION" == "reinstall" ] && [[ "$PKGS" == *"qubes-template-"* ]]; then if [ "$YUM_ACTION" == "reinstall" ] || [ "$YUM_ACTION" == "upgrade" ] || [ "$YUM_ACTION" == "downgrade" ] \
&& [[ "$PKGS" == *"qubes-template-"* ]]; then
TEMPLATE_EXCLUDE_OPTS="" TEMPLATE_EXCLUDE_OPTS=""
echo "WARNING: Reinstalling a template will erase all files in template's /home and /rw !" echo "WARNING: Replacing a template will erase all files in template's /home and /rw !"
ONEPKG=`cut -f 1 -d ' ' <<<$PKGS` ONEPKG=`cut -f 1 -d ' ' <<<$PKGS`
if [[ "$ONEPKG" == "qubes-template-"* ]] && [[ "$ONEPKG" == "${PKGS#\ }" ]]; then # test "$PKGS" minus space if [[ "$ONEPKG" == "qubes-template-"* ]] && [[ "$ONEPKG" == "${PKGS#\ }" ]]; then # test "$PKGS" minus space
@ -83,7 +84,7 @@ if [ "$YUM_ACTION" == "reinstall" ] && [[ "$PKGS" == *"qubes-template-"* ]]; the
TEMPLATE_NETVM="default" TEMPLATE_NETVM="default"
fi fi
else else
echo "ERROR: Specify only one package to reinstall template" echo "ERROR: Specify only one package when replacing template"
exit 1 exit 1
fi fi