curtin-dev team mailing list archive

[Olivier Gayot <mp+473583@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
> index dc26a8c..7506c4a 100644
> --- a/curtin/commands/block_meta.py
> +++ b/curtin/commands/block_meta.py
> @@ -1330,10 +1336,10 @@ def get_volume_spec(device_path):
>          if len(devlinks) == 0:
>              # use FS UUID if present
>              devlinks = [link for link in info['DEVLINKS']
> -                        if '/by-uuid' in link]
> -            if len(devlinks) == 0 and block_type == 'part':
> -                devlinks = [link for link in info['DEVLINKS']
> -                            if '/by-partuuid' in link]
> +                        if devlink_is_child_of(link, '/dev/disk/by-uuid')]
> +        if len(devlinks) == 0 and block_type == 'part':

Good catch! Yes, I figured nesting the if wasn't necessary.

The second if can only evaluate to true if the first one also evaluates to true.

> +            devlinks = [link for link in info['DEVLINKS']
> +                        if devlink_is_child_of(link, '/dev/disk/by-partuuid')]
>  
>      return devlinks[0] if len(devlinks) else device_path
>  


-- 
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/473583
Your team curtin developers is subscribed to branch curtin:master.