What were you trying to do that didn't work?
Diff of lorax-templates-rhel-10.0-52.el10 and lorax-templates-generic-40.5.6-1.el10 shows that there are pieces in lorax-templates-generic that should be updated:
[jstodola@fedora templates.d]$ diff -ru 80-rhel/ 99-generic/ Only in 80-rhel/config_files/common: libuser.conf
It should be added back to lorax-templates-generic, the libuser package is part of RHEL-10. Revert https://github.com/weldr/lorax/commit/e810619d6ca3254b9f07e4ab399e7214c20ab117.
diff -ru 80-rhel/runtime-cleanup.tmpl 99-generic/runtime-cleanup.tmpl
--- 80-rhel/runtime-cleanup.tmpl 2024-08-15 13:14:06.555386894 +0200
+++ 99-generic/runtime-cleanup.tmpl 2024-08-15 13:14:16.371410062 +0200
@@ -309,7 +309,7 @@
/etc/mtab \
/usr/sbin/{agetty,blkid,blockdev,fsck,losetup,mkswap,partx,swapoff,swapon}
removefrom volume_key-libs /usr/share/locale/*
-removefrom wget /etc/* /usr/share/locale/*
+removefrom wget2 /usr/share/locale/*
removefrom wpa_supplicant /usr/sbin/eapol_test
removefrom yelp /usr/share/yelp/mathjax*
see related RHEL-45269 and revert https://github.com/weldr/lorax/commit/130529e3997ffcabc1c1961c2d74d90c27d9cf32
diff -ru 80-rhel/runtime-install.tmpl 99-generic/runtime-install.tmpl --- 80-rhel/runtime-install.tmpl 2024-08-15 13:14:06.555386894 +0200 +++ 99-generic/runtime-install.tmpl 2024-08-15 13:14:16.371410062 +0200 @@ -8,7 +8,6 @@ ## anaconda package installpkg anaconda anaconda-widgets kdump-anaconda-addon anaconda-install-img-deps -installpkg redhat-release-eula
IMO, the only expected/valid difference between the templates.
## FIXME Pull in device-mapper-multipath ## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not @@ -160,7 +159,7 @@ ## extra tools not required by anaconda installpkg nano installpkg vim-minimal strace lsof xz less -installpkg wget rsync bind-utils ftp mtr +installpkg wget2-wget rsync bind-utils ftp mtr installpkg spice-vdagent installpkg hexedit sg3_utils installpkg perl-interpreter
see related RHEL-45269 and revert https://github.com/weldr/lorax/commit/9316d88d68eac3ec1491167a3c3a17d213990ff0
diff -ru 80-rhel/runtime-postinstall.tmpl 99-generic/runtime-postinstall.tmpl
--- 80-rhel/runtime-postinstall.tmpl 2024-08-15 13:14:06.555386894 +0200
+++ 99-generic/runtime-postinstall.tmpl 2024-08-15 13:14:16.371410062 +0200
@@ -64,7 +64,6 @@
install ${configdir}/rsyslog.conf etc
install ${configdir}/bash_history root/.bash_history
install ${configdir}/profile root/.profile
-install ${configdir}/libuser.conf etc
install ${configdir}/sysctl.conf etc/sysctl.d/anaconda.conf
install ${configdir}/spice-vdagentd etc/sysconfig
mkdir etc/NetworkManager/conf.d
As above, revert https://github.com/weldr/lorax/commit/e810619d6ca3254b9f07e4ab399e7214c20ab117.
@@ -119,12 +118,6 @@
remove etc/nvme/hostid
remove etc/nvme/hostnqn
-## Record the package versions used to create the image
-## rpm initializes nss, which requires /dev/urandom to be present, hence the mknod
-runcmd chroot ${root} /usr/bin/mknod -m 666 /dev/random c 1 8
-runcmd chroot ${root} /usr/bin/mknod -m 666 /dev/urandom c 1 9
-runcmd chroot ${root} /usr/bin/rpm -qa --pipe "tee /root/lorax-packages.log"
-
Is there a reason the commands are missing from lorax-templates-generic?
## TODO: we could run prelink here if we wanted? ## fix fonconfig cache containing timestamps diff -ru 80-rhel/s390.tmpl 99-generic/s390.tmpl --- 80-rhel/s390.tmpl 2024-08-15 13:14:06.555386894 +0200 +++ 99-generic/s390.tmpl 2024-08-15 13:14:16.371410062 +0200 @@ -1,4 +1,4 @@ -<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/> +<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, isolabel"/>
Discussed in RHEL-35396, but it should be also unified in lorax or lorax-templates-rhel.
<% configdir="tmp/config_files/s390" BOOTDIR="images" [jstodola@fedora templates.d]$
Please provide the package NVR for which bug is seen:
lorax-templates-rhel-10.0-52.el10
lorax-templates-generic-40.5.6-1.el10
How reproducible:
Always
Steps to reproduce
- diff extracted templates
Expected results
Minimal changes in the templates.
Actual results
Unexpected diffs.
- duplicates
-
RHEL-54713 [RHEL-10.0] Sync lorax-templates-rhel and lorax-templates-generic
-
- Release Pending
-
- is related to
-
-
- Release Pending
-
-
-
- Release Pending
-
-
-
- Release Pending
-
- relates to
-
-
- Release Pending
-