summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-05-25 10:09:00 +0000
committerChristian Heim <phreak@gentoo.org>2006-05-25 10:09:00 +0000
commit641e205510a26ca3ae4ed9d3f7e27221e2656bb7 (patch)
tree86e317c5d043dfbde91cb981229623ca4a189c52 /sbin/functions.sh
parentMerging baselayout r2022 for branches/rc-scripts_1_6, branches/baselayout-1_1... (diff)
downloadbaselayout-vserver-641e205510a26ca3ae4ed9d3f7e27221e2656bb7.tar.gz
baselayout-vserver-641e205510a26ca3ae4ed9d3f7e27221e2656bb7.tar.bz2
baselayout-vserver-641e205510a26ca3ae4ed9d3f7e27221e2656bb7.zip
Merging r2046
svn path=/baselayout-vserver/trunk/; revision=365
Diffstat (limited to 'sbin/functions.sh')
-rwxr-xr-xsbin/functions.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/sbin/functions.sh b/sbin/functions.sh
index 423ada6..96f74ba 100755
--- a/sbin/functions.sh
+++ b/sbin/functions.sh
@@ -6,9 +6,6 @@ RC_GOT_FUNCTIONS="yes"
# Override defaults with user settings ...
[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
-# daemontools dir
-SVCDIR="/var/lib/supervise"
-
# Check /etc/conf.d/rc for a description of these ...
declare -r svclib="/lib/rcscripts"
declare -r svcdir="${svcdir:-/var/lib/init.d}"
@@ -340,7 +337,7 @@ veend() {
[[ ${RC_VERBOSE} == "yes" ]] && { eend "$@"; return $?; }
return ${1:-0}
}
-veend() {
+vewend() {
[[ ${RC_VERBOSE} == "yes" ]] && { ewend "$@"; return $?; }
return ${1:-0}
}
@@ -510,6 +507,17 @@ is_net_fs() {
return $?
}
+# bool is_net_fs(path)
+#
+# return 0 if path is under unionfs control
+#
+# EXAMPLE: if is_union_fs / ; then ...
+#
+is_union_fs() {
+ [[ ! -x /sbin/unionctl ]] && return 1
+ unionctl "$1" --list &>/dev/null
+}
+
# bool is_uml_sys()
#
# return 0 if the currently running system is User Mode Linux