mirror of
https://gitlab.gnome.org/GNOME/gparted
synced 2024-07-02 15:58:47 +00:00
Compare commits
3 Commits
953aee55b7
...
5220984139
Author | SHA1 | Date | |
---|---|---|---|
|
5220984139 | ||
|
6588ff7835 | ||
|
ec9ae37816 |
|
@ -42,6 +42,7 @@ CLEANFILES = $(bin_SCRIPTS) $(DESKTOP_IN_FILES) $(polkit_action_in_FILES)
|
||||||
do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
|
do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
|
||||||
-e 's,[@]bindir[@],$(bindir),g' \
|
-e 's,[@]bindir[@],$(bindir),g' \
|
||||||
-e 's,[@]gksuprog[@],$(GKSUPROG),g' \
|
-e 's,[@]gksuprog[@],$(GKSUPROG),g' \
|
||||||
|
-e 's,[@]gksuprog_fallback[@],$(GKSUPROG_FALLBACK),g' \
|
||||||
-e 's,[@]enable_xhost_root[@],$(ENABLE_XHOST_ROOT),g'
|
-e 's,[@]enable_xhost_root[@],$(ENABLE_XHOST_ROOT),g'
|
||||||
|
|
||||||
gparted.desktop.in: gparted.desktop.in.in Makefile
|
gparted.desktop.in: gparted.desktop.in.in Makefile
|
||||||
|
|
32
configure.ac
32
configure.ac
|
@ -23,6 +23,26 @@ PKG_CHECK_EXISTS
|
||||||
dnl======================
|
dnl======================
|
||||||
dnl Find graphical privilege escalation program
|
dnl Find graphical privilege escalation program
|
||||||
dnl======================
|
dnl======================
|
||||||
|
|
||||||
|
AC_ARG_WITH(
|
||||||
|
[gksuprog],
|
||||||
|
AS_HELP_STRING(
|
||||||
|
[--with-gksuprog=XXX],
|
||||||
|
[Graphical program to get root permisisons, default is pkexec (polkit)]),
|
||||||
|
[GKSUPROG="$withval"],
|
||||||
|
[GKSUPROG="pkexec --disable-internal-agent"]
|
||||||
|
)
|
||||||
|
|
||||||
|
AC_ARG_WITH(
|
||||||
|
[gksuprog-fallback],
|
||||||
|
AS_HELP_STRING(
|
||||||
|
[--with-gksuprog-fallback=XXX],
|
||||||
|
[Enable runtime fallback to another graphical program to get root permisisons]),
|
||||||
|
[GKSUPROG_FALLBACK="$withval"],
|
||||||
|
[GKSUPROG_FALLBACK=""]
|
||||||
|
)
|
||||||
|
|
||||||
|
if echo "$GKSUPROG" | grep -q ^pkexec; then
|
||||||
dnl Check for pkexec >= 0.102 for it's ability to run X11 apps.
|
dnl Check for pkexec >= 0.102 for it's ability to run X11 apps.
|
||||||
AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], false)
|
AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], false)
|
||||||
PKEXEC_REQUIRED_VERSION='0.102'
|
PKEXEC_REQUIRED_VERSION='0.102'
|
||||||
|
@ -35,14 +55,19 @@ if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then
|
||||||
PKEXEC_FOUND_INT=`echo "$PKEXEC_FOUND_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
|
PKEXEC_FOUND_INT=`echo "$PKEXEC_FOUND_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
|
||||||
AC_MSG_RESULT([$PKEXEC_FOUND_VERSION found])
|
AC_MSG_RESULT([$PKEXEC_FOUND_VERSION found])
|
||||||
if test "$PKEXEC_FOUND_INT" -ge "$PKEXEC_REQUIRED_INT"; then
|
if test "$PKEXEC_FOUND_INT" -ge "$PKEXEC_REQUIRED_INT"; then
|
||||||
GKSUPROG='pkexec --disable-internal-agent'
|
|
||||||
AC_SUBST([GKSUPROG])
|
|
||||||
AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], true)
|
AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], true)
|
||||||
|
else
|
||||||
|
# unset default GKSUPROG from pkexec
|
||||||
|
GKSUPROG=''
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(GKSUPROG)
|
||||||
|
AC_SUBST(GKSUPROG_FALLBACK)
|
||||||
|
|
||||||
dnl Check for alternative graphical privilege escalation programs.
|
dnl Check for alternative graphical privilege escalation programs.
|
||||||
if test "x$GKSUPROG" = 'x'; then
|
if test "x$GKSUPROG" = 'x' && test "x$GKSUPROG_FALLBACK" = 'x'; then
|
||||||
AC_CHECK_PROGS([GKSUPROG], [gksudo gksu kdesudo "xdg-su -c"], [])
|
AC_CHECK_PROGS([GKSUPROG], [gksudo gksu kdesudo "xdg-su -c"], [])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -340,7 +365,6 @@ else
|
||||||
fi
|
fi
|
||||||
AC_SUBST([ENABLE_XHOST_ROOT], $enable_xhost_root)
|
AC_SUBST([ENABLE_XHOST_ROOT], $enable_xhost_root)
|
||||||
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
data/Makefile
|
data/Makefile
|
||||||
|
|
17
gparted.in
17
gparted.in
|
@ -50,10 +50,15 @@ if test "x`id -u`" != "x0"; then
|
||||||
# non-root to display the graphical error about needing root
|
# non-root to display the graphical error about needing root
|
||||||
# privileges.
|
# privileges.
|
||||||
#
|
#
|
||||||
if test "x@gksuprog@" = "x"; then
|
|
||||||
|
run_noroot(){
|
||||||
echo "Root privileges are required for running gparted."
|
echo "Root privileges are required for running gparted."
|
||||||
$BASE_CMD
|
$BASE_CMD
|
||||||
exit 1
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if test "x@gksuprog@" = "x" && test "x@gksuprog_fallback@" = "x"; then
|
||||||
|
run_noroot
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -75,7 +80,15 @@ if test "x`id -u`" != "x0"; then
|
||||||
#
|
#
|
||||||
# Run gparted as root.
|
# Run gparted as root.
|
||||||
#
|
#
|
||||||
@gksuprog@ '@bindir@/gparted' "$@"
|
if [ -x "$(command -v @gksuprog@)" ]; then
|
||||||
|
GKSUPROG="@gksuprog@"
|
||||||
|
# check if fallback program was defined at build time and if it is available
|
||||||
|
elif [ -n "@gksuprog_fallback@" ] && [ -x "$(command -v @gksuprog_fallback@)" ]; then
|
||||||
|
GKSUPROG="@gksuprog_fallback@"
|
||||||
|
else
|
||||||
|
run_noroot
|
||||||
|
fi
|
||||||
|
${GKSUPROG} '@bindir@/gparted' "$@"
|
||||||
status=$?
|
status=$?
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -26,6 +26,7 @@ gd
|
||||||
gl
|
gl
|
||||||
gu
|
gu
|
||||||
he
|
he
|
||||||
|
hi
|
||||||
hr
|
hr
|
||||||
hu
|
hu
|
||||||
id
|
id
|
||||||
|
|
Loading…
Reference in New Issue
Block a user