TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change location of GPG key we use for repo creation, to match

Browse Source 
the pre-existing key location for TrueNAS SCALE
This commit is contained in:
Kris Moore
2020-05-08 09:42:55 -04:00
parent c525b57583
commit ea1621495a
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/build.sh
View File

@@ -61,8 +61,9 @@ make_bootstrapdir() {
if [ -n "$1" ] ; then
CDBUILD=1
DEOPTS="--components=main,contrib,nonfree --variant=minbase --include=gnupg,grub-pc,grub-efi-amd64-bin"
DEOPTS="--components=main,contrib,nonfree --variant=minbase --include=gnupg,grub-pc,grub-efi-amd64-signed"
else
DEOPTS=""
unset CDBUILD
fi
@@ -71,11 +72,11 @@ make_bootstrapdir() {
mount -t tmpfs -o size=4G tmpfs ${TMPFS}
# Bootstrap the debian base system
apt-key add keys/truenas.gpg 2>/dev/null >/dev/null || exit_err "Failed adding truenas.gpg apt-key"
apt-key --keyring /etc/apt/trusted.gpg.d/debian-archive-truenas-automatic.gpg add keys/truenas.gpg 2>/dev/null >/dev/null || exit_err "Failed adding truenas.gpg apt-key"
aptrepo=$(jq -r '."apt-repos"."url"' $MANIFEST)
aptdist=$(jq -r '."apt-repos"."distribution"' $MANIFEST)
aptcomp=$(jq -r '."apt-repos"."components"' $MANIFEST)
debootstrap ${DEOPTS} --keyring /etc/apt/trusted.gpg \
debootstrap ${DEOPTS} --keyring /etc/apt/trusted.gpg.d/debian-archive-truenas-automatic.gpg \
bullseye ${CHROOT_BASEDIR} $aptrepo \
|| exit_err "Failed debootstrap"
mount proc ${CHROOT_BASEDIR}/proc -t proc
@@ -303,6 +304,8 @@ install_iso_packages() {
mount proc ${CHROOT_BASEDIR}/proc -t proc
mount sysfs ${CHROOT_BASEDIR}/sys -t sysfs
mkdir -p ${CHROOT_BASEDIR}/packages
echo "/dev/disk/by-label/TRUENAS / iso9660 loop 0 0" > ${CHROOT_BASEDIR}/etc/fstab
mount --bind ${PKG_DIR} ${CHROOT_BASEDIR}/packages || exit_err "Failed mount --bind /packages"
chroot ${CHROOT_BASEDIR} apt update || exit_err "Failed apt update"
@@ -323,8 +326,14 @@ make_iso_file() {
if [ -d "${RELEASE_DIR}/release" ] ; then
rm -rf ${RELEASE_DIR}
fi
# Lets make squashfs now
mksquashfs ${CHROOT_BASEDIR} ./tmp/truenas.squashfs
mv ./tmp/truenas.squashfs ${CHROOT_BASEDIR}/
mkdir -p ${RELEASE_DIR}
grub-mkrescue -o ${RELEASE_DIR}/TrueNAS-SCALE.iso ${CHROOT_BASEDIR} || exit_err "Failed grub-mkrescue"
grub-mkrescue -o ${RELEASE_DIR}/TrueNAS-SCALE.iso ${CHROOT_BASEDIR} \
|| exit_err "Failed grub-mkrescue"
}
make_iso() {

4
scripts/grub.cfg
View File

@@ -1,4 +1,4 @@
if loadfont $prefix/font.pf2 ; then
if loadfont $prefix/fonts/unicode.pf2 ; then
set gfxmode=800x600
set gfxpayload=keep
insmod efi_gop
@@ -34,6 +34,6 @@ play 960 440 1 0 4 440 1
set theme=/boot/grub/theme/1
menuentry --hotkey=i 'Start TrueNAS SCALE Installation' {
set background_color=black
linux /vmlinuz vga=788 --- quiet console=ttyS0,9600 console=tty0
linux /vmlinuz vga=788 --- quiet console=ttyS0,9600 console=tty0 toram=truenas.squashfs
initrd /initrd.img
}