diff --git a/debian/changelog b/debian/changelog index b5f3160..8d02439 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +initramfs-tools (0.142-0deepin10) unstable; urgency=medium + + * resolve device by decreasing priority + + -- Liang Bo Wed, 05 Nov 2025 14:15:41 +0800 + initramfs-tools (0.142-0deepin9) unstable; urgency=medium * Optimize support for fix-init diff --git a/debian/patches/series b/debian/patches/series index 18b65f8..466ab4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ uniontech-fix-mul-update-initramfs-process.patch uniontech-wait_udev_in_s4.patch uniontech-support-fix-init.patch uniontech-check-init.patch +uniontech-resolve-device-by-decreasing-priority.patch \ No newline at end of file diff --git a/debian/patches/uniontech-resolve-device-by-decreasing-priority.patch b/debian/patches/uniontech-resolve-device-by-decreasing-priority.patch new file mode 100644 index 0000000..b94a176 --- /dev/null +++ b/debian/patches/uniontech-resolve-device-by-decreasing-priority.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/functions b/scripts/functions +index ae11b96..c94dc52 100644 +--- a/scripts/functions ++++ b/scripts/functions +@@ -431,7 +431,7 @@ resolve_device() { + + case "$DEV" in + LABEL=* | UUID=* | PARTLABEL=* | PARTUUID=*) +- DEV="$(blkid -l -t "$DEV" -o device)" || return 1 ++ DEV="$(blkid -t "$DEV" -o device | tail -n 1)" || return 1 + ;; + esac + [ -e "$DEV" ] && echo "$DEV"