From 24b4e5efd0572b53b1adbad66c5b4996adeee229 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 20 Jan 2013 21:44:13 +0100 Subject: [PATCH] dom0: use any python2, not explicit python2.6 Especially allow python 2.7 (fc18). --- dom0/aux-tools/unbind_all_network_devices | 2 +- dom0/clipboard_notifier/qclipd | 2 +- dom0/qubes_rpc/qubes-receive-updates | 2 +- dom0/qvm-core/qubes.py | 2 +- dom0/qvm-tools/qubes-dom0-network-via-netvm | 2 +- dom0/qvm-tools/qvm-add-appvm | 2 +- dom0/qvm-tools/qvm-add-template | 2 +- dom0/qvm-tools/qvm-backup | 2 +- dom0/qvm-tools/qvm-backup-restore | 2 +- dom0/qvm-tools/qvm-clone | 2 +- dom0/qvm-tools/qvm-create | 2 +- dom0/qvm-tools/qvm-firewall | 2 +- dom0/qvm-tools/qvm-grow-private | 2 +- dom0/qvm-tools/qvm-init-storage | 2 +- dom0/qvm-tools/qvm-kill | 2 +- dom0/qvm-tools/qvm-ls | 2 +- dom0/qvm-tools/qvm-pci | 2 +- dom0/qvm-tools/qvm-prefs | 2 +- dom0/qvm-tools/qvm-remove | 2 +- dom0/qvm-tools/qvm-revert-template-changes | 2 +- dom0/qvm-tools/qvm-run | 2 +- dom0/qvm-tools/qvm-start | 2 +- dom0/qvm-tools/qvm-sync-clock | 2 +- dom0/qvm-tools/qvm-template-commit | 2 +- dom0/restore/qfile-daemon-dvm | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dom0/aux-tools/unbind_all_network_devices b/dom0/aux-tools/unbind_all_network_devices index fd589ab4..9497feb8 100755 --- a/dom0/aux-tools/unbind_all_network_devices +++ b/dom0/aux-tools/unbind_all_network_devices @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/clipboard_notifier/qclipd b/dom0/clipboard_notifier/qclipd index 6ac6fa65..23901b78 100755 --- a/dom0/clipboard_notifier/qclipd +++ b/dom0/clipboard_notifier/qclipd @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qubes_rpc/qubes-receive-updates b/dom0/qubes_rpc/qubes-receive-updates index 95b0ddbc..3d2e3951 100755 --- a/dom0/qubes_rpc/qubes-receive-updates +++ b/dom0/qubes_rpc/qubes-receive-updates @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 794ad93b..3b9b1fb5 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qubes-dom0-network-via-netvm b/dom0/qvm-tools/qubes-dom0-network-via-netvm index 0e8047e8..24b8d762 100755 --- a/dom0/qvm-tools/qubes-dom0-network-via-netvm +++ b/dom0/qvm-tools/qubes-dom0-network-via-netvm @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-add-appvm b/dom0/qvm-tools/qvm-add-appvm index 7916e67a..79682891 100755 --- a/dom0/qvm-tools/qvm-add-appvm +++ b/dom0/qvm-tools/qvm-add-appvm @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-add-template b/dom0/qvm-tools/qvm-add-template index 903cbe35..f5a8cf39 100755 --- a/dom0/qvm-tools/qvm-add-template +++ b/dom0/qvm-tools/qvm-add-template @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-backup b/dom0/qvm-tools/qvm-backup index 0604b9ce..cee29e3b 100755 --- a/dom0/qvm-tools/qvm-backup +++ b/dom0/qvm-tools/qvm-backup @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-backup-restore b/dom0/qvm-tools/qvm-backup-restore index ef363e5e..6b1a590d 100755 --- a/dom0/qvm-tools/qvm-backup-restore +++ b/dom0/qvm-tools/qvm-backup-restore @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-clone b/dom0/qvm-tools/qvm-clone index c99f3062..cd8f6017 100755 --- a/dom0/qvm-tools/qvm-clone +++ b/dom0/qvm-tools/qvm-clone @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-create b/dom0/qvm-tools/qvm-create index a9d9c1ce..a4ff0891 100755 --- a/dom0/qvm-tools/qvm-create +++ b/dom0/qvm-tools/qvm-create @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-firewall b/dom0/qvm-tools/qvm-firewall index d1439da5..d9898580 100755 --- a/dom0/qvm-tools/qvm-firewall +++ b/dom0/qvm-tools/qvm-firewall @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-grow-private b/dom0/qvm-tools/qvm-grow-private index c144adab..c052239d 100755 --- a/dom0/qvm-tools/qvm-grow-private +++ b/dom0/qvm-tools/qvm-grow-private @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-init-storage b/dom0/qvm-tools/qvm-init-storage index 7cc3ebfe..2c21e078 100755 --- a/dom0/qvm-tools/qvm-init-storage +++ b/dom0/qvm-tools/qvm-init-storage @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-kill b/dom0/qvm-tools/qvm-kill index dd678ed2..01f58f99 100755 --- a/dom0/qvm-tools/qvm-kill +++ b/dom0/qvm-tools/qvm-kill @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-ls b/dom0/qvm-tools/qvm-ls index dd752026..407f4293 100755 --- a/dom0/qvm-tools/qvm-ls +++ b/dom0/qvm-tools/qvm-ls @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-pci b/dom0/qvm-tools/qvm-pci index 7a41bc0e..a5a9a918 100755 --- a/dom0/qvm-tools/qvm-pci +++ b/dom0/qvm-tools/qvm-pci @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-prefs b/dom0/qvm-tools/qvm-prefs index b05ef188..2116aa23 100755 --- a/dom0/qvm-tools/qvm-prefs +++ b/dom0/qvm-tools/qvm-prefs @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-remove b/dom0/qvm-tools/qvm-remove index 0cb4b9e1..ac695294 100755 --- a/dom0/qvm-tools/qvm-remove +++ b/dom0/qvm-tools/qvm-remove @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-revert-template-changes b/dom0/qvm-tools/qvm-revert-template-changes index e68280ab..a973c166 100755 --- a/dom0/qvm-tools/qvm-revert-template-changes +++ b/dom0/qvm-tools/qvm-revert-template-changes @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-run b/dom0/qvm-tools/qvm-run index ddfa8406..b8a6fe10 100755 --- a/dom0/qvm-tools/qvm-run +++ b/dom0/qvm-tools/qvm-run @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-start b/dom0/qvm-tools/qvm-start index 062f35b0..2363c794 100755 --- a/dom0/qvm-tools/qvm-start +++ b/dom0/qvm-tools/qvm-start @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-sync-clock b/dom0/qvm-tools/qvm-sync-clock index 9378b29d..65874af2 100755 --- a/dom0/qvm-tools/qvm-sync-clock +++ b/dom0/qvm-tools/qvm-sync-clock @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/qvm-tools/qvm-template-commit b/dom0/qvm-tools/qvm-template-commit index 680c0a0d..af5bd78c 100755 --- a/dom0/qvm-tools/qvm-template-commit +++ b/dom0/qvm-tools/qvm-template-commit @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org # diff --git a/dom0/restore/qfile-daemon-dvm b/dom0/restore/qfile-daemon-dvm index 92df32e0..973a1681 100755 --- a/dom0/restore/qfile-daemon-dvm +++ b/dom0/restore/qfile-daemon-dvm @@ -1,4 +1,4 @@ -#!/usr/bin/python2.6 +#!/usr/bin/python2 # # The Qubes OS Project, http://www.qubes-os.org #