mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
extlinux and syslinux fixes
This commit is contained in:
parent
00b48226ad
commit
0b173fff87
1 changed files with 10 additions and 2 deletions
|
@ -2791,11 +2791,15 @@ EOF
|
||||||
cp ${DESTDIR}/usr/lib/syslinux/*.c32 ${DESTDIR}/boot/
|
cp ${DESTDIR}/usr/lib/syslinux/*.c32 ${DESTDIR}/boot/
|
||||||
cat ${MBR} > ${ROOTDEV}
|
cat ${MBR} > ${ROOTDEV}
|
||||||
[ -e ${DESTDIR}/boot/ldlinux.sys ] && rm ${DESTDIR}/boot/ldlinux.sys
|
[ -e ${DESTDIR}/boot/ldlinux.sys ] && rm ${DESTDIR}/boot/ldlinux.sys
|
||||||
chroot /usr/bin/extlinux --install /boot >$LOG 2>&1
|
chroot_mount
|
||||||
|
chroot $DESTDIR extlinux --install /boot >$LOG 2>&1
|
||||||
if [ $? -gt 0 ]; then
|
if [ $? -gt 0 ]; then
|
||||||
|
chroot_umount
|
||||||
DIALOG --msgbox "Error installing EXTLINUX. (see $LOG for output)" 0 0
|
DIALOG --msgbox "Error installing EXTLINUX. (see $LOG for output)" 0 0
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
[ -f "/src/isolinux/splash.png" ] && cp /src/isolinux/splash.png $DESTDIR/boot
|
||||||
|
chroot_umount
|
||||||
DIALOG --msgbox "EXTLINUX was successfully installed." 0 0
|
DIALOG --msgbox "EXTLINUX was successfully installed." 0 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2912,11 +2916,15 @@ EOF
|
||||||
cp ${DESTDIR}/usr/lib/syslinux/*.c32 ${DESTDIR}/boot/
|
cp ${DESTDIR}/usr/lib/syslinux/*.c32 ${DESTDIR}/boot/
|
||||||
cat ${MBR} > ${ROOTDEV}
|
cat ${MBR} > ${ROOTDEV}
|
||||||
[ -e ${DESTDIR}/boot/ldlinux.sys ] && rm ${DESTDIR}/boot/ldlinux.sys
|
[ -e ${DESTDIR}/boot/ldlinux.sys ] && rm ${DESTDIR}/boot/ldlinux.sys
|
||||||
$DESTDIR/usr/bin/syslinux $bootdev >$LOG 2>&1
|
chroot_mount
|
||||||
|
chroot $DESTDIR syslinux $bootdev >$LOG 2>&1
|
||||||
if [ $? -gt 0 ]; then
|
if [ $? -gt 0 ]; then
|
||||||
|
chroot_umount
|
||||||
DIALOG --msgbox "Error installing SYSLINUX. (see $LOG for output)" 0 0
|
DIALOG --msgbox "Error installing SYSLINUX. (see $LOG for output)" 0 0
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
[ -f "/src/isolinux/splash.png" ] && cp /src/isolinux/splash.png $DESTDIR/boot
|
||||||
|
chroot_umount
|
||||||
DIALOG --msgbox "SYSLINUX was successfully installed." 0 0
|
DIALOG --msgbox "SYSLINUX was successfully installed." 0 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue