smeserver-centos2sme/contribs10/smeserver-centos2sme-6.9.1-SME10-2.patch

diff -Nur smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme
--- smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme      2020-04-17 15:33:36.446000000 -0400
+++ smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme  2020-04-17 17:34:18.449000000 -0400
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 
-echo "Welcome to the CentOS to SME Server script. Ar you sure you have at least one ethernet interface before proceeding ? Hit Ctrl+C if unsure, press 'enter' if you are OK to proceed."
+echo "Welcome to the CentOS to SME Server script. Are you sure you have at least one ethernet interface before proceeding ? Hit Ctrl+C if unsure, press 'enter' if you are OK to proceed."
 read testme
 
 echo "disabling and removing SELinux"
-sed -i -e 's/rhgb quiet/selinux=0/g' /boot/grub/grub.conf
-sed -i -e 's/SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
+sed -i -e 's/rhgb quiet/selinux=0/g' /boot/grub2/grub.cfg
+sed -i -e 's/^SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
 setenforce 0
 yum remove selinux-policy-targeted -y 1>/dev/null
 
 echo "##########################################################################"
 echo "setting yum repo for SME Server"
-mkdir /tmp/repo.bak
+mkdir -p /tmp/repo.bak
 mv /etc/yum.repos.d/*.repo /tmp/repo.bak/
 cp /etc/yum.prosmerepos.d/* /etc/yum.repos.d/
 
@@ -34,28 +34,25 @@
 rpm -e --nodeps dhcp-common
 
 echo "##########################################################################"
-echo "yum upgrade to install sme build of initscript:"
+echo "yum upgrade to install last updates, this may take a while, output is hidden unless there is an error, be patient:"
 yum upgrade -y 1>/dev/null
 
-initscripts=`rpm -q initscripts`
-
-if [[ $initscripts =~ ^initscripts-[0-9.\-]*\.el[0-9_]+\.sme.*$ ]]; then
-         echo "... OK"; 
-else         
-       echo "... something wrong try to manually install the SME version of initscripts. 
-One possible reason of this is that initscripts from CentOS is a newest version /release than the one in SME repositories.";
-       exit 1
-fi 
-
-
 # they might have come back with upgrade...
 rm /etc/yum.repos.d/CentOS*.repo -rf
 
 # would make a test here to check if initscript was updated or not ...
 echo "##########################################################################"
-echo "yum groupinstall"
+echo "yum groupinstall, installing SME Server ... this may take a while:"
 yum --disablerepo=* --enablerepo=smeos,smeupdates groupinstall base -y
 
+echo "##########################################################################"
+echo "add missing rpms, in case "
+yum install net-tools bind-utils vim-common vim-enhanced vim-filesystem wget yum-plugin-changelog wodim yum-cron zip traceroute tokyocabinet tmpwatch time telnet tdb-tools tcpdump sysfsutils syslinux strace setserial  rsync rp-pppoe  redhat-rpm-config unzip urlview usbutils usermode at bc  boost-iostreams boost-random bzip2 cyrus-sasl cyrus-sasl-md5 device-mapper-multipath device-mapper-multipath-libs dwz ed elfutils fetchmail ftp gdb glib hdparm hesiod iptraf-ng iptstate iscsi-initiator-utils iscsi-initiator-utils-iscsiuio  isdn4k-util librados2 lm_sensors lockdev logwatch lrzsz lsof mhash minicom mkbootdisk mlocate mtools mt-st mutt OpenIPMI OpenIPMI-libs OpenIPMI-modalias patch perl-srpm-macros perl-Sys-CPU perl-Sys-MemInfo perl-Thread-Queue psmisc  python-dateutil python-srpm-macros redhat-rpm-config rpm-build isdn4k-utils qmail -y 1>/dev/null
+
+echo "##########################################################################"
+echo "removing unwanted rpm, in case "
+yum remove snappy selinux-policy wpa_supplicant virt-what tuned centos-logos chrony dracut-config-rescue dracut-network ebtables ethtool expect firewalld firewalld-filesystem fxload gobject-introspection iprutils ipset ipset-libs polkit-pkla-compat -y 1>/dev/null
+
 # check 
 if [[ -f /sbin/e-smith/console ]]; then
        echo "... all seems good untill now"
1	jpp	1.1	diff -Nur smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme
2	jpp	1.2	--- smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme 2020-04-17 15:33:36.446000000 -0400
3			+++ smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme 2020-04-17 17:34:18.449000000 -0400
4			@@ -1,18 +1,18 @@
5			#!/bin/bash
6
7
8			-echo "Welcome to the CentOS to SME Server script. Ar you sure you have at least one ethernet interface before proceeding ? Hit Ctrl+C if unsure, press 'enter' if you are OK to proceed."
9			+echo "Welcome to the CentOS to SME Server script. Are you sure you have at least one ethernet interface before proceeding ? Hit Ctrl+C if unsure, press 'enter' if you are OK to proceed."
10			read testme
11
12			echo "disabling and removing SELinux"
13			-sed -i -e 's/rhgb quiet/selinux=0/g' /boot/grub/grub.conf
14			-sed -i -e 's/SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
15			+sed -i -e 's/rhgb quiet/selinux=0/g' /boot/grub2/grub.cfg
16			+sed -i -e 's/^SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
17			setenforce 0
18			yum remove selinux-policy-targeted -y 1>/dev/null
19
20			echo "##########################################################################"
21			echo "setting yum repo for SME Server"
22			-mkdir /tmp/repo.bak
23			+mkdir -p /tmp/repo.bak
24			mv /etc/yum.repos.d/*.repo /tmp/repo.bak/
25			cp /etc/yum.prosmerepos.d/* /etc/yum.repos.d/
26
27			@@ -34,28 +34,25 @@
28			rpm -e --nodeps dhcp-common
29
30			echo "##########################################################################"
31			-echo "yum upgrade to install sme build of initscript:"
32			+echo "yum upgrade to install last updates, this may take a while, output is hidden unless there is an error, be patient:"
33	jpp	1.1	yum upgrade -y 1>/dev/null
34
35			-initscripts=`rpm -q initscripts`
36			-
37			-if [[ $initscripts =~ ^initscripts-[0-9.\-]\.el[0-9_]+\.sme.$ ]]; then
38			- echo "... OK";
39			-else
40			- echo "... something wrong try to manually install the SME version of initscripts.
41			-One possible reason of this is that initscripts from CentOS is a newest version /release than the one in SME repositories.";
42			- exit 1
43			-fi
44			-
45			-
46			# they might have come back with upgrade...
47			rm /etc/yum.repos.d/CentOS*.repo -rf
48
49	jpp	1.2	# would make a test here to check if initscript was updated or not ...
50			echo "##########################################################################"
51			-echo "yum groupinstall"
52			+echo "yum groupinstall, installing SME Server ... this may take a while:"
53			yum --disablerepo=* --enablerepo=smeos,smeupdates groupinstall base -y
54
55			+echo "##########################################################################"
56			+echo "add missing rpms, in case "
57			+yum install net-tools bind-utils vim-common vim-enhanced vim-filesystem wget yum-plugin-changelog wodim yum-cron zip traceroute tokyocabinet tmpwatch time telnet tdb-tools tcpdump sysfsutils syslinux strace setserial rsync rp-pppoe redhat-rpm-config unzip urlview usbutils usermode at bc boost-iostreams boost-random bzip2 cyrus-sasl cyrus-sasl-md5 device-mapper-multipath device-mapper-multipath-libs dwz ed elfutils fetchmail ftp gdb glib hdparm hesiod iptraf-ng iptstate iscsi-initiator-utils iscsi-initiator-utils-iscsiuio isdn4k-util librados2 lm_sensors lockdev logwatch lrzsz lsof mhash minicom mkbootdisk mlocate mtools mt-st mutt OpenIPMI OpenIPMI-libs OpenIPMI-modalias patch perl-srpm-macros perl-Sys-CPU perl-Sys-MemInfo perl-Thread-Queue psmisc python-dateutil python-srpm-macros redhat-rpm-config rpm-build isdn4k-utils qmail -y 1>/dev/null
58			+
59			+echo "##########################################################################"
60			+echo "removing unwanted rpm, in case "
61			+yum remove snappy selinux-policy wpa_supplicant virt-what tuned centos-logos chrony dracut-config-rescue dracut-network ebtables ethtool expect firewalld firewalld-filesystem fxload gobject-introspection iprutils ipset ipset-libs polkit-pkla-compat -y 1>/dev/null
62			+
63			# check
64			if [[ -f /sbin/e-smith/console ]]; then
65			echo "... all seems good untill now"