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