Skip to content

L
lxc
Commit 02fdb536 by Evgeni Golov Committed by Stéphane Graber
Options

don't make sysv init scripts dependant on distribution specifics

- /etc(/rc.d)?/init.d/functions does not exist on all distributions - LSB does not define a message function without an explicit status - Debian-derived systems add a log_daemon_msg for that lets define an own log_daemon_msg as echo and try to load LSB init functions afterwards, which might overload it with a nicer version that way the init scripts should work on any system, without hard dependencies on neither LSB nor /etc/init.d/functions Closes #309 #310 #311 Signed-off-by: 's avatarEvgeni Golov <evgeni@debian.org>
parent 0eb12ed5
Showing with 24 additions and 32 deletions
config/init/sysvinit/lxc-containers.in
...@@ -17,30 +17,26 @@ ...@@ -17,30 +17,26 @@
# Description: Bring up/down LXC autostart containers # Description: Bring up/down LXC autostart containers
### END INIT INFO ### END INIT INFO
sysconfdir="@SYSCONFDIR@" # To be replaced by LSB functions, if they can be found
# Defined here for distributions that don't have log_daemon_msg
# Source function library. log_daemon_msg () {
test ! -r "$sysconfdir"/rc.d/init.d/functions || echo $@
. "$sysconfdir"/rc.d/init.d/functions }
# provide action() fallback # Try to source LSB init functions to define LSB log_* functions.
if ! type action >/dev/null 2>&1; then test ! -r /lib/lsb/init-functions ||
# Real basic fallback for sysvinit "action" verbage. . /lib/lsb/init-functions
action() {
echo -n "$1 "
shift
"$@" && echo "OK" || echo "Failed"
}
fi
start() { start() {
# Setup host /dev for autodev containers. # Setup host /dev for autodev containers.
@LIBEXECDIR@/lxc/lxc-devsetup @LIBEXECDIR@/lxc/lxc-devsetup
action $"Starting LXC autoboot containers: " @LIBEXECDIR@/lxc/lxc-containers start log_daemon_msg "Starting LXC autoboot containers: "
@LIBEXECDIR@/lxc/lxc-containers start
} }
stop() { stop() {
action $"Stopping LXC containers: " @LIBEXECDIR@/lxc/lxc-containers stop log_daemon_msg "Stopping LXC containers: "
@LIBEXECDIR@/lxc/lxc-containers stop
} }
# See how we were called. # See how we were called.
......
config/init/sysvinit/lxc-net.in
...@@ -17,28 +17,24 @@ ...@@ -17,28 +17,24 @@
# Description: Bring up/down LXC Network Bridge # Description: Bring up/down LXC Network Bridge
### END INIT INFO ### END INIT INFO
sysconfdir="@SYSCONFDIR@" # To be replaced by LSB functions, if they can be found
# Defined here for distributions that don't have log_daemon_msg
# Source function library. log_daemon_msg () {
test ! -r "$sysconfdir"/rc.d/init.d/functions || echo $@
. "$sysconfdir"/rc.d/init.d/functions }
# provide action() fallback # Try to source LSB init functions to define LSB log_* functions.
if ! type action >/dev/null 2>&1; then test ! -r /lib/lsb/init-functions ||
# Real basic fallback for sysvinit "action" verbage. . /lib/lsb/init-functions
action() {
echo -n "$1 "
shift
"$@" && echo "OK" || echo "Failed"
}
fi
start() { start() {
action $"Starting LXC network bridge: " @LIBEXECDIR@/lxc/lxc-net start log_daemon_msg "Starting LXC network bridge: "
@LIBEXECDIR@/lxc/lxc-net start
} }
stop() { stop() {
action $"Stopping LXC network bridge: " @LIBEXECDIR@/lxc/lxc-net stop log_daemon_msg "Stopping LXC network bridge: "
@LIBEXECDIR@/lxc/lxc-net stop
} }
# See how we were called. # See how we were called.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment