mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-10-04 11:36:18 +02:00
Compare commits
1 Commits
a0ab546bd7
...
272-check-
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8125a81a98 |
@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
|
||||
makechrootpkg_args+=("${@:$OPTIND}")
|
||||
|
||||
# Automatically recreate the root chroot if a version mismatch is detected
|
||||
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
|
||||
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
|
||||
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
|
||||
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
||||
clean_first=true
|
||||
|
@@ -15,8 +15,8 @@ check_root() {
|
||||
local orig_argv=("$@")
|
||||
|
||||
(( EUID == 0 )) && return
|
||||
if type -P run0 && type -P pkexec >/dev/null; then
|
||||
exec run0 -- "${orig_argv[@]}"
|
||||
if type -P sudo >/dev/null; then
|
||||
exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
|
||||
else
|
||||
exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user