X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Flsb-functions;h=a4a48be255b2b4a443f09ad8a4a916f7c45f1c39;hb=5725235fd176ed0550019529960a256a76b03a6f;hp=bf9a5aa2b66b03d49253a02700fd13fac1f6b93c;hpb=d1fbaa461c985609e7171a74e2355a5fc6d86c69;p=grml-etc-core.git

diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions
index bf9a5aa..a4a48be 100644
--- a/etc/grml/lsb-functions
+++ b/etc/grml/lsb-functions
@@ -167,56 +167,6 @@ RC_DEFAULT_INDENT=2
 #RC_DOT_PATTERN=' .'
 RC_DOT_PATTERN=''
 
-# void get_bootconfig()
-#
-#    Get the BOOTLEVEL and SOFTLEVEL by setting
-#    'bootlevel' and 'softlevel' via kernel
-#    parameters.
-#
-get_bootconfig() {
-    local copt
-    local newbootlevel
-    local newsoftlevel
-
-    for copt in $(</proc/cmdline) ; do
-        case "${copt%=*}" in
-            "bootlevel")
-                newbootlevel="${copt##*=}"
-                ;;
-            "softlevel")
-                newsoftlevel="${copt##*=}"
-                ;;
-        esac
-    done
-
-    if [ -n "${newbootlevel}" ] ; then
-        export BOOTLEVEL="${newbootlevel}"
-    else
-        export BOOTLEVEL="boot"
-    fi
-
-    if [ -n "${newsoftlevel}" ] ; then
-        export DEFAULTLEVEL="${newsoftlevel}"
-    else
-        export DEFAULTLEVEL="default"
-    fi
-
-    return 0
-}
-
-# void get_libdir(void)
-#
-#    prints the current libdir {lib,lib32,lib64}
-#
-get_libdir() {
-    if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
-        CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
-    elif [ -x "/usr/bin/portageq" ] ; then
-        CONF_LIBDIR="$(/usr/bin/portageq envvar CONF_LIBDIR)"
-    fi
-    printf '%s\n' ${CONF_LIBDIR:=lib}
-}
-
 # void esyslog(char* priority, char* tag, char* message)
 #
 #    use the system logger to log a message
@@ -418,59 +368,6 @@ ewend() {
     return $retval
 }
 
-# v-e-commands honor RC_VERBOSE which defaults to no.
-# The condition is negated so the return value will be zero.
-veinfo()  { [ "${RC_VERBOSE}" != "yes" ] || einfo  "$@"; }
-veinfon() { [ "${RC_VERBOSE}" != "yes" ] || einfon "$@"; }
-vewarn()  { [ "${RC_VERBOSE}" != "yes" ] || ewarn  "$@"; }
-veerror() { [ "${RC_VERBOSE}" != "yes" ] || eerror "$@"; }
-vebegin() { [ "${RC_VERBOSE}" != "yes" ] || ebegin "$@"; }
-veend() {
-    [ "${RC_VERBOSE}" = "yes" ] && { eend "$@"; return $?; }
-    return ${1:-0}
-}
-veend() {
-    [ "${RC_VERBOSE}" = "yes" ] && { ewend "$@"; return $?; }
-    return ${1:-0}
-}
-
-# bool get_bootparam(param)
-#
-#   return 0 if gentoo=param was passed to the kernel
-#
-#   EXAMPLE:  if get_bootparam "nodevfs" ; then ....
-#
-get_bootparam() {
-    local x copt params retval=1
-
-    [ ! -r "/proc/cmdline" ] && return 1
-
-    for copt in $(< /proc/cmdline)
-    do
-        if [ "${copt%=*}" = "gentoo" ]
-        then
-            params="$(gawk -v PARAMS="${copt##*=}" '
-                BEGIN {
-                    split(PARAMS, nodes, ",")
-                    for (x in nodes)
-                        print nodes[x]
-                }')"
-
-            # Parse gentoo option
-            for x in ${params}
-            do
-                if [ "${x}" = "$1" ]
-                then
-#                    printf "YES\n"
-                    retval=0
-                fi
-            done
-        fi
-    done
-
-    return ${retval}
-}
-
 # char *add_suffix(char * configfile)
 #
 #    Returns a config file name with the softlevel suffix
@@ -486,57 +383,6 @@ add_suffix() {
     return 0
 }
 
-# Network filesystems list for common use in rc-scripts.
-# This variable is used in is_net_fs and other places such as
-# localmount.
-NET_FS_LIST="afs cifs coda gfs ncpfs nfs nfs4 shfs smbfs"
-
-# bool is_net_fs(path)
-#
-#   return 0 if path is the mountpoint of a networked filesystem
-#
-#   EXAMPLE:  if is_net_fs / ; then ...
-#
-is_net_fs() {
-    local fstype
-    # /proc/mounts is always accurate but may not always be available
-    if [ -e /proc/mounts ]; then
-        fstype="$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' /proc/mounts )"
-    else
-        fstype="$( mount | sed -n -e 's:.* on '"$1"' type \([^ ]*\).*:\1:p' )"
-    fi
-    case " ${NET_FS_LIST} " in
-        *" ${fstype} "*)
-            return 0
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-}
-
-# bool is_uml_sys()
-#
-#   return 0 if the currently running system is User Mode Linux
-#
-#   EXAMPLE:  if is_uml_sys ; then ...
-#
-is_uml_sys() {
-    grep -qs 'UML' /proc/cpuinfo
-    return $?
-}
-
-# bool is_vserver_sys()
-#
-#   return 0 if the currently running system is a Linux VServer
-#
-#   EXAMPLE:  if is_vserver_sys ; then ...
-#
-is_vserver_sys() {
-    grep -qs '^s_context:[[:space:]]*[1-9]' /proc/self/status
-    return $?
-}
-
 # bool get_mount_fstab(path)
 #
 #   return the parameters to pass to the mount command generated from fstab