1 From 0b620c4f4936af27d915b0ec809dd2f214f4daa9 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Wed, 10 Jun 2020 10:36:18 +0800
4 Subject: [PATCH] kickstarts: adjustment fnd fixes or poky-stx
6 Upstream-Status: Inappropriate [OE specific]
8 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10 bsp-files/kickstarts/post_common.cfg | 87 +++++++++++++++++-----
11 .../kickstarts/post_kernel_aio_and_worker.cfg | 4 +-
12 bsp-files/kickstarts/post_kernel_controller.cfg | 4 +-
13 bsp-files/kickstarts/post_kernel_storage.cfg | 4 +-
14 bsp-files/kickstarts/post_usb_controller.cfg | 3 +-
15 bsp-files/kickstarts/pre_common_head.cfg | 33 +++++++-
16 bsp-files/kickstarts/pre_pkglist.cfg | 19 +----
17 bsp-files/kickstarts/pre_pkglist_lowlatency.cfg | 18 +----
18 8 files changed, 110 insertions(+), 62 deletions(-)
20 diff --git a/bsp-files/kickstarts/post_common.cfg b/bsp-files/kickstarts/post_common.cfg
21 index 48abb74..a166c54 100644
22 --- a/bsp-files/kickstarts/post_common.cfg
23 +++ b/bsp-files/kickstarts/post_common.cfg
25 +######################################
26 +# workarounds or fixes for poky-stx
27 +######################################
30 +# Add extra users and groups
31 +SYSADMIN_P="4SuW8cnXFyxsk"
32 +groupadd -f -g 345 sys_protected
33 +useradd -m -g sys_protected -G root -d /home/sysadmin -p ${SYSADMIN_P} -s /bin/sh sysadmin
35 +groupadd -r -g 128 nscd
36 +useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd
38 +useradd -p '' patching
40 +usermod -a -G patching patching
44 +usermod -a -G nfv nfv
46 +usermod -a -G sys_protected sysadmin
47 +usermod -a -G sys_protected sysinv
48 +usermod -a -G sys_protected www
49 +usermod -a -G sys_protected nfv
50 +usermod -a -G sys_protected patching
51 +usermod -a -G sys_protected haproxy
52 +usermod -a -G snmpd fm
55 +# Extend path variable for sysadmin
56 +echo 'PATH=/sbin:/usr/sbin:$PATH' >> /home/sysadmin/.bashrc
57 +chown sysadmin:sys_protected /home/sysadmin/.bashrc
59 +# Avoid duplicate with systemd-fstab-generator
60 +sed -i "s|\(^.*/dev/root\)|#\1|" /etc/fstab
65 +# installer images for pxe-network-installer
66 +mkdir -p /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx
67 +cp -P /boot/installer-initrd* /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/
68 +cp /boot/bzImage /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/installer-bzImage_1.0
69 +ln -s installer-bzImage_1.0 /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/installer-bzImage
71 +if [ -f /media/realroot/efi.img ]; then
72 + cp /media/realroot/efi.img /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/efiboot.img
79 # Source common functions
80 @@ -31,25 +83,26 @@ else
83 . /etc/platform/platform.conf
84 -# Configure smart package manager channels
85 -rm -rf /var/lib/smart
87 -/usr/bin/smart channel -y \
88 - --add rpmdb type=rpm-sys name="RPM Database"
89 -/usr/bin/smart channel -y \
90 - --add base type=rpm-md name="Base" baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
91 -/usr/bin/smart channel -y \
92 - --add updates type=rpm-md name="Patches" baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
94 -# Configure smart to use rpm --nolinktos option
95 -/usr/bin/smart config --set rpm-nolinktos=true
97 -# Configure smart to use rpm --nosignature option
98 -/usr/bin/smart config --set rpm-check-signatures=false
100 # Delete the CentOS yum repo files
101 rm -f /etc/yum.repos.d/CentOS-*
103 +# Create platform yum repo file
104 +mkdir -p /etc/yum.repos.d
105 +cat >/etc/yum.repos.d/platform.repo <<EOF
108 +baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
113 +name=platform-updates
114 +baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
119 # Persist the boot device naming as UDEV rules so that if the network device
120 # order changes post-install that we will still be able to DHCP from the
121 # correct interface to reach the active controller. For most nodes only the
122 @@ -73,7 +126,7 @@ done
125 # Lock the root password
129 # Enable tmpfs mount for /tmp
130 # delete /var/tmp so that it can similinked in
131 @@ -81,7 +134,7 @@ rm -rf /var/tmp
132 systemctl enable tmp.mount
134 # Disable automount of /dev/hugepages
135 -systemctl mask dev-hugepages.mount
136 +#systemctl mask dev-hugepages.mount
139 systemctl disable firewalld
140 diff --git a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
141 index f228110..f4037fa 100644
142 --- a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
143 +++ b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
145 perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
147 if [ -d /sys/firmware/efi ] ; then
148 - grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
149 + grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
151 - grub2-mkconfig -o /boot/grub2/grub.cfg
152 + grub-mkconfig -o /boot/grub/grub.cfg
156 diff --git a/bsp-files/kickstarts/post_kernel_controller.cfg b/bsp-files/kickstarts/post_kernel_controller.cfg
157 index a49f835..c076fdc 100644
158 --- a/bsp-files/kickstarts/post_kernel_controller.cfg
159 +++ b/bsp-files/kickstarts/post_kernel_controller.cfg
161 perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
163 if [ -d /sys/firmware/efi ] ; then
164 - grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
165 + grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
167 - grub2-mkconfig -o /boot/grub2/grub.cfg
168 + grub-mkconfig -o /boot/grub/grub.cfg
172 diff --git a/bsp-files/kickstarts/post_kernel_storage.cfg b/bsp-files/kickstarts/post_kernel_storage.cfg
173 index 53bff1b..fb8eac4 100644
174 --- a/bsp-files/kickstarts/post_kernel_storage.cfg
175 +++ b/bsp-files/kickstarts/post_kernel_storage.cfg
177 perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
179 if [ -d /sys/firmware/efi ] ; then
180 - grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
181 + grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
183 - grub2-mkconfig -o /boot/grub2/grub.cfg
184 + grub-mkconfig -o /boot/grub/grub.cfg
188 diff --git a/bsp-files/kickstarts/post_usb_controller.cfg b/bsp-files/kickstarts/post_usb_controller.cfg
189 index 788aee5..85ac641 100644
190 --- a/bsp-files/kickstarts/post_usb_controller.cfg
191 +++ b/bsp-files/kickstarts/post_usb_controller.cfg
194 if [ -d $srcdir/Packages ] ; then
195 mkdir -p /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx
196 - cp -r $srcdir/Packages /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/Packages
197 - cp -r $srcdir/repodata /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/repodata
198 + cp -r $srcdir/Packages/* /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/
199 cp $srcdir/*.cfg /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx
202 diff --git a/bsp-files/kickstarts/pre_common_head.cfg b/bsp-files/kickstarts/pre_common_head.cfg
203 index 88edab4..d3c1ba9 100644
204 --- a/bsp-files/kickstarts/pre_common_head.cfg
205 +++ b/bsp-files/kickstarts/pre_common_head.cfg
206 @@ -46,17 +46,46 @@ echo "bootloader --location=mbr $boot_device_arg --timeout=5 --append=\"$append\
207 echo "timezone --nontp --utc UTC" >/tmp/timezone-include
210 +##############################################################
211 +# pre script for poky-stx
212 +##############################################################
214 +mkdir -p /run/install/repo
215 +cp installer-config/* /run/install/repo/
216 +rm -f /run/install/repo/Packages
217 +ln -sf /Packages /run/install/repo/Packages
220 +##############################################################
222 +##############################################################
227 %include /tmp/timezone-include
228 -# set to 'x' so we can use shadow password
229 -rootpw --iscrypted x
231 +rootpw --iscrypted $6$ArDcm/wSNLJLT2OP$QdWX6kMUgBVsiibukLBLtLfRDVz0n49BQ1svT7hPEQJASvKnqkEL5zc5kqUMMzXzLrj80z6YX9DmYTD0Ysxn.1
234 authconfig --enableshadow --passalgo=sha512
235 firewall --service=ssh
237 +# Use text mode install
240 +# Use CDROM installation media
243 +# Run the Setup Agent on first boot
247 +services --enabled="lvm2-monitor.service"
249 +# Do not configure the X Window System
252 # The following is the partition information you requested
253 # Note that any partitions you deleted are not expressed
254 # here so unless you clear all partitions first, this is
255 diff --git a/bsp-files/kickstarts/pre_pkglist.cfg b/bsp-files/kickstarts/pre_pkglist.cfg
256 index 37fe023..16e4dcf 100644
257 --- a/bsp-files/kickstarts/pre_pkglist.cfg
258 +++ b/bsp-files/kickstarts/pre_pkglist.cfg
263 --kernel-module-igb-uio-rt
264 --kernel-module-wrs-avp-rt
268 --kernel-rt-tools-libs
276 --mlnx-ofa_kernel-rt-modules
282 diff --git a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
283 index 3af6a39..16e4dcf 100644
284 --- a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
285 +++ b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
290 --kernel-module-igb-uio
291 --kernel-module-wrs-avp
302 --mlnx-ofa_kernel-modules