public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Reiter <s.reiter@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v2 proxmox-backup 2/2] d/postinst: always fixup termproxy user id and for all users
Date: Tue,  1 Sep 2020 14:27:28 +0200	[thread overview]
Message-ID: <20200901122728.12566-2-s.reiter@proxmox.com> (raw)
In-Reply-To: <20200901122728.12566-1-s.reiter@proxmox.com>

Anyone with a PAM account and Sys.Console access could have started a
termproxy session, adapt the regex.

Always run the sed expression to make sure eventually all occurences of
the broken syntax are fixed.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---

v2: new patch

This one is definitely necessary though, as otherwise broken entries will just
remain forever. This way they'll at least be fixed up eventually at some
upgrade (and for all users, not just root@pam).

 debian/postinst | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 9ab78798..bc414ccb 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,12 +15,8 @@ case "$1" in
 	fi
 	deb-systemd-invoke $_dh_action proxmox-backup.service proxmox-backup-proxy.service >/dev/null || true
 
-	if test -n "$2"; then
-		if dpkg --compare-versions "$2" 'le' '0.8.10-1'; then
-			echo "Fixing up termproxy user id in task log..."
-			flock -w 30 /var/log/proxmox-backup/tasks/active.lock sed -i 's/:termproxy::root: /:termproxy::root@pam: /' /var/log/proxmox-backup/tasks/active
-		fi
-	fi
+	echo "Fixing up termproxy user id in task log..."
+	flock -w 30 /var/log/proxmox-backup/tasks/active.lock sed -i 's/:termproxy::\([^@]\+\): /:termproxy::\1@pam: /' /var/log/proxmox-backup/tasks/active
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
-- 
2.20.1





  reply	other threads:[~2020-09-01 12:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-01 12:27 [pbs-devel] [PATCH v2 proxmox-backup 1/2] upid: add workaround for parsing broken termproxy userids Stefan Reiter
2020-09-01 12:27 ` Stefan Reiter [this message]
2020-09-01 13:21   ` [pbs-devel] [PATCH v2 proxmox-backup 2/2] d/postinst: always fixup termproxy user id and for all users Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200901122728.12566-2-s.reiter@proxmox.com \
    --to=s.reiter@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal