factory: do not mount /lib/{modules,firmware} for run mode

Do not mount /lib/{modules,firmware} for run mode, as in that case the
mounts will be created by snapd-generator from the base or from the
snapd deb package for hybrid systems.

factory/usr/lib/core/extra-paths

@@ -2,8 +2,16 @@
 
 set -eu
 
-cat <<EOF >>/sysroot/etc/fstab
+mode="$(/usr/libexec/core/get-mode mode)" ||
+    mode="$(/usr/libexec/core/get-arg snapd_recovery_mode)" || mode="unknown"
+
+cat <<'EOF' >>/sysroot/etc/fstab
 /run/mnt/data /writable none bind,x-initrd.mount 0 0
+EOF
+
+if [ "$mode" != "run" ]; 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