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

80-rhel/aarch64.tmpl

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

80-rhel/config_files/common/sshd_config.anaconda

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

80-rhel/live/live-install.tmpl

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

80-rhel/ppc.tmpl

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

80-rhel/runtime-install.tmpl

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

80-rhel/runtime-postinstall.tmpl

@@ -28,10 +28,6 @@ symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
 mkdir etc/systemd/system/local-fs.target.wants/
 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
 systemctl disable systemd-readahead-collect.service \
                   systemd-readahead-replay.service \

80-rhel/s390.tmpl

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

80-rhel/x86.tmpl

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