root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

readd /usr/lib to LD_LIBRARY_PATH for grub2

Browse source
This commit is contained in:
Tobias Powalowski 2011-02-11 09:20:54 +01:00
parent 1bc494fc97
commit 11e65c9d93
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
usr/share/archboot/installer/setup
View file

@ -3640,17 +3640,17 @@ dogrub2_common_before() {
dogrub2_config() {
BOOT_FS_UUID=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_uuid ${DESTDIR}/boot 2>/dev/null)
BOOT_FS=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs ${DESTDIR}/boot 2>/dev/null)
BOOT_FS_UUID=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_uuid ${DESTDIR}/boot 2>/dev/null)
BOOT_FS=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs ${DESTDIR}/boot 2>/dev/null)
BOOT_FS_LABEL=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_label ${DESTDIR}/boot 2>/dev/null)
BOOT_DRIVE=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=drive ${DESTDIR}/boot 2>/dev/null)
BOOT_FS_LABEL=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_label ${DESTDIR}/boot 2>/dev/null)
BOOT_DRIVE=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=drive ${DESTDIR}/boot 2>/dev/null)
ROOT_FS_UUID=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_uuid ${DESTDIR}/ 2>/dev/null)
ROOT_FS=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs ${DESTDIR}/ 2>/dev/null)
ROOT_FS_UUID=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_uuid ${DESTDIR}/ 2>/dev/null)
ROOT_FS=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs ${DESTDIR}/ 2>/dev/null)
ROOT_FS_LABEL=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_label ${DESTDIR}/ 2>/dev/null)
ROOT_DEVICE=$(LD_LIBRARY_PATH=${DESTDIR}/lib ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=device ${DESTDIR}/ 2>/dev/null)
ROOT_FS_LABEL=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=fs_label ${DESTDIR}/ 2>/dev/null)
ROOT_DEVICE=$(LD_LIBRARY_PATH="${DESTDIR}/lib:${DESTDIR}/usr/lib" ${DESTDIR}/sbin/grub-probe --device-map=/tmp/device.map --target=device ${DESTDIR}/ 2>/dev/null)
subdir='/boot'
[[ "${ROOT_FS_UUID}" != "${BOOT_FS_UUID}" ]] && subdir=''