mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf

@@ -48,6 +48,7 @@ Packages=
         hostname
         iproute2
         iputils-ping
+        isc-dhcp-server
         knot
         libcap-ng-utils
         libdw-dev

mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf

@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[TriggerMatch]
-Distribution=debian
-Release=bullseye
-Release=bookworm
-Release=trixie
-
-[TriggerMatch]
-Distribution=ubuntu
-Release=jammy
-Release=noble
-Release=questing
-
-[Content]
-Packages=isc-dhcp-server

src/shared/discover-image.c

@@ -455,26 +455,10 @@ static int image_make(
         uint64_t on_mount_id;
         int _mnt_id;
 
-        /* The fallback is required for CentOS 9 compatibility when working on a directory located on an
-         * overlayfs. */
         r = name_to_handle_at_try_fid(fd, /* path= */ NULL, &fh, &_mnt_id, &on_mount_id, AT_EMPTY_PATH);
-        if (r < 0) {
-                if (is_name_to_handle_at_fatal_error(r))
-                        return r;
-
-                r = path_get_unique_mnt_id_at(fd, /* path= */ NULL, &on_mount_id);
-                if (r < 0) {
-                        if (!ERRNO_IS_NEG_NOT_SUPPORTED(r) && r != -EUNATCH)
-                                return r;
-
-                        int on_mount_id_fallback = -1;
-                        r = path_get_mnt_id_at(fd, /* path= */ NULL, &on_mount_id_fallback);
         if (r < 0)
                 return r;
-
+        if (r == 0)
-                        on_mount_id = on_mount_id_fallback;
-                }
-        } else if (r == 0)
                 on_mount_id = _mnt_id;
 
         if (S_ISDIR(st->st_mode)) {