Skip to content

Move meminfo-writer to /usr/bin #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Move meminfo-writer to /usr/bin #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/qubes-utils.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
usr/sbin/meminfo-writer
usr/bin/meminfo-writer
lib/systemd/system/qubes-meminfo-writer.service
usr/lib/qubes/*
usr/lib/udev/*
Expand Down
4 changes: 2 additions & 2 deletions qmemman/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CC=gcc
CFLAGS+=-Wall -Wextra -Werror -g -O3
all: meminfo-writer
SBINDIR?=/usr/sbin
BINDIR?=/usr/bin

_XENSTORE_H=$(shell ls /usr/include/xenstore.h)
ifneq "$(_XENSTORE_H)" ""
Expand All @@ -11,7 +11,7 @@ endif
meminfo-writer: meminfo-writer.o
$(CC) $(LDFLAGS) -g -o meminfo-writer meminfo-writer.o -lxenstore
install:
install -D meminfo-writer $(DESTDIR)/$(SBINDIR)/meminfo-writer
install -D meminfo-writer $(DESTDIR)/$(BINDIR)/meminfo-writer
ifeq (1,${DEBIANBUILD})
install -d $(DESTDIR)/lib/systemd/system/
install -m 0644 qubes-meminfo-writer.service $(DESTDIR)/lib/systemd/system/
Expand Down
2 changes: 1 addition & 1 deletion qmemman/qubes-meminfo-writer-dom0.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ConditionPathExists=/run/qubes/qmemman.sock

[Service]
Type=simple
ExecStart=/usr/sbin/meminfo-writer 30000 100000
ExecStart=/usr/bin/meminfo-writer 30000 100000
RemainAfterExit=yes

[Install]
Expand Down
2 changes: 1 addition & 1 deletion qmemman/qubes-meminfo-writer.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Before=systemd-user-sessions.service

[Service]
Type=forking
ExecStart=/usr/sbin/meminfo-writer 30000 100000 /run/meminfo-writer.pid
ExecStart=/usr/bin/meminfo-writer 30000 100000 /run/meminfo-writer.pid
PIDFile=/run/meminfo-writer.pid

[Install]
Expand Down
2 changes: 1 addition & 1 deletion rpm_spec/qubes-utils.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
%_tmpfilesdir/xen-devices-qubes.conf
%dir %{_prefix}/lib/qubes
%{_prefix}/lib/qubes/udev-*
%{_sbindir}/meminfo-writer
%{_bindir}/meminfo-writer
%{_unitdir}/qubes-meminfo-writer.service
%{_unitdir}/qubes-meminfo-writer-dom0.service
%dir %_includedir/qubes
Expand Down
1 change: 0 additions & 1 deletion selinux/qubes-meminfo-writer.fc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/usr/bin/meminfo-writer -- gen_context(system_u:object_r:qubes_meminfo_writer_exec_t,s0)
/usr/sbin/meminfo-writer -- gen_context(system_u:object_r:qubes_meminfo_writer_exec_t,s0)
/run/meminfo-writer\.pid -- gen_context(system_u:object_r:qubes_meminfo_writer_var_run_t,s0)