Move qubes-firewall from sbin to bin

Makefile

@@ -2,8 +2,6 @@ RPMS_DIR=rpm/
 
 VERSION := $(shell cat version)
 
-SBINDIR ?= /usr/sbin
-BINDIR ?= /usr/bin
 LIBDIR ?= /usr/lib
 SYSLIBDIR ?= /lib
 
@@ -161,7 +159,6 @@ install-common: install-doc
 
 	# force /usr/bin before /bin to have /usr/bin/python instead of /bin/python
 	PATH="/usr/bin:$(PATH)" $(PYTHON) setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR)
-	mkdir -p $(DESTDIR)$(SBINDIR)
 
 
 # Networking install target includes:
@@ -183,12 +180,6 @@ install-netvm:
 	install -D -m 0644 vm-systemd/qubes-core-agent-linux.tmpfiles \
 		$(DESTDIR)/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
 
-	mkdir -p $(DESTDIR)$(SBINDIR)
-
-ifneq ($(SBINDIR),/usr/bin)
-	mv $(DESTDIR)/usr/bin/qubes-firewall $(DESTDIR)$(SBINDIR)/qubes-firewall
-endif
-
 	install -D network/qubes-setup-dnat-to-ns $(DESTDIR)$(LIBDIR)/qubes/qubes-setup-dnat-to-ns
 
 	install -d $(DESTDIR)/etc/dhclient.d

archlinux/PKGBUILD

@@ -47,7 +47,6 @@ build() {
 
     # 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
 
     for dir in qubes-rpc qrexec misc; do
         make -C "$dir"

debian/qubes-core-agent-networking.install

@@ -18,4 +18,4 @@ usr/lib/qubes/iptables-updates-proxy
 usr/lib/qubes/qubes-setup-dnat-to-ns
 usr/lib/qubes/setup-ip
 usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
-usr/sbin/qubes-firewall
+usr/bin/qubes-firewall

rpm_spec/core-agent.spec.in

@@ -743,7 +743,7 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/qubes-setup-dnat-to-ns
 /usr/lib/qubes/setup-ip
 /usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
-/usr/sbin/qubes-firewall
+/usr/bin/qubes-firewall
 
 %files network-manager
 /etc/NetworkManager/dispatcher.d/30-qubes-external-ip

vm-init.d/qubes-firewall

@@ -20,7 +20,7 @@ start()
     if qsvc qubes-firewall ; then
         echo -n $"Starting Qubes Firewall monitor:"
         /sbin/ethtool -K "$(get_qubes_managed_iface)" sg off
-        /usr/sbin/qubes-firewall &
+        /usr/bin/qubes-firewall &
         success
         echo ""
     fi

vm-systemd/qubes-firewall.service

@@ -6,7 +6,7 @@ Before=qubes-network.service
 
 [Service]
 Type=notify
-ExecStart=/usr/sbin/qubes-firewall
+ExecStart=/usr/bin/qubes-firewall
 
 [Install]
 WantedBy=multi-user.target