/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz9692-cleanup.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz9692-cleanup.patch

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


Revision 1.1 - (show annotations) (download)
Tue Mar 16 16:33:05 2021 UTC (3 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_0-88_el7_sme, e-smith-base-5_8_0-89_el7_sme
* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.0-88.sme
- cleanup /etc/rc.d and /var/service [SME: 9692]

1 diff -Nur --no-dereference e-smith-base-5.8.0.old/root/etc/rc.d/init.d/bootstrap-console e-smith-base-5.8.0/root/etc/rc.d/init.d/bootstrap-console
2 --- e-smith-base-5.8.0.old/root/etc/rc.d/init.d/bootstrap-console 2014-03-23 22:47:24.000000000 -0400
3 +++ e-smith-base-5.8.0/root/etc/rc.d/init.d/bootstrap-console 1969-12-31 19:00:00.000000000 -0500
4 @@ -1,59 +0,0 @@
5 -#!/bin/sh
6 -
7 -#----------------------------------------------------------------------
8 -# copyright (C) 1999-2006 Mitel Networks Corporation
9 -#
10 -# This program is free software; you can redistribute it and/or modify
11 -# it under the terms of the GNU General Public License as published by
12 -# the Free Software Foundation; either version 2 of the License, or
13 -# (at your option) any later version.
14 -#
15 -# This program is distributed in the hope that it will be useful,
16 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
17 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 -# GNU General Public License for more details.
19 -#
20 -# You should have received a copy of the GNU General Public License
21 -# along with this program; if not, write to the Free Software
22 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 -#
24 -#----------------------------------------------------------------------
25 -
26 -#----------------------------------------------------------------------
27 -# bootstrap-console: Fire up the e-smith-console on this virtual terminal
28 -#----------------------------------------------------------------------
29 -
30 -case $1 in
31 -start)
32 - RUN_BOOTSTRAP_CONSOLE=$(/sbin/e-smith/db configuration getprop bootstrap-console Run)
33 -
34 - if [ "x${RUN_BOOTSTRAP_CONSOLE}" = "xno" ]
35 - then
36 - exit 0
37 - fi
38 - # Make it hard to exit from the console without changing anything
39 - /sbin/e-smith/db configuration set UnsavedChanges yes
40 -
41 - while true
42 - do
43 - UNSAVED_CHANGES=$(/sbin/e-smith/db configuration get UnsavedChanges)
44 -
45 - case ${UNSAVED_CHANGES} in
46 - yes) /sbin/e-smith/bootstrap-console console
47 - ;;
48 -
49 - no) # And now we'd better restart rsyslog which
50 - # may have been configured before the changes in the
51 - # console
52 - /etc/rc.d/init.d/rsyslog restart
53 - break
54 - ;;
55 - esac
56 - done
57 - ;;
58 -
59 - *)
60 - echo "Sorry - I don't know how to $0 $1"
61 - exit 1
62 - ;;
63 -esac
64 diff -Nur --no-dereference e-smith-base-5.8.0.old/root/etc/rc.d/init.d/e-smith-service e-smith-base-5.8.0/root/etc/rc.d/init.d/e-smith-service
65 --- e-smith-base-5.8.0.old/root/etc/rc.d/init.d/e-smith-service 2021-03-16 02:09:32.603000000 -0400
66 +++ e-smith-base-5.8.0/root/etc/rc.d/init.d/e-smith-service 1969-12-31 19:00:00.000000000 -0500
67 @@ -1,88 +0,0 @@
68 -#!/bin/sh
69 -
70 -#----------------------------------------------------------------------
71 -# copyright (C) 1999, 2000 e-smith, inc.
72 -#
73 -# This program is free software; you can redistribute it and/or modify
74 -# it under the terms of the GNU General Public License as published by
75 -# the Free Software Foundation; either version 2 of the License, or
76 -# (at your option) any later version.
77 -#
78 -# This program is distributed in the hope that it will be useful,
79 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
80 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
81 -# GNU General Public License for more details.
82 -#
83 -# You should have received a copy of the GNU General Public License
84 -# along with this program; if not, write to the Free Software
85 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
86 -#
87 -# Technical support for this program is available from e-smith, inc.
88 -# Please visit our web site www.e-smith.com for details.
89 -#----------------------------------------------------------------------
90 -
91 -#----------------------------------------------------------------------
92 -# e-smith-service: meta-init script which runs the underlying service
93 -# based on the name of the service script invoked.
94 -# For example S85sshd would run init.d/sshd
95 -#----------------------------------------------------------------------
96 -# Source function library.
97 -SYSTEMCTL_SKIP_REDIRECT=1
98 -. /etc/rc.d/init.d/functions
99 -
100 -METASERVICE=e-smith-service
101 -SERVICE=$( basename $0 | sed -e 's/^[SK][0-9][0-9]*//' )
102 -
103 -export HOME="/root"
104 -
105 -case ${SERVICE} in
106 - ${METASERVICE}) echo "We don't really want to exec ${METASERVICE}" 1>&2
107 - exit 2
108 - ;;
109 -esac
110 -
111 -S_INITSCRIPT="/etc/rc.d/init.d/supervise/${SERVICE}"
112 -INITSCRIPT="/etc/rc.d/init.d/${SERVICE}"
113 -if [ -f ${S_INITSCRIPT} ]
114 -then
115 - # Prefer a supervise init script if we find one
116 - INITSCRIPT=${S_INITSCRIPT}
117 -fi
118 -
119 -STATUS=$( /sbin/e-smith/db configuration getprop ${SERVICE} status )
120 -
121 -if [ "${STATUS}" != "enabled" ]
122 -then
123 - case $1 in
124 - condrestart)
125 - exit 0 ;;
126 - start)
127 - echo -n $"Starting $SERVICE: "
128 - if [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ]
129 - then
130 - [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
131 - echo -n "["
132 - [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
133 - echo -n $" OFF "
134 - [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
135 - echo -n "]"
136 - echo -ne "\r"
137 - fi
138 - echo
139 - exit 0
140 - ;;
141 - esac
142 -fi
143 -
144 -if [ -f ${INITSCRIPT} ]
145 -then
146 - if [ -x ${INITSCRIPT} ]
147 - then
148 - exec ${INITSCRIPT} $@
149 - else
150 - exec /bin/sh ${INITSCRIPT} $@
151 - fi
152 -fi
153 -
154 -echo "$0: Couldn't find/execute init script for service ${SERVICE}" 1>&2
155 -exit 1

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