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 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
8 bsp-files/kickstarts/post_common.cfg | 87 +++++++++++++++++-----
9 .../kickstarts/post_kernel_aio_and_worker.cfg | 4 +-
10 bsp-files/kickstarts/post_kernel_controller.cfg | 4 +-
11 bsp-files/kickstarts/post_kernel_storage.cfg | 4 +-
12 bsp-files/kickstarts/post_usb_controller.cfg | 3 +-
13 bsp-files/kickstarts/pre_common_head.cfg | 33 +++++++-
14 bsp-files/kickstarts/pre_pkglist.cfg | 19 +----
15 bsp-files/kickstarts/pre_pkglist_lowlatency.cfg | 18 +----
16 8 files changed, 110 insertions(+), 62 deletions(-)
18 diff --git a/bsp-files/kickstarts/post_common.cfg b/bsp-files/kickstarts/post_common.cfg
19 index 48abb74..a166c54 100644
20 --- a/bsp-files/kickstarts/post_common.cfg
21 +++ b/bsp-files/kickstarts/post_common.cfg
23 +######################################
24 +# workarounds or fixes for poky-stx
25 +######################################
28 +# Add extra users and groups
29 +SYSADMIN_P="4SuW8cnXFyxsk"
30 +groupadd -f -g 345 sys_protected
31 +useradd -m -g sys_protected -G root -d /home/sysadmin -p ${SYSADMIN_P} -s /bin/sh sysadmin
33 +groupadd -r -g 128 nscd
34 +useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd
36 +useradd -p '' patching
38 +usermod -a -G patching patching
42 +usermod -a -G nfv nfv
44 +usermod -a -G sys_protected sysadmin
45 +usermod -a -G sys_protected sysinv
46 +usermod -a -G sys_protected www
47 +usermod -a -G sys_protected nfv
48 +usermod -a -G sys_protected patching
49 +usermod -a -G sys_protected haproxy
50 +usermod -a -G snmpd fm
53 +# Extend path variable for sysadmin
54 +echo 'PATH=/sbin:/usr/sbin:$PATH' >> /home/sysadmin/.bashrc
55 +chown sysadmin:sys_protected /home/sysadmin/.bashrc
57 +# Avoid duplicate with systemd-fstab-generator
58 +sed -i "s|\(^.*/dev/root\)|#\1|" /etc/fstab
63 +# installer images for pxe-network-installer
64 +mkdir -p /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx
65 +cp -P /boot/installer-initrd* /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/
66 +cp /boot/bzImage /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/installer-bzImage_1.0
67 +ln -s installer-bzImage_1.0 /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/installer-bzImage
69 +if [ -f /media/realroot/efi.img ]; then
70 + cp /media/realroot/efi.img /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/efiboot.img
77 # Source common functions
78 @@ -31,25 +83,26 @@ else
81 . /etc/platform/platform.conf
82 -# Configure smart package manager channels
83 -rm -rf /var/lib/smart
85 -/usr/bin/smart channel -y \
86 - --add rpmdb type=rpm-sys name="RPM Database"
87 -/usr/bin/smart channel -y \
88 - --add base type=rpm-md name="Base" baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
89 -/usr/bin/smart channel -y \
90 - --add updates type=rpm-md name="Patches" baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
92 -# Configure smart to use rpm --nolinktos option
93 -/usr/bin/smart config --set rpm-nolinktos=true
95 -# Configure smart to use rpm --nosignature option
96 -/usr/bin/smart config --set rpm-check-signatures=false
98 # Delete the CentOS yum repo files
99 rm -f /etc/yum.repos.d/CentOS-*
101 +# Create platform yum repo file
102 +mkdir -p /etc/yum.repos.d
103 +cat >/etc/yum.repos.d/platform.repo <<EOF
106 +baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
111 +name=platform-updates
112 +baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
117 # Persist the boot device naming as UDEV rules so that if the network device
118 # order changes post-install that we will still be able to DHCP from the
119 # correct interface to reach the active controller. For most nodes only the
120 @@ -73,7 +126,7 @@ done
123 # Lock the root password
127 # Enable tmpfs mount for /tmp
128 # delete /var/tmp so that it can similinked in
129 @@ -81,7 +134,7 @@ rm -rf /var/tmp
130 systemctl enable tmp.mount
132 # Disable automount of /dev/hugepages
133 -systemctl mask dev-hugepages.mount
134 +#systemctl mask dev-hugepages.mount
137 systemctl disable firewalld
138 diff --git a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
139 index f228110..f4037fa 100644
140 --- a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
141 +++ b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
143 perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
145 if [ -d /sys/firmware/efi ] ; then
146 - grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
147 + grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
149 - grub2-mkconfig -o /boot/grub2/grub.cfg
150 + grub-mkconfig -o /boot/grub/grub.cfg
154 diff --git a/bsp-files/kickstarts/post_kernel_controller.cfg b/bsp-files/kickstarts/post_kernel_controller.cfg
155 index a49f835..c076fdc 100644
156 --- a/bsp-files/kickstarts/post_kernel_controller.cfg
157 +++ b/bsp-files/kickstarts/post_kernel_controller.cfg
159 perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
161 if [ -d /sys/firmware/efi ] ; then
162 - grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
163 + grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
165 - grub2-mkconfig -o /boot/grub2/grub.cfg
166 + grub-mkconfig -o /boot/grub/grub.cfg
170 diff --git a/bsp-files/kickstarts/post_kernel_storage.cfg b/bsp-files/kickstarts/post_kernel_storage.cfg
171 index 53bff1b..fb8eac4 100644
172 --- a/bsp-files/kickstarts/post_kernel_storage.cfg
173 +++ b/bsp-files/kickstarts/post_kernel_storage.cfg
175 perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
177 if [ -d /sys/firmware/efi ] ; then
178 - grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
179 + grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
181 - grub2-mkconfig -o /boot/grub2/grub.cfg
182 + grub-mkconfig -o /boot/grub/grub.cfg
186 diff --git a/bsp-files/kickstarts/post_usb_controller.cfg b/bsp-files/kickstarts/post_usb_controller.cfg
187 index 788aee5..85ac641 100644
188 --- a/bsp-files/kickstarts/post_usb_controller.cfg
189 +++ b/bsp-files/kickstarts/post_usb_controller.cfg
192 if [ -d $srcdir/Packages ] ; then
193 mkdir -p /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx
194 - cp -r $srcdir/Packages /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/Packages
195 - cp -r $srcdir/repodata /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/repodata
196 + cp -r $srcdir/Packages/* /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/
197 cp $srcdir/*.cfg /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx
200 diff --git a/bsp-files/kickstarts/pre_common_head.cfg b/bsp-files/kickstarts/pre_common_head.cfg
201 index 88edab4..d3c1ba9 100644
202 --- a/bsp-files/kickstarts/pre_common_head.cfg
203 +++ b/bsp-files/kickstarts/pre_common_head.cfg
204 @@ -46,17 +46,46 @@ echo "bootloader --location=mbr $boot_device_arg --timeout=5 --append=\"$append\
205 echo "timezone --nontp --utc UTC" >/tmp/timezone-include
208 +##############################################################
209 +# pre script for poky-stx
210 +##############################################################
212 +mkdir -p /run/install/repo
213 +cp installer-config/* /run/install/repo/
214 +rm -f /run/install/repo/Packages
215 +ln -sf /Packages /run/install/repo/Packages
218 +##############################################################
220 +##############################################################
225 %include /tmp/timezone-include
226 -# set to 'x' so we can use shadow password
227 -rootpw --iscrypted x
229 +rootpw --iscrypted $6$ArDcm/wSNLJLT2OP$QdWX6kMUgBVsiibukLBLtLfRDVz0n49BQ1svT7hPEQJASvKnqkEL5zc5kqUMMzXzLrj80z6YX9DmYTD0Ysxn.1
232 authconfig --enableshadow --passalgo=sha512
233 firewall --service=ssh
235 +# Use text mode install
238 +# Use CDROM installation media
241 +# Run the Setup Agent on first boot
245 +services --enabled="lvm2-monitor.service"
247 +# Do not configure the X Window System
250 # The following is the partition information you requested
251 # Note that any partitions you deleted are not expressed
252 # here so unless you clear all partitions first, this is
253 diff --git a/bsp-files/kickstarts/pre_pkglist.cfg b/bsp-files/kickstarts/pre_pkglist.cfg
254 index 37fe023..16e4dcf 100644
255 --- a/bsp-files/kickstarts/pre_pkglist.cfg
256 +++ b/bsp-files/kickstarts/pre_pkglist.cfg
261 --kernel-module-igb-uio-rt
262 --kernel-module-wrs-avp-rt
266 --kernel-rt-tools-libs
274 --mlnx-ofa_kernel-rt-modules
280 diff --git a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
281 index 3af6a39..16e4dcf 100644
282 --- a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
283 +++ b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
288 --kernel-module-igb-uio
289 --kernel-module-wrs-avp
300 --mlnx-ofa_kernel-modules