[Piuparts-devel] [Git][debian/piuparts][helmutg/feature-nonroot] 2 commits: install piuparts to /usr/bin

[Helmut Grohne (@helmutg)]

Helmut Grohne pushed to branch helmutg/feature-nonroot at Debian / piuparts


Commits:
64906cf7 by Helmut Grohne at 2024-05-14T17:47:37+02:00
install piuparts to /usr/bin

Since we can now run piuparts as a regular user, install it in a place
where a user can run it.

- - - - -
e6421d4a by Helmut Grohne at 2024-05-14T17:47:37+02:00
suggest installing uidmap

Unprivileged piuparts only works when uidmap is installed.

- - - - -


4 changed files:

- Makefile
- debian/control
- debian/piuparts.install
- slave-bin/slave_stop.in


Changes:

=====================================
Makefile
=====================================
@@ -1,5 +1,5 @@
 prefix = /usr/local
-sbindir = $(prefix)/sbin
+bindir = $(prefix)/bin
 sharedir = $(prefix)/share
 mandir = $(sharedir)/man
 man1dir = $(mandir)/man1
@@ -30,7 +30,7 @@ define placeholder_substitution
 	-e 's/__PIUPARTS_VERSION__/$(version)/g' \
 	-e 's%@libdir@%$(libdir)%g' \
 	-e 's%@sharedir@%$(sharedir)%g' \
-	-e 's%@sbindir@%$(sbindir)%g' \
+	-e 's%@bindir@%$(bindir)%g' \
 	$< > $@
 endef
 
@@ -146,8 +146,8 @@ install-master: build-master-stamp install-common
 	#install -m 0644 known_problems/*.conf $(DESTDIR)$(etcdir)/piuparts/known_problems/
 
 install-slave: install-common
-	install -d $(DESTDIR)$(sbindir)
-	install -m 0755 piuparts $(DESTDIR)$(sbindir)/
+	install -d $(DESTDIR)$(bindir)
+	install -m 0755 piuparts $(DESTDIR)$(bindir)/
 
 	install -d $(DESTDIR)$(sharedir)/piuparts
 	install -m 0755 piuparts-slave $(DESTDIR)$(sharedir)/piuparts/


=====================================
debian/control
=====================================
@@ -45,6 +45,7 @@ Recommends:
 Suggests:
  schroot,
  docker.io,
+ uidmap,
 Description: .deb package installation, upgrading, and removal testing tool
  piuparts tests that .deb packages (as used by Debian) handle
  installation, upgrading, and removal correctly. It does this by


=====================================
debian/piuparts.install
=====================================
@@ -1,2 +1,2 @@
-/usr/sbin/piuparts
+/usr/bin/piuparts
 /etc/piuparts/scripts*


=====================================
slave-bin/slave_stop.in
=====================================
@@ -45,7 +45,7 @@ while pgrep --full '/usr/bin/python3 @sharedir@/piuparts/piuparts-slave' > /dev/
 	echo -n "$(date -u +%T) - "
 	pgrep --full '/usr/bin/python3 @sharedir@/piuparts/piuparts-slave' | xargs -r echo -n "slaves running: "
 	SLEEP=$(( $i * $i ))
-	BUSY=$(ps fax | grep -v grep | grep '/usr/bin/python3 @sbindir@/piuparts' | awk '{print $NF}')
+	BUSY=$(ps fax | grep -v grep | grep '/usr/bin/python3 @bindir@/piuparts' | awk '{print $NF}')
 	if [ -n "$BUSY" ] ; then
 		# really/meaningful busy
 		echo



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/623beb1dfb70fa8030c96b18a07a48b6f80a83a6...e6421d4a333fb4fdf13d6a31746e8e449d0b7d01

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/623beb1dfb70fa8030c96b18a07a48b6f80a83a6...e6421d4a333fb4fdf13d6a31746e8e449d0b7d01
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20240514/745443ba/attachment-0001.htm>