Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package toolbox for openSUSE:Factory checked in at 2022-06-24 08:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/toolbox (Old) and /work/SRC/openSUSE:Factory/.toolbox.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "toolbox" Fri Jun 24 08:44:58 2022 rev:22 rq:984598 version:2.3+git20220622.32785f7 Changes: -------- --- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-06-04 23:26:47.856741363 +0200 +++ /work/SRC/openSUSE:Factory/.toolbox.new.1548/toolbox.changes 2022-06-24 08:45:06.507125594 +0200 @@ -1,0 +2,6 @@ +Wed Jun 22 19:48:29 UTC 2022 - [email protected] + +- Update to version 2.3+git20220622.32785f7: + * Only set --userns=keep-id when running rootless + +------------------------------------------------------------------- Old: ---- microos-toolbox-2.3+git20220603.bbeda2e.tar.xz New: ---- microos-toolbox-2.3+git20220622.32785f7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ toolbox.spec ++++++ --- /var/tmp/diff_new_pack.m37tAw/_old 2022-06-24 08:45:07.127126289 +0200 +++ /var/tmp/diff_new_pack.m37tAw/_new 2022-06-24 08:45:07.135126298 +0200 @@ -17,7 +17,7 @@ Name: toolbox -Version: 2.3+git20220603.bbeda2e +Version: 2.3+git20220622.32785f7 Release: 0 Summary: Script to start a toolbox container for system debugging License: Apache-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.m37tAw/_old 2022-06-24 08:45:07.207126379 +0200 +++ /var/tmp/diff_new_pack.m37tAw/_new 2022-06-24 08:45:07.211126383 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/microos-toolbox.git</param> - <param name="changesrevision">bbeda2e96bcd8dcf18a3b107ab7a3e868d56a74b</param> + <param name="changesrevision">32785f726a359255748f24ad1dd61fc3651453ef</param> </service> </servicedata> (No newline at EOF) ++++++ microos-toolbox-2.3+git20220603.bbeda2e.tar.xz -> microos-toolbox-2.3+git20220622.32785f7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-toolbox-2.3+git20220603.bbeda2e/toolbox new/microos-toolbox-2.3+git20220622.32785f7/toolbox --- old/microos-toolbox-2.3+git20220603.bbeda2e/toolbox 2022-06-03 13:05:18.000000000 +0200 +++ new/microos-toolbox-2.3+git20220622.32785f7/toolbox 2022-06-22 21:47:42.000000000 +0200 @@ -448,13 +448,15 @@ test -d "${HOME}" && VOLUMES="$VOLUMES --volume ${HOME}:${HOME}" test -d "/run/user/${USER_ID}" && VOLUMES="$VOLUMES --volume /run/user/${USER_ID}:/run/user/${USER_ID}:rslave" test -d /run/media && VOLUMES="$VOLUMES --volume /run/media/:/run/media/:rslave" - if [[ "$CLI" == "podman" ]]; then - CREATE_AS_USER="--userns=keep-id --user root:root $VOLUMES" + CREATE_AS_USER="--user root:root $VOLUMES" + if [[ "$CLI" == "podman" ]]; then # Let's retain the user's groupd. This will (probably) only work # with some runtime, but it's harmless for other, so worth a try. - CREATE_AS_USER=" $CREATE_AS_USER --annotation run.oci.keep_original_groups=1" - elif [[ "$CLI" == "docker" ]]; then - CREATE_AS_USER="--user root:root $VOLUMES" + CREATE_AS_USER="$CREATE_AS_USER --annotation run.oci.keep_original_groups=1" + # userns=keep-id only works if being used rootless + if [[ -z $SUDO ]]; then + CREATE_AS_USER="$CREATE_AS_USER --userns=keep-id" + fi fi for ENV in $USER_ENV ; do eval VAL="$""$ENV"
