-Removed init script
-fix bnc#880364 - at pam file is not calling pam_loginuid OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=80
This commit is contained in:
parent
0fa745d329
commit
791888f553
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 16 14:27:26 UTC 2014 - vdziewiecki@suse.com
|
||||||
|
|
||||||
|
-Removed init script
|
||||||
|
-fix bnc#880364 - at pam file is not calling pam_loginuid
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 3 10:21:36 UTC 2014 - aj@ajaissle.de
|
Mon Mar 3 10:21:36 UTC 2014 - aj@ajaissle.de
|
||||||
|
|
||||||
|
23
at.spec
23
at.spec
@ -25,7 +25,6 @@ Group: System/Daemons
|
|||||||
|
|
||||||
Url: ftp://ftp.debian.org/debian/pool/main/a/at
|
Url: ftp://ftp.debian.org/debian/pool/main/a/at
|
||||||
Source: ftp://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz
|
Source: ftp://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz
|
||||||
Source1: atd.init
|
|
||||||
Source2: atd.pamd
|
Source2: atd.pamd
|
||||||
Source3: sysconfig.atd
|
Source3: sysconfig.atd
|
||||||
Source4: at.sleep
|
Source4: at.sleep
|
||||||
@ -132,15 +131,9 @@ export SENDMAIL=%{_sbindir}/sendmail
|
|||||||
mkdir docs
|
mkdir docs
|
||||||
mv %{buildroot}/%{_prefix}/doc/at/* docs/
|
mv %{buildroot}/%{_prefix}/doc/at/* docs/
|
||||||
|
|
||||||
%if ! %{has_systemd}
|
|
||||||
%{__install} -d %{buildroot}%{_sysconfdir}/init.d
|
|
||||||
%{__install} %SOURCE1 %{buildroot}%{_sysconfdir}/init.d/atd
|
|
||||||
%{__ln_s} -f ../../%{_sysconfdir}/init.d/atd %{buildroot}%{_sbindir}/rcatd
|
|
||||||
%else
|
|
||||||
%{__install} -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service
|
%{__install} -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service
|
||||||
%{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh
|
%{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh
|
||||||
%{__ln_s} -f ../../%{_sbindir}/service %{buildroot}%{_sbindir}/rcatd
|
%{__ln_s} -f ../../%{_sbindir}/service %{buildroot}%{_sbindir}/rcatd
|
||||||
%endif
|
|
||||||
|
|
||||||
%{__install} -m644 %SOURCE2 %{buildroot}%{_sysconfdir}/pam.d/atd
|
%{__install} -m644 %SOURCE2 %{buildroot}%{_sysconfdir}/pam.d/atd
|
||||||
%{__install} -m644 %SOURCE3 %{buildroot}%{_localstatedir}/adm/fillup-templates
|
%{__install} -m644 %SOURCE3 %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||||
@ -148,15 +141,11 @@ mv %{buildroot}/%{_prefix}/doc/at/* docs/
|
|||||||
%pre
|
%pre
|
||||||
%{_sbindir}/groupadd -g 25 -o -r at 2> /dev/null || :
|
%{_sbindir}/groupadd -g 25 -o -r at 2> /dev/null || :
|
||||||
%{_sbindir}/useradd -r -o -g at -u 25 -s /bin/bash -c "Batch jobs daemon" -d /var/spool/atjobs at 2> /dev/null || :
|
%{_sbindir}/useradd -r -o -g at -u 25 -s /bin/bash -c "Batch jobs daemon" -d /var/spool/atjobs at 2> /dev/null || :
|
||||||
%if 0%{?has_systemd}
|
|
||||||
%service_add_pre atd.service
|
%service_add_pre atd.service
|
||||||
%endif
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%stop_on_removal atd
|
%stop_on_removal atd
|
||||||
%if 0%{?has_systemd}
|
|
||||||
%service_del_preun atd.service
|
%service_del_preun atd.service
|
||||||
%endif
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
# update hack
|
# update hack
|
||||||
@ -166,22 +155,14 @@ if [ -f etc/init.d/at ] ; then
|
|||||||
%{insserv_cleanup}
|
%{insserv_cleanup}
|
||||||
fi
|
fi
|
||||||
%set_permissions /usr/bin/at
|
%set_permissions /usr/bin/at
|
||||||
%if 0%{?has_systemd}
|
|
||||||
%service_add_post atd.service
|
%service_add_post atd.service
|
||||||
%else
|
|
||||||
%{fillup_and_insserv -n atd atd }
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%verifyscript
|
%verifyscript
|
||||||
%verify_permissions -e /usr/bin/at
|
%verify_permissions -e /usr/bin/at
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%insserv_cleanup
|
%insserv_cleanup
|
||||||
%if 0%{?has_systemd}
|
|
||||||
%service_del_postun atd.service
|
%service_del_postun atd.service
|
||||||
%else
|
|
||||||
%restart_on_update atd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -200,11 +181,7 @@ fi
|
|||||||
%attr(1770,at,at) %dir %{_localstatedir}/spool/atjobs
|
%attr(1770,at,at) %dir %{_localstatedir}/spool/atjobs
|
||||||
%attr(600,at,at) %{_localstatedir}/spool/atjobs/.SEQ
|
%attr(600,at,at) %{_localstatedir}/spool/atjobs/.SEQ
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.atd
|
%{_localstatedir}/adm/fillup-templates/sysconfig.atd
|
||||||
%if 0%{?has_systemd}
|
|
||||||
%{_unitdir}/atd.service
|
%{_unitdir}/atd.service
|
||||||
%{_prefix}/lib/systemd/system-sleep/atd.sh
|
%{_prefix}/lib/systemd/system-sleep/atd.sh
|
||||||
%else
|
|
||||||
%config %{_sysconfdir}/init.d/atd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
149
atd.init
149
atd.init
@ -1,149 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
# Copyright (c) 1995-2002 SuSE GmbH Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# Author: Kurt Garloff <feedback@suse.de>
|
|
||||||
#
|
|
||||||
# /etc/init.d/at
|
|
||||||
#
|
|
||||||
# and symbolic its link
|
|
||||||
#
|
|
||||||
# /sbin/rcat
|
|
||||||
#
|
|
||||||
# System startup script for the at daemon
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: at
|
|
||||||
# Required-Start: $remote_fs $time
|
|
||||||
# Required-Stop: $remote_fs
|
|
||||||
# X-UnitedLinux-Default-Enabled: no
|
|
||||||
# Default-Start: 2 3 5
|
|
||||||
# Default-Stop: 0 1 6
|
|
||||||
# Description: Start AT batch job daemon
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
ATD_BIN=/usr/sbin/atd
|
|
||||||
test -x $ATD_BIN || exit 5
|
|
||||||
|
|
||||||
ATD_CONFIG=/etc/sysconfig/atd
|
|
||||||
test -r $ATD_CONFIG && source /etc/sysconfig/atd
|
|
||||||
|
|
||||||
# Shell functions sourced from /etc/rc.status:
|
|
||||||
# rc_check check and set local and overall rc status
|
|
||||||
# rc_status check and set local and overall rc status
|
|
||||||
# rc_status -v ditto but be verbose in local rc status
|
|
||||||
# rc_status -v -r ditto and clear the local rc status
|
|
||||||
# rc_failed set local and overall rc status to failed
|
|
||||||
# rc_failed <num> set local and overall rc status to <num><num>
|
|
||||||
# rc_reset clear local rc status (overall remains)
|
|
||||||
# rc_exit exit appropriate to overall rc status
|
|
||||||
. /etc/rc.status
|
|
||||||
|
|
||||||
# First reset status of this service
|
|
||||||
rc_reset
|
|
||||||
|
|
||||||
# Return values acc. to LSB for all commands but status:
|
|
||||||
# 0 - success
|
|
||||||
# 1 - generic or unspecified error
|
|
||||||
# 2 - invalid or excess argument(s)
|
|
||||||
# 3 - unimplemented feature (e.g. "reload")
|
|
||||||
# 4 - insufficient privilege
|
|
||||||
# 5 - program is not installed
|
|
||||||
# 6 - program is not configured
|
|
||||||
# 7 - program is not running
|
|
||||||
#
|
|
||||||
# Note that starting an already running service, stopping
|
|
||||||
# or restarting a not-running service as well as the restart
|
|
||||||
# with force-reload (in case signalling is not supported) are
|
|
||||||
# considered a success.
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
echo -n "Starting service at daemon"
|
|
||||||
ATD_ARGS=""
|
|
||||||
if [ -n "$ATD_BATCH_INTERVAL" ]; then
|
|
||||||
ATD_ARGS="-b $ATD_BATCH_INTERVAL";
|
|
||||||
fi
|
|
||||||
if [ -n "$ATD_LOADAVG" ]; then
|
|
||||||
ATD_ARGS="$ATD_ARGS -l $ATD_LOADAVG"
|
|
||||||
fi
|
|
||||||
## Start daemon with startproc(8). If this fails
|
|
||||||
## the echo return value is set appropriate.
|
|
||||||
|
|
||||||
# NOTE: startproc return 0, even if service is
|
|
||||||
# already running to match LSB spec.
|
|
||||||
startproc $ATD_BIN $ATD_ARGS
|
|
||||||
|
|
||||||
# Remember status and be verbose
|
|
||||||
rc_status -v
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
echo -n "Shutting down service at daemon"
|
|
||||||
## Stop daemon with killproc(8) and if this fails
|
|
||||||
## set echo the echo return value.
|
|
||||||
|
|
||||||
killproc -TERM $ATD_BIN
|
|
||||||
|
|
||||||
# Remember status and be verbose
|
|
||||||
rc_status -v
|
|
||||||
;;
|
|
||||||
try-restart)
|
|
||||||
## Stop the service and if this succeeds (i.e. the
|
|
||||||
## service was running before), start it again.
|
|
||||||
## Note: try-restart is not (yet) part of LSB (as of 0.7.5)
|
|
||||||
$0 status >/dev/null && $0 restart
|
|
||||||
|
|
||||||
# Remember status and be quiet
|
|
||||||
rc_status
|
|
||||||
;;
|
|
||||||
restart)
|
|
||||||
## Stop the service and regardless of whether it was
|
|
||||||
## running or not, start it again.
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
|
|
||||||
# Remember status and be quiet
|
|
||||||
rc_status
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
## Signal the daemon to reload its config. Most daemons
|
|
||||||
## do this on signal 1 (SIGHUP).
|
|
||||||
## If it does not support it, restart.
|
|
||||||
|
|
||||||
echo -n "Reload service at daemon"
|
|
||||||
|
|
||||||
## Otherwise:
|
|
||||||
$0 stop && $0 start
|
|
||||||
rc_status
|
|
||||||
;;
|
|
||||||
reload)
|
|
||||||
## Like force-reload, but if daemon does not support
|
|
||||||
## signalling, do nothing (!)
|
|
||||||
|
|
||||||
# If it supports signalling:
|
|
||||||
echo -n "Reload service at daemon"
|
|
||||||
|
|
||||||
## Otherwise if it does not support reload:
|
|
||||||
rc_failed 3
|
|
||||||
rc_status -v
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
echo -n "Checking for at daemon: "
|
|
||||||
## Check status with checkproc(8), if process is running
|
|
||||||
## checkproc will return with exit status 0.
|
|
||||||
|
|
||||||
# Status has a slightly different for the status command:
|
|
||||||
# 0 - service running
|
|
||||||
# 1 - service dead, but /var/run/ pid file exists
|
|
||||||
# 2 - service dead, but /var/lock/ lock file exists
|
|
||||||
# 3 - service not running
|
|
||||||
|
|
||||||
# NOTE: checkproc returns LSB compliant status values.
|
|
||||||
checkproc $ATD_BIN
|
|
||||||
rc_status -v
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
rc_exit
|
|
1
atd.pamd
1
atd.pamd
@ -6,4 +6,5 @@ auth sufficient pam_rootok.so
|
|||||||
auth include common-auth
|
auth include common-auth
|
||||||
account include common-account
|
account include common-account
|
||||||
password include common-password
|
password include common-password
|
||||||
|
session required pam_loginuid.so
|
||||||
session include common-session
|
session include common-session
|
||||||
|
Loading…
x
Reference in New Issue
Block a user