diff options
author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /libre/grub/20_memtest86+ | |
parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to 'libre/grub/20_memtest86+')
-rw-r--r-- | libre/grub/20_memtest86+ | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+ deleted file mode 100644 index 1d3096f6b..000000000 --- a/libre/grub/20_memtest86+ +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then - # image exists, create menu entry - echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 - cat << EOF -menuentry "Memory test (memtest86+)" $CLASS { -EOF - prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" - cat << EOF - linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` -} -EOF -fi |