config.sh (fogproject-1.5.7) | : | config.sh (fogproject-1.5.8) | ||
---|---|---|---|---|
skipping to change at line 24 | skipping to change at line 24 | |||
# GNU General Public License for more details. | # GNU General Public License for more details. | |||
# | # | |||
# You should have received a copy of the GNU General Public License | # You should have received a copy of the GNU General Public License | |||
# along with this program. If not, see <http://www.gnu.org/licenses/>. | # along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
# | # | |||
#[[ ! -d /run/rpcbind ]] && mkdir /run/rpcbind | #[[ ! -d /run/rpcbind ]] && mkdir /run/rpcbind | |||
#[[ ! -f /run/rpcbind/rpcbind.lock ]] && touch /run/rpcbind/rpcbind.lock | #[[ ! -f /run/rpcbind/rpcbind.lock ]] && touch /run/rpcbind/rpcbind.lock | |||
[[ -z $packageQuery ]] && packageQuery="rpm -q \$x" | [[ -z $packageQuery ]] && packageQuery="rpm -q \$x" | |||
case $linuxReleaseName in | case $linuxReleaseName in | |||
*[Mm][Aa][Gg][Ee][Ii][Aa]*) | *[Mm][Aa][Gg][Ee][Ii][Aa]*) | |||
[[ -z $packages ]] && packages="apache apache-mod_fcgid apache-mod_php a pache-mod_ssl cdrkit-genisoimage curl dhcp-server gcc gcc-c++ gzip htmldoc lftp m4 make mariadb mariadb-common mariadb-common-core mariadb-core net-tools nfs-ut ils perl perl-Crypt-PasswdMD5 php-cli php-curl php-fpm php-gd php-gettext php-ld ap php-mbstring php-mysqlnd php-pcntl php-pdo php-pdo_mysql tar tftp-server vsft pd wget xinetd" | [[ -z $packages ]] && packages="apache apache-mod_fcgid apache-mod_php a pache-mod_ssl cdrkit-genisoimage curl dhcp-server gcc gcc-c++ git gzip htmldoc l ftp m4 make mariadb mariadb-common mariadb-common-core mariadb-core net-tools nf s-utils perl perl-Crypt-PasswdMD5 php-cli php-curl php-fpm php-gd php-gettext ph p-ldap php-mbstring php-mysqlnd php-pcntl php-pdo php-pdo_mysql tar tftp-server vsftpd wget xinetd" | |||
[[ -z $packageinstaller ]] && packageinstaller="urpmi --auto" | [[ -z $packageinstaller ]] && packageinstaller="urpmi --auto" | |||
[[ -z $packagelist ]] && packagelist="urpmq" | [[ -z $packagelist ]] && packagelist="urpmq" | |||
[[ -z $packageupdater ]] && packageupdater="$packageinstaller" | [[ -z $packageupdater ]] && packageupdater="$packageinstaller" | |||
[[ -z $packmanUpdate ]] && packmanUpdate="urpmi.update -a" | [[ -z $packmanUpdate ]] && packmanUpdate="urpmi.update -a" | |||
[[ -z $dhcpname ]] && dhcpname="dhcp-server" | [[ -z $dhcpname ]] && dhcpname="dhcp-server" | |||
[[ -z $tftpdirdst ]] && tftpdirdst="/var/lib/tftpboot" | [[ -z $tftpdirdst ]] && tftpdirdst="/var/lib/tftpboot" | |||
[[ -z $nfsexportsopts ]] && nfsexportsopts="no_subtree_check" | [[ -z $nfsexportsopts ]] && nfsexportsopts="no_subtree_check" | |||
[[ -z $etcconf ]] && etcconf="/etc/httpd/conf/conf.d/fog.conf" | [[ -z $etcconf ]] && etcconf="/etc/httpd/conf/conf.d/fog.conf" | |||
;; | ;; | |||
*) | *) | |||
[[ -z $etcconf ]] && etcconf="/etc/httpd/conf.d/fog.conf" | [[ -z $etcconf ]] && etcconf="/etc/httpd/conf.d/fog.conf" | |||
[[ -z $packages ]] && packages="curl dhcp gcc gcc-c++ genisoimage gzip h | [[ -z $packages ]] && { | |||
ttpd lftp m4 make mod_fastcgi mod_ssl mtools mysql mysql-server net-tools nfs-ut | if [[ $OSVersion -gt 7 ]]; then | |||
ils php php-cli php-common php-fpm php-gd php-ldap php-mbstring php-mysqlnd php- | packages="curl dhcp-server gcc gcc-c++ genisoimage git gzip http | |||
process syslinux tar tftp-server vsftpd wget xinetd xz-devel" | d lftp m4 make mod_fastcgi mod_ssl mtools mysql mysql-server net-tools nfs-utils | |||
php php-cli php-common php-fpm php-gd php-json php-ldap php-mbstring php-mysqln | ||||
d php-process syslinux tar tftp-server vsftpd wget xinetd xz-devel" | ||||
else | ||||
packages="curl dhcp gcc gcc-c++ genisoimage git gzip httpd lftp | ||||
m4 make mod_fastcgi mod_ssl mtools mysql mysql-server net-tools nfs-utils php ph | ||||
p-cli php-common php-fpm php-gd php-ldap php-mbstring php-mysqlnd php-process sy | ||||
slinux tar tftp-server vsftpd wget xinetd xz-devel" | ||||
fi | ||||
} | ||||
command -v dnf >>$workingdir/error_logs/fog_error_${version}.log 2>&1 | command -v dnf >>$workingdir/error_logs/fog_error_${version}.log 2>&1 | |||
if [[ $? -eq 0 ]]; then | if [[ $? -eq 0 ]]; then | |||
[[ -z $packageinstaller ]] && packageinstaller="dnf -y install" | [[ -z $packageinstaller ]] && packageinstaller="dnf -y install" | |||
[[ -z $packagelist ]] && packagelist="dnf list" | [[ -z $packagelist ]] && packagelist="dnf list" | |||
[[ -z $packageupdater ]] && packageupdater="dnf -y update" | [[ -z $packageupdater ]] && packageupdater="dnf -y update" | |||
[[ -z $packageUpdate ]] && packmanUpdate="dnf check-update" | [[ -z $packageUpdate ]] && packmanUpdate="dnf check-update" | |||
[[ -z $repoenable ]] && repoenable="dnf config-manager --set-enabled " | [[ -z $repoenable ]] && repoenable="dnf config-manager --set-enabled " | |||
else | else | |||
[[ -z $packageinstaller ]] && packageinstaller="yum -y install" | [[ -z $packageinstaller ]] && packageinstaller="yum -y install" | |||
[[ -z $packagelist ]] && packagelist="yum list" | [[ -z $packagelist ]] && packagelist="yum list" | |||
End of changes. 2 change blocks. | ||||
5 lines changed or deleted | 14 lines changed or added |