← Back to team overview

curtin-dev team mailing list archive

Re: [Merge] ~ogayot/curtin:filter-out-ventoy into curtin:master

 

I'd like a unit test please.  Maybe something based on the probedata from the bug report?

Diff comments:

> diff --git a/curtin/storage_config.py b/curtin/storage_config.py
> index b1d48cb..2424004 100644
> --- a/curtin/storage_config.py
> +++ b/curtin/storage_config.py
> @@ -1119,6 +1119,14 @@ class MountParser(ProbertParser):
>          # no floppy, no cdrom
>          if self.blockdev_data[source]['MAJOR'] in ["11", "2"]:
>              return {}
> +        # When using ventoy, if any mount is found for /cdrom, it will not be a
> +        # block device with major number 11 but a dev/mapper device named
> +        # "ventoy".
> +        # See https://bugs.launchpad.net/bugs/2012722
> +        # TODO: ideally, we should not rely on the value of the DM_NAME
> +        # attribute. Other image loading systems will have a different value.
> +        if self.blockdev_data[source].get("DM_NAME") == "ventoy":
> +            return {}

log statement please.  If someone has an unfortunately named device this will be the only clue what's going on.

>  
>          source_id = self.blockdev_to_id(self.blockdev_data[source])
>          return {'type': 'mount',


-- 
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/439863
Your team curtin developers is requested to review the proposed merge of ~ogayot/curtin:filter-out-ventoy into curtin:master.



References