diff --git a/build.sh b/build.sh index f7d3a9b..ca59c69 100644 --- a/build.sh +++ b/build.sh @@ -80,6 +80,7 @@ GRUBENV="${GRUB_ROOT}/grubenv" GRUB_ENV="${ROOT}/grub.env" GRUB_HEAD='# GRUB Environment Block' GRUB_PUB="${GRUB_ROOT}/grub.pgp" +GRUB_SHIGNED="${DIRECTORY}/grubx64.efi.signed.sh" # wipe ⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅ @@ -91,39 +92,12 @@ rm --force --recursive \ mkdir --parents "${MEMDISK_DIRECTORY}" echo -n "\ -function set_init { - search --no-floppy --set data \\ - --fs-uuid '${DATA}' - # - search --no-floppy --set esp \\ - --fs-uuid '${ESP}' - if [ \"\${esp}\" ] ; then - env=\"(\${esp})/grub.env\" - live=\"(\${esp})/${PROJECT}/live\" - # - for file in \${live}/source/*.sh ; do - source \"\${file}\" - done - unset file - fi -} - -function normal_init { - check_signatures='no' - pager=1 - # - set_init - if [ \"\${esp}\" ] ; then - prefix=\"(\${esp})/grub\" - root=\"\${esp}\" - # - normal \"\${live}/normal.sh\" - fi -} - -normal_init +# header " > "${MEMDISK_FILE}" -# gpg --detach-sign "${MEMDISK_FILE}" +cat "${GRUB_SHIGNED}" >> "${MEMDISK_FILE}" +echo -n "\ +# footer +" >> "${MEMDISK_FILE}" gpg --export "${PGP_PUB}" > "${MEMDISK_PUB}" # gpg --detach-sign "${MEMDISK_PUB}" diff --git a/grubx64.sh b/grubx64.efi.signed.sh similarity index 100% rename from grubx64.sh rename to grubx64.efi.signed.sh diff --git a/readme.md b/readme.md index 666d80a..1dd35d7 100644 --- a/readme.md +++ b/readme.md @@ -60,22 +60,16 @@ Build an ESP File System including: * build * echo section lists & modules + * args/pgp + * args/esp & lsgm/cp * keyboard layouts * mimic grubx64.efi.signed * efi * bios - * args/esp & lsgm/cp * grub.cfg * check squashfs * option - * progress * end grubenv with \n -* pgp - * variablize - * directory - * build with keys - * trust keys - * add tails ![Graph](todo.svg)