brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2024-12-22 20:20:06 +09:00
Code Issues Projects Releases Wiki Activity

Revert "Run root check before attempting nonint functions"

Browse Source 
This reverts commit 73e3017715.

Not all raspi-config functions require root in nonint mode. Some
scripts rely on this behaviour. Therefore, nonint will assume the
user knows what they're doing instead.
This commit is contained in:
Serge Schneider 2022-04-25 16:41:27 +01:00
parent 73e3017715
commit 224369d93b
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,9 +1,3 @@
raspi-config (20220425) UNRELEASED; urgency=medium
* Run root check before attempting nonint functions
-- Serge Schneider <serge@raspberrypi.com> Mon, 25 Apr 2022 15:00:17 +0100
raspi-config (20220419) bullseye; urgency=medium raspi-config (20220419) bullseye; urgency=medium
* Reinstate -R parameter for xcompmgr * Reinstate -R parameter for xcompmgr

12
raspi-config
View File

@ -2809,12 +2809,6 @@ nonint() {
"$@" "$@"
} }
# Everything needs to be run as root
if [ $(id -u) -ne 0 ]; then
printf "Script must be run as root. Try 'sudo raspi-config'\n"
exit 1
fi
# #
# Command line options for non-interactive use # Command line options for non-interactive use
# #
@ -2860,6 +2854,12 @@ done
# exit 0 # exit 0
#fi #fi
# Everything else needs to be run as root
if [ $(id -u) -ne 0 ]; then
printf "Script must be run as root. Try 'sudo raspi-config'\n"
exit 1
fi
if [ -n "${OPT_MEMORY_SPLIT:-}" ]; then if [ -n "${OPT_MEMORY_SPLIT:-}" ]; then
set -e # Fail when a command errors set -e # Fail when a command errors
set_memory_split "${OPT_MEMORY_SPLIT}" set_memory_split "${OPT_MEMORY_SPLIT}"