From b2b71ec874009fc293be9656975184a2556e57ed Mon Sep 17 00:00:00 2001
From: Ezekiel Dohmen <ezekiel.dohmen@ligo.org>
Date: Tue, 10 May 2022 16:04:47 -0700
Subject: [PATCH] Use SUDO_USER env var instead of hard coding controls user
---
src/drv/gpstime/Makefile | 4 +++-
src/drv/mbuf/Makefile | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/drv/gpstime/Makefile b/src/drv/gpstime/Makefile
index 8139d2d76..ad71dbc77 100644
--- a/src/drv/gpstime/Makefile
+++ b/src/drv/gpstime/Makefile
@@ -26,6 +26,8 @@ INSTDIR := /lib/modules/$(KVER)/extra
SYMVERSDIR := /var/cache/$(MODULENAME)
+SUDO_USER?= controls
+
obj-m += $(MODULENAME).o
$(MODULENAME)-y := $(MODULENAME)_core.o
$(MODULENAME)-y += ../../include/drv/spectracomGPS.o
@@ -57,7 +59,7 @@ install:
rm -f /dev/$(MODULENAME) ; \
fi
mknod /dev/$(MODULENAME) c `grep $(MODULENAME) /proc/devices|awk '{print $$1}'` 0
- chown controls /dev/$(MODULENAME)
+ chown $(SUDO_USER) /dev/$(MODULENAME)
# save Module.symvers if possible
mkdir -p $(SYMVERSDIR) || true
if [ -w $(SYMVERSDIR) ]; then cp Module.symvers $(SYMVERSDIR); fi
diff --git a/src/drv/mbuf/Makefile b/src/drv/mbuf/Makefile
index 254e96047..cd57f7d8d 100644
--- a/src/drv/mbuf/Makefile
+++ b/src/drv/mbuf/Makefile
@@ -24,6 +24,8 @@ INSTDIR := /lib/modules/$(KVER)/extra
SYMVERSDIR := /var/cache/$(MODULENAME)
+SUDO_USER?= controls
+
ifeq ($(KERNELRELEASE),)
#all: $(MODULENAME)_test
all:
@@ -50,7 +52,7 @@ install:
rm -f /dev/$(MODULENAME) ; \
fi
mknod /dev/$(MODULENAME) c `grep $(MODULENAME) /proc/devices|awk '{print $$1}'` 0
- chown controls /dev/$(MODULENAME)
+ chown $(SUDO_USER) /dev/$(MODULENAME)
# save Module.symvers if possible
mkdir -p $(SYMVERSDIR) || true
if [ -w $(SYMVERSDIR) ]; then cp Module.symvers $(SYMVERSDIR); fi
--
GitLab