MAAS

Merge lp:~allenap/maas/blockdev-sudo-non-interactive into lp:~maas-committers/maas/trunk

  1. blockdev-sudo-non-interactive
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5653
Proposed branch: lp:~allenap/maas/blockdev-sudo-non-interactive
Merge into: lp:~maas-committers/maas/trunk
Prerequisite: lp:~allenap/maas/fewer-ignore-unused
Diff against target: 30 lines (+4/-4)
2 files modified
src/provisioningserver/refresh/node_info_scripts.py (+2/-2)
src/provisioningserver/refresh/tests/test_node_info_scripts.py (+2/-2)
To merge this branch: bzr merge lp:~allenap/maas/blockdev-sudo-non-interactive
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+315346@code.launchpad.net

Commit message

Use -n/--non-interactive when calling blockdev via sudo.

Previously `make run` and co. would issue password prompts.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Thanks for the fix. This has been a long-standing pet peeve of mine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
2--- src/provisioningserver/refresh/node_info_scripts.py 2016-11-03 16:06:25 +0000
3+++ src/provisioningserver/refresh/node_info_scripts.py 2017-01-23 11:56:32 +0000
4@@ -351,9 +351,9 @@
5 if id_path is not None:
6 block_info["ID_PATH"] = id_path
7 device_size = check_output(
8- ("sudo", "blockdev", "--getsize64", block_path))
9+ ("sudo", "-n", "blockdev", "--getsize64", block_path))
10 device_block_size = check_output(
11- ("sudo", "blockdev", "--getbsz", block_path))
12+ ("sudo", "-n", "blockdev", "--getbsz", block_path))
13 block_info["SIZE"] = device_size.decode("utf-8").strip()
14 block_info["BLOCK_SIZE"] = device_block_size.decode("utf-8").strip()
15
16
17=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
18--- src/provisioningserver/refresh/tests/test_node_info_scripts.py 2016-11-03 18:32:09 +0000
19+++ src/provisioningserver/refresh/tests/test_node_info_scripts.py 2017-01-23 11:56:32 +0000
20@@ -433,8 +433,8 @@
21 "lsblk", "--exclude", "1,2,7", "-d", "-P",
22 "-o", "NAME,RO,RM,MODEL,ROTA")),
23 call(("udevadm", "info", "-q", "all", "-n", name)),
24- call(("sudo", "blockdev", "--getsize64", "/dev/%s" % name)),
25- call(("sudo", "blockdev", "--getbsz", "/dev/%s" % name))))
26+ call(("sudo", "-n", "blockdev", "--getsize64", "/dev/%s" % name)),
27+ call(("sudo", "-n", "blockdev", "--getbsz", "/dev/%s" % name))))
28
29 def test__returns_block_device(self):
30 name = factory.make_name('name')