Merge branch 'advertise-services'

* advertise-services:
  archlinux: no longer need to mangle shebang for python scripts
  Make shebang explicit /usr/bin/python2 where it's still there
  Tell dom0 that VM is running Linux

archlinux/PKGBUILD

@@ -45,12 +45,6 @@ build() {
     sed 's:/sbin/ip:ip:g' -i network/*
     sed 's:/bin/grep:grep:g' -i network/*
 
-    # Force running all scripts with python2
-    sed 's:^#!/usr/bin/python.*:#!/usr/bin/python2:' -i misc/*
-    sed 's:^#!/usr/bin/env python.*:#!/usr/bin/env python2:' -i misc/*
-    sed 's:^#!/usr/bin/python.*:#!/usr/bin/python2:' -i qubes-rpc/*
-    sed 's:^#!/usr/bin/env python.*:#!/usr/bin/env python2:' -i qubes-rpc/*
-
     # Fix for archlinux sbindir
     sed 's:/usr/sbin/ntpdate:/usr/bin/ntpdate:g' -i qubes-rpc/sync-ntp-clock
     sed 's:/usr/sbin/qubes-firewall:/usr/bin/qubes-firewall:g' -i vm-systemd/qubes-firewall.service

misc/qubes-desktop-run

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from qubesagent.xdg import launch
 import sys

misc/qubes-session-autostart

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # -*- coding: utf-8 -*-
 #
 # The Qubes OS Project, http://www.qubes-os.org

misc/qvm-features-request

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
 # vim: fileencoding=utf-8
 
 #

misc/yum-qubes-hooks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #

post-install.d/10-qubes-core-agent-features.sh

@@ -3,6 +3,7 @@
 # announce features supported by this template
 
 qvm-features-request qrexec=1
+qvm-features-request os=Linux
 
 if [ -x /usr/bin/qubes-gui ]; then
     qvm-features-request gui=1

qubes-rpc/qrun-in-vm

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Send the command to the remote side, and then transfer stdin from local to
 # remote and stdout from remote to local.
 #

qubes-rpc/xdg-icon

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 import xdg.IconTheme
 import sys
 import os

qubesagent/xdg.py

@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 from gi.repository import Gio  # pylint: disable=import-error
 from gi.repository import GLib  # pylint: disable=import-error
 import sys