openmamba/desktop-base-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

os-makereport: fix reporting user journalctl when called by mambareport with pkexec instead of sudo

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-25 16:52:22 +01:00
parent 8b33dd6459
commit 6985ede105
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os-makereport/os-makereport
View File

@ -2,15 +2,20 @@
# #
# GNU/Linux O.S. report generation tool # GNU/Linux O.S. report generation tool
# #
# Copyright (c) 2008-2022 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2008-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
MAKEREPORT_VERSION=20220728 MAKEREPORT_VERSION=20240125
TEMPFILE=`mktemp` TEMPFILE=`mktemp`
. ${ROOT}/etc/sysconfig/machine . ${ROOT}/etc/sysconfig/machine
. ${ROOT}/etc/os-release . ${ROOT}/etc/os-release
if [ "${SUDO_USER}" == "" ]; then
# mambareport uses pkexec instead of sudo
SUDO_USER="\#${PKEXEC_UID}"
fi
[ ! "$SYSTEM_MANUFACTURER" -o "$SYSTEM_MANUFACTURER" = "System manufacturer" ] && { [ ! "$SYSTEM_MANUFACTURER" -o "$SYSTEM_MANUFACTURER" = "System manufacturer" ] && {
SYSTEM_MANUFACTURER=unknown SYSTEM_MANUFACTURER=unknown
} }
@ -120,7 +125,8 @@ _EOF
} }
echo "${NAME} report generation tool ${MAKEREPORT_VERSION}" echo "${NAME} report generation tool ${MAKEREPORT_VERSION}"
echo "Copyright (c) 2008-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>" echo "Copyright (c) 2008-2024 by Silvan Calarco <silvan@openmamba.org>"
echo "Released under the terms of the GNU GPL v3 license"
echo echo
[ $UID = 0 ] || { [ $UID = 0 ] || {