Review: Needs Fixing The commit message will need fixing. I often just copy a useful commit message from the commit stream.
If you have several commits and we don't want them squashed then I suggest adding "do not squash" like was done in https://code.launchpad.net/~curtin-dev/curtin/+git/curtin/+merge/461452 With a fix to the destination (see comments) and making the CI robot happy, this should be fine. Please also pull into a VM test to confirm. Diff comments: > diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py > index 63a24fe..98cb34b 100644 > --- a/curtin/commands/curthooks.py > +++ b/curtin/commands/curthooks.py > @@ -920,6 +920,29 @@ def copy_crypttab(crypttab, target): > shutil.copy(crypttab, os.path.sep.join([target, 'etc/crypttab'])) > > > +def copy_cdrom(cdrom: str, target: str) -> None: > + """Copy installation media metadata""" > + > + base: str = f"{cdrom}/.disk" > + ubuntu_dist_channel: str = f"{base}/ubuntu_dist_channel" > + media_info: str = f"{base}/info" > + > + tdir: str = os.path.sep.join([target, "/var/log/installer"]) > + util.ensure_dir(tdir) > + > + if os.path.exists(media_info): > + LOG.info("copying media-info into target") > + shutil.copy(media_info, f"{tdir}/media-info") We do copy this one to /target/var/lib/installer/media-info > + else: > + LOG.warn(f"{media_info} not found, skipping") > + > + if os.path.exists(ubuntu_dist_channel): > + LOG.info("copying ubuntu_dist_channel into target") > + shutil.copy(ubuntu_dist_channel, f"{tdir}/ubuntu_dist_channel") This one needs to go to /target/var/lib/ubuntu_dist_channel > + else: > + LOG.warn(f"{ubuntu_dist_channel} not found, skipping") > + > + > def copy_iscsi_conf(nodes_dir, target, target_nodes_dir='etc/iscsi/nodes'): > if not nodes_dir: > LOG.warn("nodes directory must be specified, not copying") -- https://code.launchpad.net/~cpete/curtin/+git/curtin/+merge/462092 Your team curtin developers is subscribed to branch curtin:master. -- Mailing list: https://launchpad.net/~curtin-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~curtin-dev More help : https://help.launchpad.net/ListHelp
