diff --git a/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist deleted file mode 100644 index cfcb8349f7..0000000000 --- a/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist +++ /dev/null @@ -1,2 +0,0 @@ -xcat/xcat-core/xCATsn -xcat/xcat-dep/rh10/riscv64/goconserver diff --git a/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist new file mode 120000 index 0000000000..e434c04403 --- /dev/null +++ b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist @@ -0,0 +1 @@ +../../netboot/rocky/service.rocky10.riscv64.otherpkgs.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.tmpl deleted file mode 100644 index dbf34f13c7..0000000000 --- a/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.tmpl +++ /dev/null @@ -1,79 +0,0 @@ -# Use text install -text -# Use network installation -%include /tmp/repos -# Keyboard layouts -keyboard --vckeymap=us --xlayouts='us' -# System language -lang en_US.UTF-8 - -# Network information -#KICKSTARTNET# -# Root password -rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# -# Not run the Setup Agent on first boot -firstboot --disable -# Do not configure the X Window System -skipx -# System services -#services --enabled="chronyd" -# System timezone -timezone #TABLE:site:key=timezone:value# --utc -# Partition clearing information -zerombr -clearpart --all --initlabel -#XCAT_PARTITION_START# -%include /tmp/partitionfile -#XCAT_PARTITION_END# - -# Do not configure any iptables rules -firewall --disable -selinux --disable -reboot - -# riscv64: EL10 has no default crash kernel reservation for this architecture -# (kdumpctl get-default-crashkernel is empty), so the installer's kdump add-on -# would write the literal "crashkernel=auto", which the kernel ignores: nothing -# is reserved and kdump.service fails on every node. Leave kdump off here; a -# node that should take crash dumps gets a real reservation through -# linuximage.addkcmdline or bootparams.addkcmdline (crashkernel=). -%addon com_redhat_kdump --disable -%end - -# riscv64: the EL10 anaconda has no RISC-V EFI platform and always asks for the -# x86 UEFI boot loader packages (grub2-efi-x64, shim-x64), which do not exist -# for riscv64; tolerate that. The riscv64 package list pulls grub2-efi-riscv64 -# and efibootmgr in explicitly. -%packages --ignoremissing -#INCLUDE_DEFAULT_PKGLIST# - -%end - -%pre -{ -echo "Running Kickstart Pre-installation script..." -#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels10# -} &>>/tmp/pre-install.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# -#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels10.riscv64# -#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels10# -} &>>/var/log/xcat/xcat.log -%end - -# --ignoremissing above also hides a missing grub2-efi-riscv64, which would leave the -# node with no boot loader at all. Fail the installation instead of rebooting into -# firmware that has nothing to load. -%post --erroronfail --interpreter=/bin/bash -if [ ! -f /boot/efi/EFI/BOOT/BOOTRISCV64.EFI ] && - ! ls /boot/efi/EFI/*/grubriscv64.efi >/dev/null 2>&1; then - echo "riscv64: no grub2 UEFI boot loader on the ESP; grub2-efi-riscv64 is missing" \ - >>/var/log/xcat/xcat.log - exit 1 -fi -%end diff --git a/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.tmpl new file mode 120000 index 0000000000..a105f935a4 --- /dev/null +++ b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.tmpl @@ -0,0 +1 @@ +compute.rhels10.riscv64.tmpl \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.pkglist b/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.pkglist deleted file mode 100644 index 437df1d02f..0000000000 --- a/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.pkglist +++ /dev/null @@ -1,16 +0,0 @@ -@Minimal Install -kernel -chrony -net-tools -nfs-utils -openssh-server -openssl -rsync -util-linux -wget -python3 -tar -bzip2 -perl-interpreter -grub2-efi-riscv64 -efibootmgr diff --git a/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.pkglist b/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.pkglist new file mode 120000 index 0000000000..9e60343b81 --- /dev/null +++ b/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels10.riscv64.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.tmpl b/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.tmpl deleted file mode 100644 index dbf34f13c7..0000000000 --- a/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.tmpl +++ /dev/null @@ -1,79 +0,0 @@ -# Use text install -text -# Use network installation -%include /tmp/repos -# Keyboard layouts -keyboard --vckeymap=us --xlayouts='us' -# System language -lang en_US.UTF-8 - -# Network information -#KICKSTARTNET# -# Root password -rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# -# Not run the Setup Agent on first boot -firstboot --disable -# Do not configure the X Window System -skipx -# System services -#services --enabled="chronyd" -# System timezone -timezone #TABLE:site:key=timezone:value# --utc -# Partition clearing information -zerombr -clearpart --all --initlabel -#XCAT_PARTITION_START# -%include /tmp/partitionfile -#XCAT_PARTITION_END# - -# Do not configure any iptables rules -firewall --disable -selinux --disable -reboot - -# riscv64: EL10 has no default crash kernel reservation for this architecture -# (kdumpctl get-default-crashkernel is empty), so the installer's kdump add-on -# would write the literal "crashkernel=auto", which the kernel ignores: nothing -# is reserved and kdump.service fails on every node. Leave kdump off here; a -# node that should take crash dumps gets a real reservation through -# linuximage.addkcmdline or bootparams.addkcmdline (crashkernel=). -%addon com_redhat_kdump --disable -%end - -# riscv64: the EL10 anaconda has no RISC-V EFI platform and always asks for the -# x86 UEFI boot loader packages (grub2-efi-x64, shim-x64), which do not exist -# for riscv64; tolerate that. The riscv64 package list pulls grub2-efi-riscv64 -# and efibootmgr in explicitly. -%packages --ignoremissing -#INCLUDE_DEFAULT_PKGLIST# - -%end - -%pre -{ -echo "Running Kickstart Pre-installation script..." -#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels10# -} &>>/tmp/pre-install.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# -#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels10.riscv64# -#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels10# -} &>>/var/log/xcat/xcat.log -%end - -# --ignoremissing above also hides a missing grub2-efi-riscv64, which would leave the -# node with no boot loader at all. Fail the installation instead of rebooting into -# firmware that has nothing to load. -%post --erroronfail --interpreter=/bin/bash -if [ ! -f /boot/efi/EFI/BOOT/BOOTRISCV64.EFI ] && - ! ls /boot/efi/EFI/*/grubriscv64.efi >/dev/null 2>&1; then - echo "riscv64: no grub2 UEFI boot loader on the ESP; grub2-efi-riscv64 is missing" \ - >>/var/log/xcat/xcat.log - exit 1 -fi -%end diff --git a/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.tmpl b/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.tmpl new file mode 120000 index 0000000000..5b27b1a6d4 --- /dev/null +++ b/xCAT-server/share/xcat/install/rocky/compute.rocky10.riscv64.tmpl @@ -0,0 +1 @@ +../rh/compute.rhels10.riscv64.tmpl \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist b/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist deleted file mode 100644 index cfcb8349f7..0000000000 --- a/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist +++ /dev/null @@ -1,2 +0,0 @@ -xcat/xcat-core/xCATsn -xcat/xcat-dep/rh10/riscv64/goconserver diff --git a/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist b/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist new file mode 120000 index 0000000000..e434c04403 --- /dev/null +++ b/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist @@ -0,0 +1 @@ +../../netboot/rocky/service.rocky10.riscv64.otherpkgs.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist deleted file mode 100644 index 07436e39f8..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist +++ /dev/null @@ -1,33 +0,0 @@ -./boot* -./usr/include* -./usr/lib/locale* -./usr/lib64/perl5/Encode/CN* -./usr/lib64/perl5/Encode/JP* -./usr/lib64/perl5/Encode/TW* -./usr/lib64/perl5/Encode/KR* -./lib/kbd/keymaps/i386* -./lib/kbd/keymaps/mac* -./lib/kbd/keymaps/include* -./usr/local/include* -./usr/local/share/man* -./usr/share/man* -./usr/share/cracklib* -./usr/share/doc* -./usr/share/gnome* -./usr/share/i18n* -+./usr/share/i18n/en_US* -./usr/share/info* -./usr/share/locale/* -+./usr/share/locale/en_US* -+./usr/share/locale/C* -+./usr/share/locale/locale.alias -+./usr/lib/locale/locale-archive -+./usr/lib/locale/en* -+./usr/lib/locale/C* -./usr/share/omf* -./usr/share/vim/site/doc* -./usr/share/vim/vim74/doc* -./usr/share/zoneinfo* -./var/cache/man* -./var/lib/yum* -./tmp* diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist new file mode 120000 index 0000000000..554bf4f228 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist @@ -0,0 +1 @@ +../rocky/compute.rocky10.riscv64.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist deleted file mode 100644 index ccc8bfd798..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist +++ /dev/null @@ -1,30 +0,0 @@ -@minimal-environment -initscripts -chrony -kernel -net-tools -nfs-utils -openssh-server -rsync -tar -util-linux -wget -python3 -tar -bzip2 -bc -dracut -dracut-network -NetworkManager -rsyslog -hostname -e2fsprogs -ethtool -parted -openssl -openssh-clients -bash -vim-minimal -rpm -iputils -perl-interpreter diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist new file mode 120000 index 0000000000..5aba674c90 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist @@ -0,0 +1 @@ +../rocky/compute.rocky10.riscv64.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall deleted file mode 100755 index 015cfec0f9..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -#-- Do not remove following line if you want to make use of CVS version tracking -#-- $Id: compute.postinstall,v 1.21 2008/09/04 12:05:45 sikorsky Exp $ -#-- jurij.sikorsky@t-systems.cz -#-- -#-- this script is run after all packages from $profile.pkglist are installed -#-- -#-- it gets these arguments: -#-- -#-- $1 = install root (chroot directory for profile) -#-- $2 = OS version -#-- $3 = architecture -#-- $4 = profile name -#-- $5 = work dir (where genimage is located) -#-- -#-- -installroot=$1 -osver=$2 -arch=$3 -profile=$4 -workdir=$5 - -#-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -END - -#-- Uncomment the line contains "cons" in /etc/inittab -#cons:12345:respawn:/sbin/smart_agetty -L 38400 console -#echo "co:2345:respawn:/sbin/agetty -L 38400 console" >> $installroot/etc/inittab - - -#-- Disable SELinux in the rootimg -#-- Redhat 7.3 will install selinux-policy and selinux is enabled by default -#-- Need to disable selinux, otherwise, the booting will hang on "Loading selinux policy" -if [ -f "$installroot/etc/selinux/config" ] -then - sed -i 's/SELINUX=enforcing\|permissive/SELINUX=disabled/' $installroot/etc/selinux/config -fi -#--for redhat 8 and 8.1 -#-- Need to disable firewalld, otherwise, the remoteshell script will not able to get all the SSH keys -FIREWALLD="$installroot/etc/systemd/system/multi-user.target.wants/firewalld.service" -if [[ -f "$FIREWALLD" || -L "$FIREWALLD" ]] -then - rm -f $FIREWALLD -fi -FIREWALLD1="$installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service" -if [[ -f "$FIREWALLD1" || -L "$FIREWALLD1" ]] -then - rm -f $FIREWALLD1 -fi - - -#-- Example of booted image versioning -#-- We want to know, with what configuration (version of the image) each node was booted. -#-- Hence, we keep image definition files and postscripts in CVS. During image generation we create file /etc/IMGVERSION and fill it with CVS "$Id$" of files with image definition (.pkglist, .exlist, .repolist, .postinstall). Then, during boot, each "CVS enabled" postscript (see /install/postscripts/cvs_template.sh and /install/postscripts/cvs_template.pl) adds one line to /etc/IMGVERSION. Then you can determine in any time what image you are running and what postscipts in which versions were run. -#cat /dev/null > $installroot/etc/IMGVERSION -#for ext in pkglist exlist postinstall repolist; do -# [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION -#done diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall new file mode 120000 index 0000000000..57d725a641 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall @@ -0,0 +1 @@ +../rocky/compute.rocky10.riscv64.postinstall \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist deleted file mode 100644 index 07436e39f8..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist +++ /dev/null @@ -1,33 +0,0 @@ -./boot* -./usr/include* -./usr/lib/locale* -./usr/lib64/perl5/Encode/CN* -./usr/lib64/perl5/Encode/JP* -./usr/lib64/perl5/Encode/TW* -./usr/lib64/perl5/Encode/KR* -./lib/kbd/keymaps/i386* -./lib/kbd/keymaps/mac* -./lib/kbd/keymaps/include* -./usr/local/include* -./usr/local/share/man* -./usr/share/man* -./usr/share/cracklib* -./usr/share/doc* -./usr/share/gnome* -./usr/share/i18n* -+./usr/share/i18n/en_US* -./usr/share/info* -./usr/share/locale/* -+./usr/share/locale/en_US* -+./usr/share/locale/C* -+./usr/share/locale/locale.alias -+./usr/lib/locale/locale-archive -+./usr/lib/locale/en* -+./usr/lib/locale/C* -./usr/share/omf* -./usr/share/vim/site/doc* -./usr/share/vim/vim74/doc* -./usr/share/zoneinfo* -./var/cache/man* -./var/lib/yum* -./tmp* diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist new file mode 120000 index 0000000000..554bf4f228 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist @@ -0,0 +1 @@ +../rocky/compute.rocky10.riscv64.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist deleted file mode 100644 index cfcb8349f7..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist +++ /dev/null @@ -1,2 +0,0 @@ -xcat/xcat-core/xCATsn -xcat/xcat-dep/rh10/riscv64/goconserver diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist new file mode 120000 index 0000000000..1515dad45b --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist @@ -0,0 +1 @@ +../rocky/service.rocky10.riscv64.otherpkgs.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist deleted file mode 100644 index ac608b1483..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist +++ /dev/null @@ -1,30 +0,0 @@ -@minimal-environment -chrony -kernel -net-tools -nfs-utils -openssh-server -rsync -tar -util-linux -wget -perl-DBD-MySQL -perl-DBD-Pg -perl-lib -python3 -tar -bzip2 -bc -dracut -dracut-network -rsyslog -hostname -e2fsprogs -ethtool -parted -openssl -openssh-clients -bash -vim-minimal -rpm -iputils diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist new file mode 120000 index 0000000000..66a5bbf148 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist @@ -0,0 +1 @@ +../rocky/service.rocky10.riscv64.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall deleted file mode 100755 index 015cfec0f9..0000000000 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -#-- Do not remove following line if you want to make use of CVS version tracking -#-- $Id: compute.postinstall,v 1.21 2008/09/04 12:05:45 sikorsky Exp $ -#-- jurij.sikorsky@t-systems.cz -#-- -#-- this script is run after all packages from $profile.pkglist are installed -#-- -#-- it gets these arguments: -#-- -#-- $1 = install root (chroot directory for profile) -#-- $2 = OS version -#-- $3 = architecture -#-- $4 = profile name -#-- $5 = work dir (where genimage is located) -#-- -#-- -installroot=$1 -osver=$2 -arch=$3 -profile=$4 -workdir=$5 - -#-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -END - -#-- Uncomment the line contains "cons" in /etc/inittab -#cons:12345:respawn:/sbin/smart_agetty -L 38400 console -#echo "co:2345:respawn:/sbin/agetty -L 38400 console" >> $installroot/etc/inittab - - -#-- Disable SELinux in the rootimg -#-- Redhat 7.3 will install selinux-policy and selinux is enabled by default -#-- Need to disable selinux, otherwise, the booting will hang on "Loading selinux policy" -if [ -f "$installroot/etc/selinux/config" ] -then - sed -i 's/SELINUX=enforcing\|permissive/SELINUX=disabled/' $installroot/etc/selinux/config -fi -#--for redhat 8 and 8.1 -#-- Need to disable firewalld, otherwise, the remoteshell script will not able to get all the SSH keys -FIREWALLD="$installroot/etc/systemd/system/multi-user.target.wants/firewalld.service" -if [[ -f "$FIREWALLD" || -L "$FIREWALLD" ]] -then - rm -f $FIREWALLD -fi -FIREWALLD1="$installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service" -if [[ -f "$FIREWALLD1" || -L "$FIREWALLD1" ]] -then - rm -f $FIREWALLD1 -fi - - -#-- Example of booted image versioning -#-- We want to know, with what configuration (version of the image) each node was booted. -#-- Hence, we keep image definition files and postscripts in CVS. During image generation we create file /etc/IMGVERSION and fill it with CVS "$Id$" of files with image definition (.pkglist, .exlist, .repolist, .postinstall). Then, during boot, each "CVS enabled" postscript (see /install/postscripts/cvs_template.sh and /install/postscripts/cvs_template.pl) adds one line to /etc/IMGVERSION. Then you can determine in any time what image you are running and what postscipts in which versions were run. -#cat /dev/null > $installroot/etc/IMGVERSION -#for ext in pkglist exlist postinstall repolist; do -# [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION -#done diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall new file mode 120000 index 0000000000..57d725a641 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall @@ -0,0 +1 @@ +../rocky/compute.rocky10.riscv64.postinstall \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist deleted file mode 100644 index 07436e39f8..0000000000 --- a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist +++ /dev/null @@ -1,33 +0,0 @@ -./boot* -./usr/include* -./usr/lib/locale* -./usr/lib64/perl5/Encode/CN* -./usr/lib64/perl5/Encode/JP* -./usr/lib64/perl5/Encode/TW* -./usr/lib64/perl5/Encode/KR* -./lib/kbd/keymaps/i386* -./lib/kbd/keymaps/mac* -./lib/kbd/keymaps/include* -./usr/local/include* -./usr/local/share/man* -./usr/share/man* -./usr/share/cracklib* -./usr/share/doc* -./usr/share/gnome* -./usr/share/i18n* -+./usr/share/i18n/en_US* -./usr/share/info* -./usr/share/locale/* -+./usr/share/locale/en_US* -+./usr/share/locale/C* -+./usr/share/locale/locale.alias -+./usr/lib/locale/locale-archive -+./usr/lib/locale/en* -+./usr/lib/locale/C* -./usr/share/omf* -./usr/share/vim/site/doc* -./usr/share/vim/vim74/doc* -./usr/share/zoneinfo* -./var/cache/man* -./var/lib/yum* -./tmp* diff --git a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist new file mode 120000 index 0000000000..751e4cd2df --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist @@ -0,0 +1 @@ +compute.rocky10.riscv64.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall deleted file mode 100755 index 015cfec0f9..0000000000 --- a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -#-- Do not remove following line if you want to make use of CVS version tracking -#-- $Id: compute.postinstall,v 1.21 2008/09/04 12:05:45 sikorsky Exp $ -#-- jurij.sikorsky@t-systems.cz -#-- -#-- this script is run after all packages from $profile.pkglist are installed -#-- -#-- it gets these arguments: -#-- -#-- $1 = install root (chroot directory for profile) -#-- $2 = OS version -#-- $3 = architecture -#-- $4 = profile name -#-- $5 = work dir (where genimage is located) -#-- -#-- -installroot=$1 -osver=$2 -arch=$3 -profile=$4 -workdir=$5 - -#-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -END - -#-- Uncomment the line contains "cons" in /etc/inittab -#cons:12345:respawn:/sbin/smart_agetty -L 38400 console -#echo "co:2345:respawn:/sbin/agetty -L 38400 console" >> $installroot/etc/inittab - - -#-- Disable SELinux in the rootimg -#-- Redhat 7.3 will install selinux-policy and selinux is enabled by default -#-- Need to disable selinux, otherwise, the booting will hang on "Loading selinux policy" -if [ -f "$installroot/etc/selinux/config" ] -then - sed -i 's/SELINUX=enforcing\|permissive/SELINUX=disabled/' $installroot/etc/selinux/config -fi -#--for redhat 8 and 8.1 -#-- Need to disable firewalld, otherwise, the remoteshell script will not able to get all the SSH keys -FIREWALLD="$installroot/etc/systemd/system/multi-user.target.wants/firewalld.service" -if [[ -f "$FIREWALLD" || -L "$FIREWALLD" ]] -then - rm -f $FIREWALLD -fi -FIREWALLD1="$installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service" -if [[ -f "$FIREWALLD1" || -L "$FIREWALLD1" ]] -then - rm -f $FIREWALLD1 -fi - - -#-- Example of booted image versioning -#-- We want to know, with what configuration (version of the image) each node was booted. -#-- Hence, we keep image definition files and postscripts in CVS. During image generation we create file /etc/IMGVERSION and fill it with CVS "$Id$" of files with image definition (.pkglist, .exlist, .repolist, .postinstall). Then, during boot, each "CVS enabled" postscript (see /install/postscripts/cvs_template.sh and /install/postscripts/cvs_template.pl) adds one line to /etc/IMGVERSION. Then you can determine in any time what image you are running and what postscipts in which versions were run. -#cat /dev/null > $installroot/etc/IMGVERSION -#for ext in pkglist exlist postinstall repolist; do -# [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION -#done diff --git a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall new file mode 120000 index 0000000000..86c3964bd3 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall @@ -0,0 +1 @@ +compute.rocky10.riscv64.postinstall \ No newline at end of file