summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordermotbradley <dermot_bradley@yahoo.com>2021-05-08 02:54:56 +0100
committerGitHub <noreply@github.com>2021-05-07 20:54:56 -0500
commit77320bfcdafa4ba63bb59be63d11c4d7414e5f92 (patch)
treeb7c4222532a7ab2f789b6287d2ffac3319b10799
parent8cf40a73646a9448746fc4043c6410ae92172e7c (diff)
downloadvyos-cloud-init-77320bfcdafa4ba63bb59be63d11c4d7414e5f92.tar.gz
vyos-cloud-init-77320bfcdafa4ba63bb59be63d11c4d7414e5f92.zip
cc_disk_setup.py: remove UDEVADM_CMD definition as not used (#886)
UDEVADM_CMD is defined but not actually used in cc_disk_setup.py so remove it. Also modify the comment at top of read_parttbl function to remove the reference to udevadm which implies it is used to scan the partition table.
-rw-r--r--cloudinit/config/cc_disk_setup.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index a582924b..22af3813 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -107,7 +107,6 @@ import shlex
frequency = PER_INSTANCE
# Define the commands to use
-UDEVADM_CMD = subp.which('udevadm')
SFDISK_CMD = subp.which("sfdisk")
SGDISK_CMD = subp.which("sgdisk")
LSBLK_CMD = subp.which("lsblk")
@@ -686,9 +685,8 @@ def get_partition_layout(table_type, size, layout):
def read_parttbl(device):
"""
- Use `partprobe` or `blkdev` instead of `udevadm`. `Partprobe` is
- preferred over `blkdev` since it is more reliably able to probe
- the partition table.
+ `Partprobe` is preferred over `blkdev` since it is more reliably
+ able to probe the partition table.
"""
if PARTPROBE_CMD is not None:
probe_cmd = [PARTPROBE_CMD, device]