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 100644
index 000000000..cfcb8349f
--- /dev/null
+++ b/xCAT-server/share/xcat/install/rh/service.rhels10.riscv64.otherpkgs.pkglist
@@ -0,0 +1,2 @@
+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 100644
index 000000000..cfcb8349f
--- /dev/null
+++ b/xCAT-server/share/xcat/install/rocky/service.rocky10.riscv64.otherpkgs.pkglist
@@ -0,0 +1,2 @@
+xcat/xcat-core/xCATsn
+xcat/xcat-dep/rh10/riscv64/goconserver
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 100644
index 000000000..07436e39f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.exlist
@@ -0,0 +1,33 @@
+./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.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist
new file mode 100644
index 000000000..ccc8bfd79
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.pkglist
@@ -0,0 +1,30 @@
+@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.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall
new file mode 100755
index 000000000..015cfec0f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels10.riscv64.postinstall
@@ -0,0 +1,62 @@
+#!/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 <<END >$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.exlist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist
new file mode 100644
index 000000000..07436e39f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.exlist
@@ -0,0 +1,33 @@
+./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.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist
new file mode 100644
index 000000000..cfcb8349f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.otherpkgs.pkglist
@@ -0,0 +1,2 @@
+xcat/xcat-core/xCATsn
+xcat/xcat-dep/rh10/riscv64/goconserver
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 100644
index 000000000..ac608b148
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.pkglist
@@ -0,0 +1,30 @@
+@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.postinstall b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall
new file mode 100755
index 000000000..015cfec0f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels10.riscv64.postinstall
@@ -0,0 +1,62 @@
+#!/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 <<END >$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/compute.rocky10.riscv64.exlist b/xCAT-server/share/xcat/netboot/rocky/compute.rocky10.riscv64.exlist
new file mode 100644
index 000000000..07436e39f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/compute.rocky10.riscv64.exlist
@@ -0,0 +1,33 @@
+./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/compute.rocky10.riscv64.pkglist b/xCAT-server/share/xcat/netboot/rocky/compute.rocky10.riscv64.pkglist
new file mode 100644
index 000000000..ccc8bfd79
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/compute.rocky10.riscv64.pkglist
@@ -0,0 +1,30 @@
+@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/rocky/compute.rocky10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rocky/compute.rocky10.riscv64.postinstall
new file mode 100755
index 000000000..015cfec0f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/compute.rocky10.riscv64.postinstall
@@ -0,0 +1,62 @@
+#!/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 <<END >$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.exlist b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist
new file mode 100644
index 000000000..07436e39f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.exlist
@@ -0,0 +1,33 @@
+./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.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.otherpkgs.pkglist
new file mode 100644
index 000000000..cfcb8349f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.otherpkgs.pkglist
@@ -0,0 +1,2 @@
+xcat/xcat-core/xCATsn
+xcat/xcat-dep/rh10/riscv64/goconserver
diff --git a/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.pkglist b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.pkglist
new file mode 100644
index 000000000..ac608b148
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.pkglist
@@ -0,0 +1,30 @@
+@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/rocky/service.rocky10.riscv64.postinstall b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall
new file mode 100755
index 000000000..015cfec0f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/service.rocky10.riscv64.postinstall
@@ -0,0 +1,62 @@
+#!/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 <<END >$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