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

code cleanup

Browse source
This commit is contained in:
Tobias Powalowski 2022-01-21 11:40:32 +01:00
parent 9101854d96
commit 9ebfd11305
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-mktorrent.sh
View file

@ -3,7 +3,7 @@
# install mktorrent from http://mktorrent.sourceforge.net/ # install mktorrent from http://mktorrent.sourceforge.net/
# check result on e.g. http://torrenteditor.com/ # check result on e.g. http://torrenteditor.com/
if [[ "${1}" = "" ]] || [[ "${2}" = "" ]]; then if [[ "${1}" = "" || "${2}" = "" ]]; then
echo "Usage: ${0} <version> <iso file>" echo "Usage: ${0} <version> <iso file>"
echo -e "\tversion:\te.g. 2009.05 or archboot/2009.05" echo -e "\tversion:\te.g. 2009.05 or archboot/2009.05"
echo -e "\tiso file:\te.g. ./archlinux-2009.05-core-x86_64.iso" echo -e "\tiso file:\te.g. ./archlinux-2009.05-core-x86_64.iso"

22
usr/bin/archboot-secureboot-keys.sh
View file

@ -23,7 +23,7 @@ _DIR="$2"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case ${1} in case ${1} in
-name=*|--name=*) NAME="$(echo ${1} | awk -F= '{print $2;}')" ;; -name=*|--name=*) NAME="$(echo "${1}" | awk -F= '{print $2;}')" ;;
-h|--h|?) usage ;; -h|--h|?) usage ;;
esac esac
shift shift
@ -41,20 +41,20 @@ if ! [[ ${UID} -eq 0 ]]; then
exit 1 exit 1
fi fi
if [[ ! -z "${_DIR}" ]]; then if [[ -n "${_DIR}" ]]; then
[[ ! -d $_DIR ]] && mkdir -p $_DIR [[ ! -d "${_DIR}" ]] && mkdir -p "${_DIR}"
cd $_DIR cd "${_DIR}" || exit 1
echo "Backup old keys in $_DIR/BACKUP ..." echo "Backup old keys in $_DIR/BACKUP ..."
[[ ! -d "BACKUP" ]] && mkdir BACKUP [[ ! -d "BACKUP" ]] && mkdir BACKUP
efi-readvar -v PK -o BACKUP/old_PK.esl efi-readvar -v PK -o BACKUP/old_PK.esl
efi-readvar -v KEK -o BACKUP/old_KEK.esl efi-readvar -v KEK -o BACKUP/old_KEK.esl
efi-readvar -v db -o BACKUP/old_db.esl efi-readvar -v db -o BACKUP/old_db.esl
efi-readvar -v dbx -o BACKUP/old_dbx.esl efi-readvar -v dbx -o BACKUP/old_dbx.esl
cd BACKUP; mokutil --export; cd .. cd BACKUP || exit 1; mokutil --export; cd .. || exit 1
echo "Generating Keys in $_DIR" echo "Generating Keys in $_DIR"
# add mkkeys.sh # add mkkeys.sh
if [[ ! -f /usr/bin/mkkeys.sh ]]; then if [[ ! -f /usr/bin/mkkeys.sh ]]; then
curl -s -L -O https://www.rodsbooks.com/efi-bootloaders/mkkeys.sh curl -s -L -O https://www.rodsbooks.com/efi-bootloaders/mkkeys.sh || exit 1
chmod 755 mkkeys.sh chmod 755 mkkeys.sh
./mkkeys.sh <<EOF ./mkkeys.sh <<EOF
${NAME} ${NAME}
@ -75,17 +75,17 @@ EOF
openssl x509 -in MOK.crt -out MOK.cer -outform DER openssl x509 -in MOK.crt -out MOK.cer -outform DER
DIRS="DB KEK MOK PK noPK" DIRS="DB KEK MOK PK noPK"
for i in $DIRS; do for i in $DIRS; do
[[ ! -d "$i" ]] && mkdir $i [[ ! -d "$i" ]] && mkdir "$i"
mv $i.* $i mv "$i.*" "$i"
done done
mv DB db mv DB db
[[ ! -d "GUID" ]] && mkdir GUID [[ ! -d "GUID" ]] && mkdir GUID
[[ ! -d "MS" ]] && mkdir MS [[ ! -d "MS" ]] && mkdir MS
mv myGUID.txt GUID mv myGUID.txt GUID
mv *.crt *.auth *.esl MS mv ./*.crt ./*.auth ./*.esl MS
cd .. cd ..
chmod 700 $_DIR chmod 700 "${_DIR}"
echo "Finished: Keys created in $_DIR" echo "Finished: Keys created in ${_DIR}"
else else
echo "ERROR: no directory specified" echo "ERROR: no directory specified"
usage usage