I think this will cause problems during pkgsel (or for certain kinds of ubiquity installs), because apt-cdrom won't be able to make use of packages on the CD.
Instead, in the USB install case I think we need to remove /cdrom from /etc/fstab at the end of the installation, in a finish-install script (for d-i) and in custom scripts/install.py code (for ubiquity).
I think this will cause problems during pkgsel (or for certain kinds of ubiquity installs), because apt-cdrom won't be able to make use of packages on the CD.
Instead, in the USB install case I think we need to remove /cdrom from /etc/fstab at the end of the installation, in a finish-install script (for d-i) and in custom scripts/install.py code (for ubiquity).