Merge remote-tracking branch 'cs/c9s' into eln

This commit is contained in:
Stephen Gallagher 2022-01-26 17:00:50 -05:00
commit bf0a8bcac8
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
8 changed files with 5 additions and 7 deletions

View File

@ -78,6 +78,7 @@ mkdir ${KERNELDIR}
runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \ runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
${efiargs} -R -J -V '${isolabel}' \ ${efiargs} -R -J -V '${isolabel}' \
-graft-points \ -graft-points \
.discinfo=${outroot}/.discinfo \
${KERNELDIR}=${outroot}/${KERNELDIR} \ ${KERNELDIR}=${outroot}/${KERNELDIR} \
${STAGE2IMG}=${outroot}/${STAGE2IMG} \ ${STAGE2IMG}=${outroot}/${STAGE2IMG} \
${efigraft} ${filegraft} ${efigraft} ${filegraft}

View File

@ -6,3 +6,4 @@ SyslogFacility AUTHPRIV
PasswordAuthentication yes PasswordAuthentication yes
PermitEmptyPasswords yes PermitEmptyPasswords yes
PermitUserEnvironment yes PermitUserEnvironment yes
Subsystem sftp internal-sftp

View File

@ -15,7 +15,6 @@
installpkg grub2-tools-efi installpkg grub2-tools-efi
installpkg efibootmgr installpkg efibootmgr
installpkg shim-x64 grub2-efi-x64-cdboot installpkg shim-x64 grub2-efi-x64-cdboot
installpkg shim-ia32 grub2-efi-ia32-cdboot
%endif %endif
%if basearch in ("i386", "x86_64"): %if basearch in ("i386", "x86_64"):
installpkg biosdevname memtest86+ syslinux installpkg biosdevname memtest86+ syslinux

View File

@ -107,6 +107,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
-hfs-volid ${product.version} -hfs-bless ${outroot}/${MACDIR} \ -hfs-volid ${product.version} -hfs-bless ${outroot}/${MACDIR} \
-map ${inroot}/${configdir}/mapping \ -map ${inroot}/${configdir}/mapping \
-no-desktop -allow-multidot ${udfargs} -graft-points \ -no-desktop -allow-multidot ${udfargs} -graft-points \
.discinfo=${outroot}/.discinfo \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ${BOOTDIR}=${outroot}/${BOOTDIR} \
${GRUBDIR}=${outroot}/${GRUBDIR} \ ${GRUBDIR}=${outroot}/${GRUBDIR} \
${STAGE2IMG}=${outroot}/${STAGE2IMG} ${filegraft} ${STAGE2IMG}=${outroot}/${STAGE2IMG} ${filegraft}

View File

@ -43,7 +43,6 @@ installpkg glibc-all-langpacks
installpkg grub2-tools-efi installpkg grub2-tools-efi
installpkg efibootmgr installpkg efibootmgr
installpkg shim-x64 grub2-efi-x64-cdboot installpkg shim-x64 grub2-efi-x64-cdboot
installpkg shim-ia32 grub2-efi-ia32-cdboot
%endif %endif
%if basearch in ("i386", "x86_64"): %if basearch in ("i386", "x86_64"):
installpkg biosdevname memtest86+ syslinux installpkg biosdevname memtest86+ syslinux
@ -128,7 +127,6 @@ installpkg hdparm
%if basearch not in ("arm", "armhfp"): %if basearch not in ("arm", "armhfp"):
installpkg libmlx4 rdma-core installpkg libmlx4 rdma-core
%endif %endif
installpkg rng-tools
%if basearch in ("i386", "x86_64", "aarch64"): %if basearch in ("i386", "x86_64", "aarch64"):
installpkg dmidecode installpkg dmidecode
%endif %endif

View File

@ -28,10 +28,6 @@ symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
mkdir etc/systemd/system/local-fs.target.wants/ mkdir etc/systemd/system/local-fs.target.wants/
symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount
## Start rngd
mkdir etc/systemd/system/basic.target.wants/
symlink /lib/systemd/system/rngd.service etc/systemd/system/basic.target.wants/rngd.service
## Disable unwanted systemd services ## Disable unwanted systemd services
systemctl disable systemd-readahead-collect.service \ systemctl disable systemd-readahead-collect.service \
systemd-readahead-replay.service \ systemd-readahead-replay.service \

View File

@ -83,6 +83,7 @@ runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
-boot-load-size 4 -no-emul-boot \ -boot-load-size 4 -no-emul-boot \
-R -J -V '${isolabel}' -graft-points \ -R -J -V '${isolabel}' -graft-points \
.discinfo=${outroot}/.discinfo \ .discinfo=${outroot}/.discinfo \
generic.ins=${outroot}/generic.ins \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ${BOOTDIR}=${outroot}/${BOOTDIR} \
${filegraft} ${filegraft}
treeinfo images-${basearch} boot.iso images/boot.iso treeinfo images-${basearch} boot.iso images/boot.iso

View File

@ -127,6 +127,7 @@ runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
-boot-load-size 4 -boot-info-table -no-emul-boot \ -boot-load-size 4 -boot-info-table -no-emul-boot \
${efiargs} -R -J -V '${isolabel}' \ ${efiargs} -R -J -V '${isolabel}' \
-graft-points \ -graft-points \
.discinfo=${outroot}/.discinfo \
${STAGE2IMG}=${outroot}/${STAGE2IMG} \ ${STAGE2IMG}=${outroot}/${STAGE2IMG} \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ${BOOTDIR}=${outroot}/${BOOTDIR} \
${KERNELDIR}=${outroot}/${KERNELDIR} \ ${KERNELDIR}=${outroot}/${KERNELDIR} \