raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-21 06:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Require 'sudo' for --edit or --apply instead of spawing sudo command

Browse Source
This commit is contained in:
Tim Gover
2020-09-30 11:39:35 +01:00
parent 6ab4179bae
commit e63f3dcfc3
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rpi-eeprom-config
View File

@@ -109,7 +109,7 @@ def apply_update(config, eeprom=None, config_src=None):
# Ignore APT package checksums so that this doesn't fail when used # Ignore APT package checksums so that this doesn't fail when used
# with EEPROMs with configs delivered outside of APT. # with EEPROMs with configs delivered outside of APT.
# The checksums are really just a safety check for automatic updates. # The checksums are really just a safety check for automatic updates.
args = ['sudo', 'rpi-eeprom-update', '-d', '-i', '-f', tmp_update] args = ['rpi-eeprom-update', '-d', '-i', '-f', tmp_update]
resp = shell_cmd(args) resp = shell_cmd(args)
sys.stdout.write(resp) sys.stdout.write(resp)
@@ -278,7 +278,10 @@ Operating modes:
4. Applies a given config file to an EEPROM image and invokes rpi-eeprom-update 4. Applies a given config file to an EEPROM image and invokes rpi-eeprom-update
to schedule an update of the bootloader when the system is rebooted. to schedule an update of the bootloader when the system is rebooted.
rpi-eeprom-config --apply boot.conf [pieeprom.bin] Since this command launches rpi-eeprom-update to schedule the EERPOM update
it must be run as root.
sudo rpi-eeprom-config --apply boot.conf [pieeprom.bin]
If the \'eeprom\' argument is not specified then the latest available image If the \'eeprom\' argument is not specified then the latest available image
is selected by calling \'rpi-eeprom-update -l\'. is selected by calling \'rpi-eeprom-update -l\'.
@@ -287,12 +290,15 @@ Operating modes:
applying a predefined configuration file the default text editor ($EDITOR) is applying a predefined configuration file the default text editor ($EDITOR) is
launched with the contents of the current EEPROM configuration. launched with the contents of the current EEPROM configuration.
Since this command launches rpi-eeprom-update to schedule the EERPOM update
it must be run as root.
The configuration file will be taken from: The configuration file will be taken from:
* The `eeprom` file - if specified. * The `eeprom` file - if specified.
* The current pending update - typically /boot/pieeprom.upd * The current pending update - typically /boot/pieeprom.upd
* The cached bootloader configuration 'vcgencmd bootloader_config' * The cached bootloader configuration 'vcgencmd bootloader_config'
rpi-eeprom-config --edit [pieeprom.bin] sudo rpi-eeprom-config --edit [pieeprom.bin]
See 'rpi-eeprom-update -h' for more information about the available EEPROM See 'rpi-eeprom-update -h' for more information about the available EEPROM
images. images.
@@ -308,6 +314,10 @@ images.
parser.add_argument('eeprom', nargs='?', help='Name of EEPROM file to use as input') parser.add_argument('eeprom', nargs='?', help='Name of EEPROM file to use as input')
args = parser.parse_args() args = parser.parse_args()
if (args.edit or args.apply is not None) and os.getuid() != 0:
exit_error("--edit/--apply must be run as root")
if args.edit: if args.edit:
edit_config(args.eeprom) edit_config(args.eeprom)
elif args.apply is not None: elif args.apply is not None: