X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Fconf%2Fdistro%2Ffiles%2Fks%2Fpoky_stx_aio_ks.cfg;h=4f7cb4db3f59f8161a2ed827fb6fcf53f83ca3b2;hb=4859bfe7ff7c449205787f1c5018a65c02261087;hp=dff25fe483eb083766e99e4136d0079e1a9a4372;hpb=57fdea704bd62af847872c40508f00aa1d7cac60;p=pti%2Frtp.git

diff --git a/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg b/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg
index dff25fe..4f7cb4d 100644
--- a/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg
+++ b/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg
@@ -207,6 +207,16 @@ echo "bootloader --location=mbr $boot_device_arg --timeout=5 --append=\"$append\
 echo "timezone --nontp --utc UTC" >/tmp/timezone-include
 %end
 
+##############################################################
+# pre script for poky-stx
+##############################################################
+%pre
+mkdir -p /run/install/repo
+cp installer-config/* /run/install/repo/
+rm -f /run/install/repo/Packages
+ln -sf /Packages /run/install/repo/Packages
+%end
+
 ##############################################################
 # Main kickstart
 ##############################################################
@@ -616,10 +626,6 @@ useradd -m -g sys_protected -G root -d /home/sysadmin -p ${SYSADMIN_P} -s /bin/s
 groupadd -r -g 128 nscd
 useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd
 
-useradd -p '' ceph
-groupadd ceph
-usermod -a -G ceph ceph
-
 useradd -p '' patching
 groupadd patching
 usermod -a -G patching patching
@@ -634,6 +640,7 @@ usermod -a -G sys_protected www
 usermod -a -G sys_protected nfv
 usermod -a -G sys_protected patching
 usermod -a -G sys_protected haproxy
+usermod -a -G snmpd fm
 usermod -P root root
 
 # Extend path variable for sysadmin
@@ -645,6 +652,19 @@ sed -i "s|\(^.*/dev/root\)|#\1|" /etc/fstab
 
 %end
 
+%post --nochroot
+# installer images for pxe-network-installer
+mkdir -p /mnt/sysimage/pxeboot/rel-19.12
+cp -P /boot/installer-initrd* /mnt/sysimage/pxeboot/rel-19.12/
+cp /boot/bzImage /mnt/sysimage/pxeboot/rel-19.12/installer-bzImage_1.0
+ln -s installer-bzImage_1.0 /mnt/sysimage/pxeboot/rel-19.12/installer-bzImage
+
+if [ -f /media/realroot/efi.img ]; then
+  cp /media/realroot/efi.img /mnt/sysimage/pxeboot/rel-19.12/efiboot.img
+fi
+
+%end
+
 
 # Template from: post_common.cfg
 %post --erroronfail
@@ -680,25 +700,26 @@ else
 fi
 
 . /etc/platform/platform.conf
-# Configure smart package manager channels
-rm -rf /var/lib/smart
-mkdir /var/lib/smart
-/usr/bin/smart channel -y \
-    --add rpmdb type=rpm-sys name="RPM Database"
-/usr/bin/smart channel -y \
-    --add base type=rpm-md name="Base" baseurl=http://controller:${http_port:-8080}/feed/rel-19.12
-/usr/bin/smart channel -y \
-    --add updates type=rpm-md name="Patches" baseurl=http://controller:${http_port:-8080}/updates/rel-19.12
-
-# Configure smart to use rpm --nolinktos option
-/usr/bin/smart config --set rpm-nolinktos=true
-
-# Configure smart to use rpm --nosignature option
-/usr/bin/smart config --set rpm-check-signatures=false
 
 # Delete the CentOS yum repo files
 rm -f /etc/yum.repos.d/CentOS-*
 
+# Create platform yum repo file
+mkdir -p /etc/yum.repos.d
+cat >/etc/yum.repos.d/platform.repo <<EOF
+[platform-base]
+name=platform-base
+baseurl=http://controller:${http_port:-8080}/feed/rel-19.12
+gpgcheck=0
+enabled=1
+
+[platform-updates]
+name=platform-updates
+baseurl=http://controller:${http_port:-8080}/updates/rel-19.12
+gpgcheck=0
+enabled=1
+EOF
+
 # Persist the boot device naming as UDEV rules so that if the network device
 # order changes post-install that we will still be able to DHCP from the
 # correct interface to reach the active controller.  For most nodes only the
@@ -729,9 +750,6 @@ chage -d 0 sysadmin
 rm -rf /var/tmp
 systemctl enable tmp.mount
 
-# Disable automount of /dev/hugepages
-systemctl mask dev-hugepages.mount
-
 # Disable firewall
 systemctl disable firewalld
 
@@ -978,8 +996,7 @@ fi
 
 if [ -d $srcdir/Packages ] ; then
     mkdir -p /mnt/sysimage/www/pages/feed/rel-19.12
-    cp -r $srcdir/Packages /mnt/sysimage/www/pages/feed/rel-19.12/Packages
-    cp -r $srcdir/repodata /mnt/sysimage/www/pages/feed/rel-19.12/repodata
+    cp -r $srcdir/Packages/* /mnt/sysimage/www/pages/feed/rel-19.12/
     cp $srcdir/*.cfg /mnt/sysimage/www/pages/feed/rel-19.12
 fi