From 2e4cdc2f8d6ad676edcabda22cf440e6ebaa3584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 27 Sep 2014 01:52:19 +0200 Subject: [PATCH] Rename yum-proxy-setup service to updates-proxy-setup Fedora is no longer the only supported distribution, so change the service name to be more generic. Old name still supported for compatibility. --- vm-init.d/qubes-core | 2 +- vm-systemd/misc-post.sh | 2 +- vm-systemd/qubes-sysinit.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vm-init.d/qubes-core b/vm-init.d/qubes-core index 8c8e588..2ecf8cf 100755 --- a/vm-init.d/qubes-core +++ b/vm-init.d/qubes-core @@ -38,7 +38,7 @@ start() echo "ZONE=\"$timezone\"" >> /etc/sysconfig/clock fi - yum_proxy_setup=$(/usr/bin/xenstore-read qubes-service/yum-proxy-setup 2> /dev/null) + yum_proxy_setup=$(/usr/bin/xenstore-read qubes-service/yum-proxy-setup 2> /dev/null || /usr/bin/xenstore-read qubes-service/updates-proxy-setup 2>/dev/null ) type=$(/usr/bin/xenstore-read qubes-vm-type) if [ "$yum_proxy_setup" != "0" ] || [ -z "$yum_proxy_setup" -a "$type" == "TemplateVM" ]; then echo proxy=http://10.137.255.254:8082/ > /etc/yum.conf.d/qubes-proxy.conf diff --git a/vm-systemd/misc-post.sh b/vm-systemd/misc-post.sh index f0a9f1b..d667080 100755 --- a/vm-systemd/misc-post.sh +++ b/vm-systemd/misc-post.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ -f /var/run/qubes-service/yum-proxy-setup ]; then +if [ -f /var/run/qubes-service/yum-proxy-setup -o -f /var/run/qubes-service/updates-proxy-setup ]; then echo proxy=http://10.137.255.254:8082/ > /etc/yum.conf.d/qubes-proxy.conf else echo > /etc/yum.conf.d/qubes-proxy.conf diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh index 6833682..2a4ad5b 100755 --- a/vm-systemd/qubes-sysinit.sh +++ b/vm-systemd/qubes-sysinit.sh @@ -4,7 +4,7 @@ DEFAULT_ENABLED_NETVM="network-manager qubes-network qubes-update-check qubes-updates-proxy" DEFAULT_ENABLED_PROXYVM="meminfo-writer qubes-network qubes-firewall qubes-netwatcher qubes-update-check" DEFAULT_ENABLED_APPVM="meminfo-writer cups qubes-update-check" -DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM yum-proxy-setup" +DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM updates-proxy-setup" DEFAULT_ENABLED="meminfo-writer" XS_READ=/usr/bin/xenstore-read