Added option --extra-packages

Author: meefik

include/bootstrap/alpine/deploy.sh

@@ -14,7 +14,7 @@ then
     esac
 fi
 
-  [ -n "${SOURCE_PATH}" ] || SOURCE_PATH="http://dl-cdn.alpinelinux.org/alpine/"
+[ -n "${SOURCE_PATH}" ] || SOURCE_PATH="http://dl-cdn.alpinelinux.org/alpine/"
 
 apk_install()
 {
@@ -41,8 +41,8 @@ do_install()
 
     component_exec core/emulator core/mnt core/net
 
-    msg "Installing extra packages: "
-    apk_install shadow sudo tzdata
+    msg "Installing packages: "
+    apk_install shadow sudo tzdata ${EXTRA_PACKAGES}
     is_ok || return 1
 
     return 0
@@ -60,5 +60,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/archlinux/deploy.sh

@@ -71,7 +71,7 @@ do_install()
     local core_files=$(wget -q -O - "${repo_url}/core.db.tar.gz" | tar xOz | grep '.pkg.tar.xz$' | grep -v -e '^linux-' -e '^grub-' -e '^efibootmgr-' -e '^openssh-' | sort)
     is_ok "fail" "done" || return 1
 
-    msg "Retrieving core packages: "
+    msg "Retrieving packages: "
     local fs_file=$(echo ${core_files} | grep -m1 '^filesystem-')
     for pkg_file in ${fs_file} ${core_files}
     do
@@ -94,8 +94,8 @@ do_install()
     pacman_repository
     is_ok "fail" "done"
 
-    msg "Installing base packages: "
-    pacman_install base $(echo ${core_files} | sed 's/-[0-9].*$//')
+    msg "Installing packages: "
+    pacman_install base $(echo ${core_files} | sed 's/-[0-9].*$//') ${EXTRA_PACKAGES}
     is_ok || return 1
 
     msg -n "Clearing cache ... "
@@ -114,5 +114,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/centos/deploy.sh

@@ -65,7 +65,7 @@ do_install()
 
     msg ":: Installing ${COMPONENT} ... "
 
-    local base_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 core_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 -n "Preparing for deployment ... "
@@ -81,15 +81,15 @@ do_install()
     exit 0)
     is_ok "fail" "done" || return 1
 
-    msg "Retrieving base packages: "
+    msg "Retrieving packages: "
     local package i pkg_url pkg_file pkg_arch
     case "${ARCH}" in
     i386) pkg_arch="-e i686 -e noarch" ;;
     x86_64) pkg_arch="-e x86_64 -e noarch" ;;
     armhfp) pkg_arch="-e armv7hl -e noarch" ;;
     aarch64) pkg_arch="-e aarch64 -e noarch" ;;
     esac
-    for package in ${base_packages}
+    for package in ${core_packages}
     do
         msg -n "${package} ... "
         pkg_url=$(grep -e "^.*/${package}-[0-9][0-9\.\-].*rpm$" "${pkg_list}" | grep -m1 ${pkg_arch})
@@ -109,7 +109,7 @@ do_install()
 
     component_exec core/emulator
 
-    msg "Installing base packages ... "
+    msg "Installing packages ... "
     chroot_exec /bin/rpm -i --force --nosignature --nodeps /tmp/*.rpm
     is_ok || return 1
 
@@ -128,6 +128,12 @@ do_install()
     chroot_exec -u root yum-config-manager --disable centos-kernel >/dev/null
     is_ok || return 1
 
+    if [ -n "${EXTRA_PACKAGES}" ]; then
+      msg "Installing extra packages: "
+      yum_install ${EXTRA_PACKAGES}
+      is_ok || return 1
+    fi
+
     return 0
 }
 
@@ -144,5 +150,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/debian/deploy.sh

@@ -54,6 +54,9 @@ do_install()
     #selinux_support && include_packages="${include_packages},selinux-basics"
 
     (set -e
+        if [ -n "${EXTRA_PACKAGES}" ]; then
+          include_packages="${include_packages},$(echo ${EXTRA_PACKAGES} | tr ' ' ',')"
+        fi
         DEBOOTSTRAP_DIR="$(component_dir bootstrap/debian)/debootstrap"
         . "${DEBOOTSTRAP_DIR}/debootstrap" --no-check-gpg --foreign --extractor=ar --arch="${ARCH}" --exclude="${exclude_packages}" --include="${include_packages}" "${SUITE}" "${CHROOT_DIR}" "${SOURCE_PATH}"
     exit 0)
@@ -84,5 +87,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/fedora/deploy.sh

@@ -52,7 +52,7 @@ do_install()
 
     msg ":: Installing ${COMPONENT} ... "
 
-    local base_packages="audit-libs basesystem bash bash-completion bzip2-libs ca-certificates chkconfig coreutils cpio cracklib crypto-policies cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs device-mapper-libs dnf dnf-conf dnf-plugins-core dnf-yum elfutils-libelf elfutils-libs expat fedora-gpg-keys fedora-release fedora-repos file-libs filesystem gawk gdbm glib2 glibc glibc-common gmp gnupg2 gnutls gobject-introspection gpgme grep gzip info iptables-libs json-c keyutils-libs kmod-libs krb5-libs libacl libarchive libargon2 libassuan libattr libblkid libcap libcap-ng libcom_err libcomps libcurl libdb libdb-utils libdnf libffi libgcc libgcrypt libgpg-error libidn2 libmetalink libmodulemd libmount libnghttp2 libnsl2 libpcap libpsl libpwquality librepo libreport-filesystem libseccomp libselinux libsemanage libsepol libsigsegv libsmartcols libsolv libssh libtasn1 libtirpc libunistring libutempter libuuid libverto libxcrypt libxml2 libyaml libzstd lua-libs lz4-libs mpfr ncurses ncurses-base ncurses-libs nettle nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pcre2 popt python3 python3-dnf python3-dnf-plugins-core python3-gobject-base python3-gpg python3-hawkey python3-iniparse python3-libcomps python3-librepo python3-libs python3-pip python3-rpm python3-setuptools python3-six python3-smartcols qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-plugin-selinux sed setup shadow-utils sqlite-libs sudo systemd systemd-libs tzdata util-linux vim-minimal which xz-libs zlib"
+    local core_packages="audit-libs basesystem bash bash-completion bzip2-libs ca-certificates chkconfig coreutils cpio cracklib crypto-policies cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs device-mapper-libs dnf dnf-conf dnf-plugins-core dnf-yum elfutils-libelf elfutils-libs expat fedora-gpg-keys fedora-release fedora-repos file-libs filesystem gawk gdbm glib2 glibc glibc-common gmp gnupg2 gnutls gobject-introspection gpgme grep gzip info iptables-libs json-c keyutils-libs kmod-libs krb5-libs libacl libarchive libargon2 libassuan libattr libblkid libcap libcap-ng libcom_err libcomps libcurl libdb libdb-utils libdnf libffi libgcc libgcrypt libgpg-error libidn2 libmetalink libmodulemd libmount libnghttp2 libnsl2 libpcap libpsl libpwquality librepo libreport-filesystem libseccomp libselinux libsemanage libsepol libsigsegv libsmartcols libsolv libssh libtasn1 libtirpc libunistring libutempter libuuid libverto libxcrypt libxml2 libyaml libzstd lua-libs lz4-libs mpfr ncurses ncurses-base ncurses-libs nettle nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pcre2 popt python3 python3-dnf python3-dnf-plugins-core python3-gobject-base python3-gpg python3-hawkey python3-iniparse python3-libcomps python3-librepo python3-libs python3-pip python3-rpm python3-setuptools python3-six python3-smartcols qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-plugin-selinux sed setup shadow-utils sqlite-libs sudo systemd systemd-libs tzdata util-linux vim-minimal which xz-libs zlib"
 
     local repo_url
     if [ "${ARCH}" = "i386" ]
@@ -73,15 +73,15 @@ do_install()
     exit 0)
     is_ok "fail" "done" || return 1
 
-    msg "Retrieving base packages: "
+    msg "Retrieving packages: "
     local package i pkg_url pkg_file pkg_arch
     case "${ARCH}" in
     i386) pkg_arch="-e i686 -e noarch" ;;
     x86_64) pkg_arch="-e x86_64 -e noarch" ;;
     armhfp) pkg_arch="-e armv7hl -e noarch" ;;
     aarch64) pkg_arch="-e aarch64 -e noarch" ;;
     esac
-    for package in ${base_packages}
+    for package in ${core_packages}
     do
         msg -n "${package} ... "
         pkg_url=$(grep -e "^.*/${package}-[0-9r][0-9\.\-].*rpm$" "${pkg_list}" | grep -m1 ${pkg_arch})
@@ -101,7 +101,7 @@ do_install()
 
     component_exec core/emulator
 
-    msg "Installing base packages ... "
+    msg "Installing packages ... "
     chroot_exec /bin/rpm -i --force --nosignature --nodeps /tmp/*.rpm
     is_ok || return 1
 
@@ -119,6 +119,12 @@ do_install()
     dnf_install @minimal-environment --exclude filesystem,openssh-server
     is_ok || return 1
 
+    if [ -n "${EXTRA_PACKAGES}" ]; then
+      msg "Installing extra packages: "
+      dnf_install ${EXTRA_PACKAGES}
+      is_ok || return 1
+    fi
+
     return 0
 }
 
@@ -134,5 +140,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/kali/deploy.sh

@@ -28,5 +28,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/slackware/deploy.sh

@@ -63,7 +63,7 @@ do_install()
     esac
 
     local cache_dir="${CHROOT_DIR}/tmp"
-    local extra_packages="l/glibc l/glibc-i18n l/libtermcap l/ncurses ap/diffutils ap/groff ap/man ap/slackpkg ap/sudo n/gnupg n/wget"
+    local base_packages="l/glibc l/glibc-i18n l/libtermcap l/ncurses ap/diffutils ap/groff ap/man ap/slackpkg ap/sudo n/gnupg n/wget"
 
     msg -n "Preparing for deployment ... "
     (set -e
@@ -75,14 +75,14 @@ do_install()
     is_ok "fail" "done" || return 1
 
     msg -n "Retrieving packages list ... "
-    local base_packages=$(wget -q -O - "${repo_url}/a/tagfile" | grep -v -e 'kernel' -e 'efibootmgr' -e 'lilo' -e 'grub' -e 'devs' | awk -F: '{if ($1!="") print "a/"$1}')
+    local core_packages=$(wget -q -O - "${repo_url}/a/tagfile" | grep -v -e 'kernel' -e 'efibootmgr' -e 'lilo' -e 'grub' -e 'devs' | awk -F: '{if ($1!="") print "a/"$1}')
     local pkg_list="${cache_dir}/packages.list"
     wget -q -O - "${repo_url}/FILE_LIST" | grep -o -e '/.*\.\tgz$' -e '/.*\.\txz$' > "${pkg_list}"
     is_ok "fail" "done" || return 1
 
-    msg "Retrieving base packages: "
+    msg "Retrieving and installing packages: "
     local package i pkg_url pkg_file
-    for package in ${base_packages} ${extra_packages}
+    for package in ${core_packages} ${base_packages} ${EXTRA_PACKAGES}
     do
         msg -n "${package} ... "
         pkg_url=$(grep -m1 -e "/${package}\-" "${pkg_list}")
@@ -134,5 +134,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }

include/bootstrap/ubuntu/deploy.sh

@@ -52,5 +52,8 @@ cat <<EOF
    --source-path="${SOURCE_PATH}"
      Installation source, can specify address of the repository or path to the rootfs archive.
 
+   --extra-packages="${EXTRA_PACKAGES}"
+     List of optional installation packages, separated by spaces.
+
 EOF
 }