diff --git a/xCAT-server/share/xcat/install/centos/compute.centos8.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos8.tmpl index 3719fd0c6f..47883b685c 100644 --- a/xCAT-server/share/xcat/install/centos/compute.centos8.tmpl +++ b/xCAT-server/share/xcat/install/centos/compute.centos8.tmpl @@ -48,9 +48,13 @@ echo "Running Kickstart Pre-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels8# } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.ng# diff --git a/xCAT-server/share/xcat/install/openeuler/compute.openeuler.tmpl b/xCAT-server/share/xcat/install/openeuler/compute.openeuler.tmpl index a022871a5f..81693da645 100644 --- a/xCAT-server/share/xcat/install/openeuler/compute.openeuler.tmpl +++ b/xCAT-server/share/xcat/install/openeuler/compute.openeuler.tmpl @@ -27,9 +27,13 @@ echo "Running Kickstart Pre-installation script..." } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash --erroronfail mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.openeuler# diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels10.riscv64.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels10.riscv64.tmpl index 63e697b6bb..6ad5f24316 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels10.riscv64.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels10.riscv64.tmpl @@ -55,9 +55,13 @@ echo "Running Kickstart Pre-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels10# } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.rhels10# diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels10.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels10.tmpl index 3c90ba493d..8e5596971b 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels10.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels10.tmpl @@ -42,9 +42,13 @@ echo "Running Kickstart Pre-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels10# } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.rhels10# diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl index 64daf4a34f..e758bc7489 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl @@ -47,9 +47,13 @@ echo "Running Kickstart Pre-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels8# } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.ng# diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels9.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels9.tmpl index 6cb3a98883..bffe965899 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels9.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels9.tmpl @@ -42,9 +42,13 @@ echo "Running Kickstart Pre-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels8# } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.ng# diff --git a/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.tmpl b/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.tmpl index bc1cc270bd..2866a3b1d3 100644 --- a/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.tmpl +++ b/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.tmpl @@ -55,9 +55,13 @@ echo "Running Kickstart Pre-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels8# } &>>/tmp/pre-install.log %end +# The pre-installation log is in the installer's /tmp, which a chroot %post cannot read. +%post --nochroot --interpreter=/bin/bash +mkdir -p /mnt/sysimage/var/log/xcat/ +cat /tmp/pre-install.log >>/mnt/sysimage/var/log/xcat/xcat.log +%end %post --interpreter=/bin/bash mkdir -p /var/log/xcat/ -cat /tmp/pre-install.log >>/var/log/xcat/xcat.log { echo "Running Kickstart Post-installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.ng#