Fixed CentOS bootstrap

Author: meefik

include/bootstrap/centos/deploy.sh

@@ -38,7 +38,7 @@ yum_groupinstall()
     local groupname="$@"
     [ -n "${groupname}" ] || return 1
     (set -e
-        chroot_exec -u root yum groupinstall ${groupname} --nogpgcheck --skip-broken -y
+        chroot_exec -u root yum groups install ${groupname} --nogpgcheck --skip-broken -y
         chroot_exec -u root yum clean all
     exit 0)
     return $?
@@ -65,7 +65,7 @@ do_install()
 
     msg ":: Installing ${COMPONENT} ... "
 
-    local basic_packages="audit-libs basesystem bash bzip2-libs ca-certificates centos-release chkconfig coreutils cpio cracklib cracklib-dicts cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs diffutils elfutils-libelf elfutils-libs expat file-libs filesystem gawk gdbm glib2 glibc glibc-common gmp gnupg2 gpgme grep gzip info keyutils-libs kmod kmod-libs krb5-libs libacl libassuan libattr libblkid libcap libcap-ng libcom_err libcurl libdb libdb-utils libffi libgcc libgcrypt libgpg-error libidn libmount libpwquality libselinux libsemanage libsepol libssh2 libstdc++ libtasn1 libuser libutempter libuuid libverto libxml2 lua ncurses ncurses-base ncurses-libs nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-tools nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pinentry pkgconfig popt pth pygpgme pyliblzma python python-chardet python-iniparse python-kitchen python-libs python-pycurl python-urlgrabber pyxattr qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-python sed selinux-policy setup shadow-utils shared-mime-info sqlite sudo systemd systemd-libs tzdata ustr util-linux vim-minimal which xz-libs yum yum-metadata-parser yum-plugin-fastestmirror yum-utils zlib"
+    local basic_packages="audit-libs basesystem bash bzip2-libs ca-certificates chkconfig coreutils cpio cracklib cracklib-dicts cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs diffutils elfutils-libelf elfutils-libs expat file-libs filesystem gawk gdbm glib2 glibc glibc-common gmp gnupg2 gpgme grep gzip info keyutils-libs kmod kmod-libs krb5-libs libacl libassuan libattr libblkid libcap libcap-ng libcom_err libcurl libdb libdb-utils libffi libgcc libgcrypt libgpg-error libidn libmount libpwquality libselinux libsemanage libsepol libssh2 libstdc++ libtasn1 libuuid libverto libxml2 lua lz4 ncurses ncurses-base ncurses-libs nspr nss nss-pem nss-softokn nss-softokn-freebl nss-sysinit nss-tools nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pinentry pkgconfig popt pth pygpgme pyliblzma python python-iniparse python-libs python-pycurl python-urlgrabber pyxattr qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-python sed setup shadow-utils shared-mime-info sqlite sudo systemd systemd-libs tzdata ustr util-linux vim-minimal which xz-libs yum yum-metadata-parser yum-plugin-fastestmirror yum-utils zlib"
     local repo_url="${SOURCE_PATH%/}/${SUITE}/os/${ARCH}"
 
     msg "URL: ${repo_url}"
@@ -94,8 +94,7 @@ do_install()
     for package in ${basic_packages}; do
         msg -n "${package} ... "
         pkg_url=$(grep -e "^.*/${package}-[0-9][0-9\.\-].*rpm$" "${pkg_list}" | grep -m1 ${pkg_arch})
-        test "${pkg_url}"
-        is_ok "skip" || continue
+        test "${pkg_url}"; is_ok "fail" || return 1
         pkg_file="${pkg_url##*/}"
         # download
         for i in 1 2 3
@@ -126,7 +125,8 @@ do_install()
     is_ok "fail" "done"
 
     msg "Installing minimal environment: "
-    yum_groupinstall "Minimal Install" --exclude filesystem,openssh-server
+    yum_groupinstall "Minimal Install" --exclude filesystem,linux-firmware,openssh-server &&
+    chroot_exec -u root yum-config-manager --disable centos-kernel >/dev/null
     is_ok || return 1
 
     return 0