mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-02 07:15:18 +00:00
Merge Remove unused init scripts, minor improvement to Slackware init script output
Based on !418, where all these changes have been discussed already. MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/845 Acked-by: Christian Boltz <apparmor@cboltz.de> Merged-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
Christian Boltz
@@ -1,117 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
|
||||||
# NOVELL (All rights reserved)
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of version 2 of the GNU General Public
|
|
||||||
# License published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, contact Novell, Inc.
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# rc.apparmor by Steve Beattie
|
|
||||||
#
|
|
||||||
# /etc/init.d/apparmor
|
|
||||||
#
|
|
||||||
# chkconfig: 2345 01 99
|
|
||||||
# description: AppArmor rc file. This rc script inserts the apparmor \
|
|
||||||
# module and runs the parser on the /etc/apparmor.d/ \
|
|
||||||
# directory.
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: apparmor
|
|
||||||
# Required-Start:
|
|
||||||
# Required-Stop:
|
|
||||||
# Default-Start: 3 4 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: AppArmor initialization
|
|
||||||
# Description: AppArmor rc file. This rc script inserts the apparmor
|
|
||||||
# module and runs the parser on the /etc/apparmor.d/
|
|
||||||
# directory.
|
|
||||||
### END INIT INFO
|
|
||||||
APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
|
|
||||||
|
|
||||||
aa_action() {
|
|
||||||
STRING=$1
|
|
||||||
shift
|
|
||||||
$*
|
|
||||||
rc=$?
|
|
||||||
if [ $rc -eq 0 ] ; then
|
|
||||||
aa_log_success_msg $"$STRING "
|
|
||||||
else
|
|
||||||
aa_log_failure_msg $"$STRING "
|
|
||||||
fi
|
|
||||||
return $rc
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_success_msg() {
|
|
||||||
[ -n "$1" ] && echo -n $1
|
|
||||||
echo ": done."
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_warning_msg() {
|
|
||||||
[ -n "$1" ] && echo -n $1
|
|
||||||
echo ": Warning."
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_failure_msg() {
|
|
||||||
[ -n "$1" ] && echo -n $1
|
|
||||||
echo ": Failed."
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_skipped_msg() {
|
|
||||||
[ -n "$1" ] && echo -n $1
|
|
||||||
echo ": Skipped."
|
|
||||||
}
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# source apparmor function library
|
|
||||||
if [ -f "${APPARMOR_FUNCTIONS}" ]; then
|
|
||||||
. ${APPARMOR_FUNCTIONS}
|
|
||||||
else
|
|
||||||
aa_log_failure_msg "Unable to find AppArmor initscript functions"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
test -x ${PARSER} || exit 0 # by debian policy
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
apparmor_start
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
apparmor_stop
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
restart|reload|force-reload)
|
|
||||||
apparmor_restart
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
try-restart)
|
|
||||||
apparmor_try_restart
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
kill)
|
|
||||||
apparmor_kill
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
apparmor_status
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
exit $rc
|
|
||||||
@@ -159,7 +159,6 @@ parse_profiles() {
|
|||||||
# run the parser on all of the apparmor profiles
|
# run the parser on all of the apparmor profiles
|
||||||
if [ ! -f "$PARSER" ]; then
|
if [ ! -f "$PARSER" ]; then
|
||||||
aa_log_failure_msg "AppArmor parser not found"
|
aa_log_failure_msg "AppArmor parser not found"
|
||||||
aa_log_action_end 1
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -266,7 +265,7 @@ remove_profiles() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
apparmor_stop() {
|
apparmor_stop() {
|
||||||
aa_log_daemon_msg "Unloading AppArmor profiles "
|
aa_log_daemon_msg "Unloading AppArmor profiles"
|
||||||
remove_profiles
|
remove_profiles
|
||||||
rc=$?
|
rc=$?
|
||||||
aa_log_end_msg "$rc"
|
aa_log_end_msg "$rc"
|
||||||
|
|||||||
@@ -1,125 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
|
||||||
# NOVELL (All rights reserved)
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of version 2 of the GNU General Public
|
|
||||||
# License published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, contact Novell, Inc.
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# rc.apparmor by Steve Beattie
|
|
||||||
#
|
|
||||||
# /etc/init.d/apparmor
|
|
||||||
#
|
|
||||||
# chkconfig: 2345 01 99
|
|
||||||
# description: AppArmor rc file. This rc script inserts the apparmor \
|
|
||||||
# module and runs the parser on the /etc/apparmor.d/ \
|
|
||||||
# directory.
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: apparmor
|
|
||||||
# Required-Start:
|
|
||||||
# Required-Stop:
|
|
||||||
# Default-Start: 3 4 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: AppArmor initialization
|
|
||||||
# Description: AppArmor rc file. This rc script inserts the apparmor
|
|
||||||
# module and runs the parser on the /etc/apparmor.d/
|
|
||||||
# directory.
|
|
||||||
### END INIT INFO
|
|
||||||
APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
|
|
||||||
|
|
||||||
# source function library
|
|
||||||
if [ -f /etc/init.d/functions ]; then
|
|
||||||
. /etc/init.d/functions
|
|
||||||
elif [ -f /etc/rc.d/init.d/functions ]; then
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
elif [ -f /lib/lsb/init-functions ]; then
|
|
||||||
. /lib/lsb/init-functions
|
|
||||||
else
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}"
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_success_msg() {
|
|
||||||
echo -n "$*"
|
|
||||||
success
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_warning_msg() {
|
|
||||||
echo -n "$*"
|
|
||||||
warning
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_skipped_msg() {
|
|
||||||
echo -n "$*"
|
|
||||||
warning
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_log_failure_msg() {
|
|
||||||
echo -n "$*"
|
|
||||||
failure
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
aa_action() {
|
|
||||||
STRING=$1
|
|
||||||
shift
|
|
||||||
action "${STRING} " "$@"
|
|
||||||
return $?
|
|
||||||
}
|
|
||||||
|
|
||||||
# source apparmor function library
|
|
||||||
if [ -f "${APPARMOR_FUNCTIONS}" ]; then
|
|
||||||
. ${APPARMOR_FUNCTIONS}
|
|
||||||
else
|
|
||||||
aa_log_failure_msg "Unable to find AppArmor initscript functions"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
apparmor_start
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
apparmor_stop
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
restart|reload|force-reload)
|
|
||||||
apparmor_restart
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
try-restart)
|
|
||||||
apparmor_try_restart
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
kill)
|
|
||||||
apparmor_kill
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
apparmor_status
|
|
||||||
rc=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
exit $rc
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user