mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
final fix for isoinfo extraction and signing
This commit is contained in:
parent
dae00e1552
commit
9f504f23a6
4 changed files with 11 additions and 11 deletions
|
@ -57,11 +57,11 @@ echo "Create boot directory ..."
|
|||
mkdir -p boot/licenses/amd-ucode
|
||||
for i in *.iso; do
|
||||
if ! grep -q latest "$i"; then
|
||||
isoinfo -R -i "${i}" -x /boot/amd-ucode.img > boot/amd-ucode.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_aarch64.img > boot/initramfs_archboot_aarch64.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/vmlinuz_aarch64 > boot/vmlinuz_archboot_aarch64 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/amd-ucode.img 2>/dev/null > boot/amd-ucode.img
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_aarch64.img >/dev/null > boot/initramfs_archboot_aarch64.img
|
||||
isoinfo -R -i "${i}" -x /boot/vmlinuz_aarch64 2>/dev/null > boot/vmlinuz_archboot_aarch64
|
||||
else
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_aarch64.img > boot/initramfs_archboot_latest_aarch64.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_aarch64.img 2>/dev/null > boot/initramfs_archboot_latest_aarch64.img
|
||||
fi
|
||||
done
|
||||
cp /usr/share/licenses/amd-ucode/* boot/licenses/amd-ucode/
|
||||
|
|
|
@ -7,7 +7,7 @@ _SERVER_HOME="/home/tpowa/"
|
|||
_SERVER_DIR="/home/tpowa/public_html/archboot-images"
|
||||
_USER="tobias"
|
||||
_GROUP="users"
|
||||
_GPG="--detach-sign --no-armor --batch --passphrase-file /etc/archboot/gpg.passphrase --pinentry-mode loopback -u 7EDF681F -z 0"
|
||||
_GPG="--detach-sign --no-armor --batch --passphrase-file /etc/archboot/gpg.passphrase --pinentry-mode loopback -u 7EDF681F"
|
||||
_PACMAN_AARCH__BUILDDIR="/home/tobias/Arch/iso"
|
||||
_PACMAN_AARCH_SERVERDIR="/home/tpowa/public_html/archboot-helper/pacman-chroot-aarch64"
|
||||
_PACMAN_AARCH64="pacman-aarch64-chroot"
|
||||
|
|
|
@ -62,12 +62,12 @@ echo "Create boot directory ..."
|
|||
mkdir -p boot/licenses/{amd-ucode,intel-ucode}
|
||||
for i in *.iso; do
|
||||
if ! grep -q latest "${i}"; then
|
||||
isoinfo -R -i "${i}" -x /boot/amd-ucode.img > boot/amd-ucode.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/intel-ucode.img > boot/intel-ucode.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_x86_64.img > boot/initramfs_archboot_x86_64.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/vmlinuz_x86_64 > boot/vmlinuz_archboot_x86_64 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/amd-ucode.img 2>/dev/null > boot/amd-ucode.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/intel-ucode.img 2>/dev/null > boot/intel-ucode.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_x86_64.img 2>/dev/null > boot/initramfs_archboot_x86_64.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/vmlinuz_x86_64 2>/dev/null > boot/vmlinuz_archboot_x86_64 2>&1
|
||||
else
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_x86_64.img > boot/initramfs_archboot_latest_x86_64.img 2>&1
|
||||
isoinfo -R -i "${i}" -x /boot/initramfs_x86_64.img 2>/dev/null > boot/initramfs_archboot_latest_x86_64.img 2>&1
|
||||
fi
|
||||
done
|
||||
cp /usr/share/licenses/amd-ucode/* boot/licenses/amd-ucode/
|
||||
|
|
|
@ -9,7 +9,7 @@ _SERVER_HOME="/home/tpowa/"
|
|||
_SERVER_DIR="/home/tpowa/public_html/archboot-images"
|
||||
_USER="tobias"
|
||||
_GROUP="users"
|
||||
_GPG="--detach-sign --batch --no-armor --passphrase-file /etc/archboot/gpg.passphrase --pinentry-mode loopback -u 7EDF681F -z 0"
|
||||
_GPG="--detach-sign --batch --no-armor --passphrase-file /etc/archboot/gpg.passphrase --pinentry-mode loopback -u 7EDF681F"
|
||||
|
||||
### check for root
|
||||
if ! [[ ${UID} -eq 0 ]]; then
|
||||
|
|
Loading…
Reference in a new issue