Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move qubes-firewall from sbin to bin

Browse Source
This commit is contained in:
Amadeusz Piotr Żołnowski 2019-11-25 23:47:08 +00:00
parent 7a155ac077
commit dee84452aa
No known key found for this signature in database
GPG Key ID: CBCC8023F59E1704
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -2,8 +2,6 @@ RPMS_DIR=rpm/
VERSION := $(shell cat version) VERSION := $(shell cat version)
SBINDIR ?= /usr/sbin
BINDIR ?= /usr/bin
LIBDIR ?= /usr/lib LIBDIR ?= /usr/lib
SYSLIBDIR ?= /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 # 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) PATH="/usr/bin:$(PATH)" $(PYTHON) setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR)
mkdir -p $(DESTDIR)$(SBINDIR)
# Networking install target includes: # Networking install target includes:
@ -183,12 +180,6 @@ install-netvm:
install -D -m 0644 vm-systemd/qubes-core-agent-linux.tmpfiles \ install -D -m 0644 vm-systemd/qubes-core-agent-linux.tmpfiles \
$(DESTDIR)/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf $(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 network/qubes-setup-dnat-to-ns $(DESTDIR)$(LIBDIR)/qubes/qubes-setup-dnat-to-ns
install -d $(DESTDIR)/etc/dhclient.d install -d $(DESTDIR)/etc/dhclient.d

1
archlinux/PKGBUILD
View File

@ -47,7 +47,6 @@ build() {
# Fix for archlinux sbindir # Fix for archlinux sbindir
sed 's:/usr/sbin/ntpdate:/usr/bin/ntpdate:g' -i qubes-rpc/sync-ntp-clock 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 for dir in qubes-rpc qrexec misc; do
make -C "$dir" make -C "$dir"

2
debian/qubes-core-agent-networking.install vendored
View File

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

2
rpm_spec/core-agent.spec.in
View File

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

2
vm-init.d/qubes-firewall
View File

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

2
vm-systemd/qubes-firewall.service
View File

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