meta-stx/recipes-core/stx-metal/files/0011-kickstarts-adjustment-fnd-fixes-or-poky-stx.patch

   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
   5
   6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
   7 ---
   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(-)
  17
  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
  22 @@ -1,3 +1,55 @@
  23 +######################################
  24 +# workarounds or fixes for poky-stx
  25 +######################################
  26 +%post --erroronfail
  27 +
  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
  32 +
  33 +groupadd -r -g 128 nscd
  34 +useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd
  35 +
  36 +useradd -p '' patching
  37 +groupadd patching
  38 +usermod -a -G patching patching
  39 +
  40 +useradd -p '' nfv
  41 +groupadd nfv
  42 +usermod -a -G nfv nfv
  43 +
  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
  51 +usermod -P root root
  52 +
  53 +# Extend path variable for sysadmin
  54 +echo 'PATH=/sbin:/usr/sbin:$PATH' >> /home/sysadmin/.bashrc
  55 +chown sysadmin:sys_protected /home/sysadmin/.bashrc
  56 +
  57 +# Avoid duplicate with systemd-fstab-generator
  58 +sed -i "s|\(^.*/dev/root\)|#\1|" /etc/fstab
  59 +
  60 +%end
  61 +
  62 +%post --nochroot
  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
  68 +
  69 +if [ -f /media/realroot/efi.img ]; then
  70 +  cp /media/realroot/efi.img /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/efiboot.img
  71 +fi
  72 +
  73 +%end
  74 +
  75  %post --erroronfail
  76
  77  # Source common functions
  78 @@ -31,25 +83,26 @@ else
  79  fi
  80
  81  . /etc/platform/platform.conf
  82 -# Configure smart package manager channels
  83 -rm -rf /var/lib/smart
  84 -mkdir /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
  91 -
  92 -# Configure smart to use rpm --nolinktos option
  93 -/usr/bin/smart config --set rpm-nolinktos=true
  94 -
  95 -# Configure smart to use rpm --nosignature option
  96 -/usr/bin/smart config --set rpm-check-signatures=false
  97
  98  # Delete the CentOS yum repo files
  99  rm -f /etc/yum.repos.d/CentOS-*
 100
 101 +# Create platform yum repo file
 102 +mkdir -p /etc/yum.repos.d
 103 +cat >/etc/yum.repos.d/platform.repo <<EOF
 104 +[platform-base]
 105 +name=platform-base
 106 +baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
 107 +gpgcheck=0
 108 +enabled=1
 109 +
 110 +[platform-updates]
 111 +name=platform-updates
 112 +baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
 113 +gpgcheck=0
 114 +enabled=1
 115 +EOF
 116 +
 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
 121  chage -d 0 sysadmin
 122
 123  # Lock the root password
 124 -passwd -l root
 125 +#passwd -l root
 126
 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
 131
 132  # Disable automount of /dev/hugepages
 133 -systemctl mask dev-hugepages.mount
 134 +#systemctl mask dev-hugepages.mount
 135
 136  # Disable firewall
 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
 142 @@ -95,9 +95,9 @@ fi
 143  perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
 144
 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
 148  else
 149 -  grub2-mkconfig -o /boot/grub2/grub.cfg
 150 +  grub-mkconfig -o /boot/grub/grub.cfg
 151  fi
 152
 153  %end
 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
 158 @@ -42,9 +42,9 @@ fi
 159  perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
 160
 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
 164  else
 165 -  grub2-mkconfig -o /boot/grub2/grub.cfg
 166 +  grub-mkconfig -o /boot/grub/grub.cfg
 167  fi
 168
 169  %end
 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
 174 @@ -36,9 +36,9 @@ fi
 175  perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
 176
 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
 180  else
 181 -  grub2-mkconfig -o /boot/grub2/grub.cfg
 182 +  grub-mkconfig -o /boot/grub/grub.cfg
 183  fi
 184
 185  %end
 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
 190 @@ -61,8 +61,7 @@ fi
 191
 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
 198  fi
 199
 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
 206  %end
 207
 208 +##############################################################
 209 +# pre script for poky-stx
 210 +##############################################################
 211 +%pre
 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
 216 +%end
 217 +
 218 +##############################################################
 219 +# Main kickstart
 220 +##############################################################
 221  #version=DEVEL
 222  install
 223  lang en_US.UTF-8
 224  keyboard us
 225  %include /tmp/timezone-include
 226 -# set to 'x' so we can use shadow password
 227 -rootpw  --iscrypted x
 228 +# Root password:
 229 +rootpw --iscrypted $6$ArDcm/wSNLJLT2OP$QdWX6kMUgBVsiibukLBLtLfRDVz0n49BQ1svT7hPEQJASvKnqkEL5zc5kqUMMzXzLrj80z6YX9DmYTD0Ysxn.1
 230 +
 231  selinux --disabled
 232  authconfig --enableshadow --passalgo=sha512
 233  firewall --service=ssh
 234
 235 +# Use text mode install
 236 +text
 237 +
 238 +# Use CDROM installation media
 239 +cdrom
 240 +
 241 +# Run the Setup Agent on first boot
 242 +firstboot --enable
 243 +
 244 +# System services
 245 +services --enabled="lvm2-monitor.service"
 246 +
 247 +# Do not configure the X Window System
 248 +skipx
 249 +
 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
 257 @@ -1,21 +1,4 @@
 258  %packages
 259 -@core
 260 -@base
 261 --kernel-module-igb-uio-rt
 262 --kernel-module-wrs-avp-rt
 263 --kernel-rt
 264 --kernel-rt-kvm
 265 --kernel-rt-tools
 266 --kernel-rt-tools-libs
 267 --kmod-drbd-rt
 268 --kmod-e1000e-rt
 269 --kmod-i40e-rt
 270 --kmod-ixgbe-rt
 271 --kmod-tpm-rt
 272 --mlnx-ofa_kernel
 273 --mlnx-ofa_kernel-rt
 274 --mlnx-ofa_kernel-rt-modules
 275 --qat16-rt
 276 -xxxPACKAGE_LISTxxx
 277 +#@^stx-image-aio
 278  %end
 279
 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
 284 @@ -1,20 +1,4 @@
 285  %packages
 286 -@core
 287 -@base
 288 --kernel-module-igb-uio
 289 --kernel-module-wrs-avp
 290 --kernel
 291 --kernel-tools
 292 --kernel-tools-libs
 293 --kmod-drbd
 294 --kmod-e1000e
 295 --kmod-i40e
 296 --kmod-ixgbe
 297 --kmod-tpm
 298 --mlnx-ofa_kernel
 299 --mlnx-ofa_kernel-rt
 300 --mlnx-ofa_kernel-modules
 301 --qat16
 302 -xxxPACKAGE_LISTxxx
 303 +#@^stx-image-aio
 304  %end
 305
 306 --
 307 2.7.4
 308