faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove host system package checks

Browse Source 
Not needed as we ensure files are in the ISO dir

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2008-12-19 23:26:45 -06:00
parent a3fc771d90
commit 485838e9a9
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
archiso/mkarchiso
View File

@ -209,30 +209,14 @@ command_iso () {
_imgcommon _imgcommon
bootflags="" bootflags=""
if [ "$PKGLIST" = "grub" -o "$PKGLIST" = "grub-gfx" ]; then if [ "$PKGLIST" = "grub" ]; then
#test for either (eww, gross)
tst=0
pacman -Qi grub >/dev/null 2>&1
tst=$(($tst + $?))
pacman -Qi grub-gfx >/dev/null 2>&1
tst=$(($tst + $?))
if [ $tst -ge 2 ]; then
echo "grub or grub-gfx not found on host system. Cannot install!"
exit 1
fi
if [ ! -e "${work_dir}/iso/boot/grub/stage2_eltorito" ]; then if [ ! -e "${work_dir}/iso/boot/grub/stage2_eltorito" ]; then
echo "error: grub stage files not found in '${work_dir}/iso/boot/grub'" echo "error: grub stage files not found in '${work_dir}/iso/boot/grub'"
exit 1 exit 1
fi fi
bootflags="-b boot/grub/stage2_eltorito" bootflags="-b boot/grub/stage2_eltorito"
elif [ "$PKGLIST" = "isolinux" ]; then elif [ "$PKGLIST" = "syslinux" ]; then
if ! pacman -Qi $PKGLIST >/dev/null 2>&1; then
echo "$PKGLIST not found on host system. Cannot install!"
exit 1
fi
if [ ! -e "${work_dir}/iso/boot/isolinux/isolinux.bin" ]; then if [ ! -e "${work_dir}/iso/boot/isolinux/isolinux.bin" ]; then
echo "error: isolinux bin file not found in '${work_dir}/iso/boot/isolinux'" echo "error: isolinux bin file not found in '${work_dir}/iso/boot/isolinux'"
exit 1 exit 1
@ -243,8 +227,7 @@ command_iso () {
echo "No bootloader specified. Use the -p flag to specify" echo "No bootloader specified. Use the -p flag to specify"
echo " Supported Bootloaders:" echo " Supported Bootloaders:"
echo " grub" echo " grub"
echo " grub-gfx" echo " syslinux"
echo " isolinux"
exit 1 exit 1
fi fi