View | Details | Raw Unified | Return to bug 53322
Collapse All | Expand All

(-)a/util/grub.d/10_linux.in (-1 / +1 lines)
Lines 55-61 if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) Link Here
55
	&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
55
	&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
56
    || ( ! findfs UUID="${GRUB_DEVICE_UUID}" > /dev/null 2>&1 \
56
    || ( ! findfs UUID="${GRUB_DEVICE_UUID}" > /dev/null 2>&1 \
57
	&& ! findfs PARTUUID="${GRUB_DEVICE_PARTUUID}" > /dev/null 2>&1 ) \
57
	&& ! findfs PARTUUID="${GRUB_DEVICE_PARTUUID}" > /dev/null 2>&1 ) \
58
    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm && ! uses_abstraction "${GRUB_DEVICE}" luks ); then
58
    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm && ! uses_abstraction "${GRUB_DEVICE}" luks && ! uses_abstraction "${GRUB_DEVICE}" luks2); then
59
  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
59
  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
60
elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
60
elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
61
    || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then
61
    || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then

Return to bug 53322