rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Waiting for poweroff/reboot processes. Using full poweroff/reboot paths for sudoers files.

Browse source
This commit is contained in:
Roland 2023-08-18 11:32:12 -06:00
parent 2537017039
commit 5ffb8bee8d
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pi-gen/stage2/04-wrolpi/03-run-chroot.sh
View file

@ -67,8 +67,8 @@ cat >/etc/sudoers.d/90-wrolpi <<'EOF'
%wrolpi ALL= NOPASSWD:/usr/bin/systemctl stop wrolpi-app.service
%wrolpi ALL= NOPASSWD:/usr/bin/systemctl start wrolpi-app.service
%wrolpi ALL= NOPASSWD:/opt/wrolpi/scripts/import_map.sh
%wrolpi ALL= NOPASSWD:poweroff
%wrolpi ALL= NOPASSWD:reboot
%wrolpi ALL= NOPASSWD:/usr/sbin/poweroff
%wrolpi ALL= NOPASSWD:/usr/sbin/reboot
EOF
chmod 660 /etc/sudoers.d/90-wrolpi

4
scripts/install_debian_11.sh
View file

@ -89,8 +89,8 @@ cat >/etc/sudoers.d/90-wrolpi <<'EOF'
%wrolpi ALL= NOPASSWD:/usr/bin/systemctl stop wrolpi-app.service
%wrolpi ALL= NOPASSWD:/usr/bin/systemctl start wrolpi-app.service
%wrolpi ALL= NOPASSWD:/opt/wrolpi/scripts/import_map.sh
%wrolpi ALL= NOPASSWD:poweroff
%wrolpi ALL= NOPASSWD:reboot
%wrolpi ALL= NOPASSWD:/usr/sbin/poweroff
%wrolpi ALL= NOPASSWD:/usr/sbin/reboot
EOF
chmod 660 /etc/sudoers.d/90-wrolpi
# Verify this new file is valid.

4
scripts/install_raspberrypios.sh
View file

@ -99,8 +99,8 @@ cat >/etc/sudoers.d/90-wrolpi <<'EOF'
%wrolpi ALL= NOPASSWD:/usr/bin/systemctl stop wrolpi-app.service
%wrolpi ALL= NOPASSWD:/usr/bin/systemctl start wrolpi-app.service
%wrolpi ALL= NOPASSWD:/opt/wrolpi/scripts/import_map.sh
%wrolpi ALL= NOPASSWD:poweroff
%wrolpi ALL= NOPASSWD:reboot
%wrolpi ALL= NOPASSWD:/usr/sbin/poweroff
%wrolpi ALL= NOPASSWD:/usr/sbin/reboot
EOF
chmod 660 /etc/sudoers.d/90-wrolpi
# Verify this new file is valid.

2
wrolpi/admin.py
View file

@ -156,6 +156,7 @@ async def restart():
cmd = f'{SUDO_BIN} reboot'
proc = await asyncio.create_subprocess_shell(cmd, stderr=asyncio.subprocess.PIPE,
stdout=asyncio.subprocess.PIPE)
stdout, stderr = await proc.communicate()
except subprocess.CalledProcessError as e:
raise RestartFailed() from e
@ -174,6 +175,7 @@ async def shutdown():
cmd = f'{SUDO_BIN} poweroff'
proc = await asyncio.create_subprocess_shell(cmd, stderr=asyncio.subprocess.PIPE,
stdout=asyncio.subprocess.PIPE)
stdout, stderr = await proc.communicate()
except subprocess.CalledProcessError as e:
raise ShutdownFailed() from e