factory: do not mount /lib/{modules,firmware} if there is a drivers tree

Do not mount /lib/{modules,firmware} in case snapd created a drivers
tree for our kernel snap, as in that case these mounts will be created
by snapd-generator from the base or from the snapd deb package for
hybrid systems. This situation is expected to happen only for UC24+.

factory/usr/lib/core/extra-paths

@@ -2,8 +2,14 @@
 
 set -eu
 
-cat <<EOF >>/sysroot/etc/fstab
+cat <<'EOF' >>/sysroot/etc/fstab
 /run/mnt/data /writable none bind,x-initrd.mount 0 0
+EOF
+
+# Mount /lib/{firmware,modules} only if there is no drivers tree created by snapd
+if [ ! -d /run/mnt/data/system-data/var/lib/snapd/kernel ]; then
+    cat <<'EOF' >>/sysroot/etc/fstab
 /run/mnt/kernel/firmware /usr/lib/firmware none bind,x-initrd.mount 0 0
 /run/mnt/kernel/modules /usr/lib/modules none bind,x-initrd.mount 0 0
 EOF
+fi

factory/usr/lib/systemd/system/detect-classic-sysroot.service

@@ -3,7 +3,6 @@ Description=Detect Ubuntu classic sysroot
 DefaultDependencies=no
 Before=initrd-root-device.target
 After=snap-initramfs-mounts.service
-Wants=classic-mounts.service
 
 ConditionPathIsMountPoint=!/run/mnt/base