pool/rsyslog
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Added read-only RSYSLOGD_NATIVE_VERSION sysconfig/syslog variable,

Browse Source 
that is set to the native mode version number for the -c parameter
  while every installation and used in the /etc/init.d/syslog script,
  except the user overrides this default in RSYSLOGD_COMPAT_VERSION.

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=8
This commit is contained in:
Marius Tomaschewski 2009-09-09 20:17:52 +00:00 committed by Git OBS Bridge
parent 304ce4b9bf
commit aca8f1252d
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rsyslog.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 9 21:36:16 CEST 2009 - mt@suse.de
- Added read-only RSYSLOGD_NATIVE_VERSION sysconfig/syslog variable,
that is set to the native mode version number for the -c parameter
while every installation and used in the /etc/init.d/syslog script,
except the user overrides this default in RSYSLOGD_COMPAT_VERSION.
-------------------------------------------------------------------
Wed Sep 2 20:15:28 CEST 2009 - mt@suse.de

8
rsyslog.spec
View File

@ -255,7 +255,12 @@ install -m0600 rsyslog.d.remote.conf.$$ \
%{buildroot}%{_sysconfdir}/rsyslog.d/remote.conf
#
install -d -m0755 %{buildroot}/var/adm/fillup-templates
install -m0600 %{_sourcedir}/rsyslog.sysconfig \
# native version for the '-c <compat version>' parameter
rsyslogd_version=%{version}
rsyslogd_version=${rsyslogd_version//.*/}
sed -e "s/@RSYSLOGD_VERSION@/${rsyslogd_version}/g" \
< %{_sourcedir}/rsyslog.sysconfig > rsyslog.sysconfig
install -m0600 rsyslog.sysconfig \
%{buildroot}/var/adm/fillup-templates/sysconfig.syslog-rsyslog
#
rm -f doc/Makefile*
@ -282,6 +287,7 @@ fi
#
# add syslog variables provided by klogd if needed
#
%{remove_and_set -n syslog RSYSLOGD_NATIVE_VERSION}
%{fillup_and_insserv -ny syslog syslog}
%{fillup_and_insserv -nY syslog earlysyslog}
#

29
rsyslog.sysconfig
View File

@ -1,21 +1,36 @@
## Type: integer
## Type: list(@RSYSLOGD_VERSION@)
## Default: "@RSYSLOGD_VERSION@"
## Config: ""
## ServiceRestart: syslog
#
# The native version compatibility level of the current rsyslogd.
#
# Note, that this variable is read-only -- please do not change it!
# Instead, please adopt the RSYSLOGD_COMPAT_VERSION variable.
#
# This variable will be updated while every installation/upgrade of
# the rsyslog daemon package.
#
RSYSLOGD_NATIVE_VERSION="@RSYSLOGD_VERSION@"
## Type: integer(0:@RSYSLOGD_VERSION@)
## Default: ""
## Config: ""
## ServiceRestart: syslog
#
# Version compatibility level to run rsyslogd with (-c parameter).
# Default is to run in a distribution specific mode (that should be a
# native mode of the installed version).
# Set to the desired version number rsyslogd shall be compatible with.
#
# Note:
# Changes to this variable may need adoption of the default config file
# or break the /etc/init.d/syslog script.
# Default is to run in native mode if the currently installed rsyslog
# daemon version.
#
# Note: Changes to this variable may need adoption of the config file
# or break features used in the /etc/init.d/syslog script by default.
#
RSYSLOGD_COMPAT_VERSION=""
### Type: string
## Type: string
## Default: ""
## Config: ""
## ServiceRestart: syslog