/[smecontribs]/rpms/smeserver-centos2sme/contribs10/smeserver-centos2sme-6.9.1-secondSME10.patch
ViewVC logotype

Annotation of /rpms/smeserver-centos2sme/contribs10/smeserver-centos2sme-6.9.1-secondSME10.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.3 - (hide annotations) (download)
Wed Mar 24 18:21:49 2021 UTC (3 years, 2 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-centos2sme-6_9_1-13_el7_sme, smeserver-centos2sme-6_9_1-12_el7_sme, smeserver-centos2sme-6_9_1-11_el7_sme, HEAD
Changes since 1.2: +2 -2 lines
* Sun Mar 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 6.9.1-11.sme
- fix  typo [SME: 10850]

1 jpp 1.1 diff -Nur --no-dereference smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme
2     --- smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme 2021-03-19 22:55:54.307000000 -0400
3 jpp 1.2 +++ smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme 2021-03-20 14:56:16.149000000 -0400
4 jpp 1.1 @@ -27,14 +27,15 @@
5     echo "cleaning yum cache"
6     yum --enablerepo=* clean all 1>/dev/null
7    
8     -echo "##########################################################################"
9     -echo "Removing dhcp-common"
10     +#echo "##########################################################################"
11     +#echo "Removing dhcp-common"
12     # from https://forums.contribs.org/index.php/topic,53304.msg276453/topicseen.html#msg276453
13     # Stefano found deps issues
14     -rpm -e --nodeps dhcp-common
15     +#rpm -e --nodeps dhcp-common
16    
17     echo "##########################################################################"
18     echo "yum upgrade to install last updates, this may take a while, output is hidden unless there is an error, be patient:"
19     +#echo "****log noise is expected about modified RPMDB outside of yum. and missing dhcp-common. That is expected.****"
20     yum upgrade -y 1>/dev/null
21    
22     # they might have come back with upgrade...
23     @@ -79,7 +80,8 @@
24    
25     echo "##########################################################################"
26     echo "start syslog"
27     -/etc/init.d/rsyslog start
28     +#/etc/init.d/rsyslog start
29     +/usr/bin/systemctl restart rsyslog
30    
31     echo "##########################################################################"
32     echo "running post-install event for SME..."
33     @@ -90,7 +92,8 @@
34     echo "##########################################################################"
35     echo "set admin password as set"
36     #need syslog to work. so just in case
37     -/etc/init.d/rsyslog restart
38     +#/etc/init.d/rsyslog restart
39     +/usr/bin/systemctl restart rsyslog
40     /sbin/e-smith/db accounts setprop admin PasswordSet yes
41     /sbin/e-smith/db configuration set PasswordSet yes
42     /sbin/e-smith/db configuration setprop bootstrap-console Restore disabled
43     @@ -113,7 +116,8 @@
44     touch /forcequotacheck
45    
46     #start rsyslogd service in case , as console needs it to run...
47     -/etc/init.d/rsyslog restart
48     +#/etc/init.d/rsyslog restart
49     +/usr/bin/systemctl restart rsyslog.service
50    
51     echo "##########################################################################"
52     echo "now time to configure your server using the SME Server console"
53     @@ -124,6 +128,11 @@
54     echo "##########################################################################"
55     echo "set SSHD to accept root login with rsa key"
56     /sbin/e-smith/db configuration setprop sshd status enabled PermitRootLogin yes access public
57 jpp 1.3 +/sbin/e-smith/expand-template /etc/ssh/ssh_config
58     +/sbin/e-smith/expand-template /etc/ssh/sshd_config
59 jpp 1.1 +/usr/bin/systemctl restart sshd.service
60     +# a sshd reload does not regenerate the keys and failed
61     +# doing one after to do the rest (masq etc.)
62     /sbin/e-smith/signal-event remoteaccess-update
63    
64     echo "##########################################################################"
65 jpp 1.2 @@ -138,8 +147,12 @@
66     fi
67    
68    
69     +echo "##########################################################################"
70     +echo "Last cleaning:"
71     # last tidying
72     find /var/service/ -type f -iname control -exec rm {} \;
73     +yum remove NetworkManager-libnm libteam teamd python-configobj parted python-decorator python-linux-procf python-perf python-pyude python-schedutils python-slip python-slip-dbu mozjs17 microcode_ctl -y
74     +
75    
76     # just in case before reboot
77     /sbin/e-smith/db configuration set PasswordSet yes

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed