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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=46
This commit is contained in:
Dr. Werner Fink 2011-08-17 15:55:27 +00:00 committed by Git OBS Bridge
parent bf1f1042a6
commit 6c0eae96c7
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rc.syslog
View File

@ -64,9 +64,7 @@ case "$SYSLOG_DAEMON" in
params="$SYSLOG_NG_PARAMS" params="$SYSLOG_NG_PARAMS"
ngsocks="/var/run/syslog-ng/additional-log-sockets.conf" ngsocks="/var/run/syslog-ng/additional-log-sockets.conf"
ngsocksdir="/var/run/syslog-ng" ngsocksdir="/var/run/syslog-ng"
if [ ! -d $ngsocksdir ]; then mkdir -p -m 0755 $ngsocksdir
mkdir -p $ngsocksdir
fi
test -r "$config" && \ test -r "$config" && \
while read line; do while read line; do
case $line in file*/proc/kmsg*) case $line in file*/proc/kmsg*)
@ -78,6 +76,7 @@ case "$SYSLOG_DAEMON" in
syslog=syslogd syslog=syslogd
config=/etc/syslog.conf config=/etc/syslog.conf
params="$SYSLOGD_PARAMS" params="$SYSLOGD_PARAMS"
mkdir -p -m 0755 /var/run
;; ;;
esac esac

2
syslog-service-generator
View File

@ -299,7 +299,7 @@ if test "$start_klogd" != no ; then
fi fi
# #
# Last but not least remove the old service links from SystemV init # Last but not least remove the old (early) service links from SystemV init
# #
for service in /etc/init.d/*.d/*syslog ; do for service in /etc/init.d/*.d/*syslog ; do
test -h $service || continue test -h $service || continue

5
syslogd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 17 15:45:58 UTC 2011 - werner@suse.de
- Add generator script for better support with systemd
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 28 08:51:31 UTC 2011 - aj@suse.de Tue Jun 28 08:51:31 UTC 2011 - aj@suse.de

6
syslogd.spec
View File

@ -36,6 +36,7 @@ Source3: rc.syslog
Source4: rc.earlysyslog Source4: rc.earlysyslog
Source5: syslog.xml Source5: syslog.xml
Source6: syslog.8 Source6: syslog.8
Source7: syslog-service-generator
Patch0: sysklogd-1.4.1.dif Patch0: sysklogd-1.4.1.dif
Patch1: sysklogd-1.4.1-dgram.patch Patch1: sysklogd-1.4.1-dgram.patch
Patch2: sysklogd-1.4.1-sparc.patch Patch2: sysklogd-1.4.1-sparc.patch
@ -147,6 +148,7 @@ mv sample-s390.conf sample.conf
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system-generator
mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/rsyslog mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/rsyslog
make install MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT make install MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT
ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog
@ -157,6 +159,7 @@ mv sample-s390.conf sample.conf
install -d $RPM_BUILD_ROOT/%{omc_svcdir}/ install -d $RPM_BUILD_ROOT/%{omc_svcdir}/
install -m 600 %{SOURCE5} $RPM_BUILD_ROOT/%{omc_svcdir}/ install -m 600 %{SOURCE5} $RPM_BUILD_ROOT/%{omc_svcdir}/
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8
install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/lib/systemd/system-generator/
%ifarch s390 s390x %ifarch s390 s390x
sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \ sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog > $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@ -242,9 +245,10 @@ fi
%doc %{_mandir}/man8/klogd.8.gz %doc %{_mandir}/man8/klogd.8.gz
%doc %{_mandir}/man8/sysklogd.8.gz %doc %{_mandir}/man8/sysklogd.8.gz
%doc %{_mandir}/man8/syslog.8.gz %doc %{_mandir}/man8/syslog.8.gz
/sbin/rcsyslog
/sbin/klogd /sbin/klogd
/sbin/rcsyslog
%attr(0755,root,root) %dir %ghost /var/run/rsyslog/ %attr(0755,root,root) %dir %ghost /var/run/rsyslog/
%attr(0755,root,root) %dir %ghost /var/run/syslog-ng/
%{omc_svcdir}/syslog.xml %{omc_svcdir}/syslog.xml
%changelog %changelog