lsb-functions: removed is_net_fs()

[grml-etc-core.git] / etc / grml / lsb-functions

diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions
index d3c8c01..8c9e0bb 100644 (file)
--- a/etc/grml/lsb-functions
+++ b/etc/grml/lsb-functions
@@ -31,18 +31,18 @@
 
 TPUT="${TPUT:-"/usr/bin/tput"}"
 
-have_tput() {
+_have_tput() {
     [ -x "$TPUT" ] && "$TPUT" hpa 60 >/dev/null 2>&1 \
         && return 0 \
         || return 1
 }
 
-log_success_msg () {
+log_success_msg() {
     printf " * $@\n"
 }
 
-log_failure_msg () {
-    if have_tput ; then
+log_failure_msg() {
+    if _have_tput ; then
         RED="$("$TPUT" setaf 1)"
         #NORMAL="$("$TPUT" op)"
         printf " ${RED}*${NORMAL} $@\n"
@@ -51,8 +51,8 @@ log_failure_msg () {
     fi
 }
 
-log_warning_msg () {
-    if have_tput ; then
+log_warning_msg() {
+    if _have_tput ; then
         YELLOW="$("$TPUT" setaf 3)"
         #NORMAL="$("$TPUT" op")"
         # printf " *${NORMAL} $@\n"
@@ -62,8 +62,8 @@ log_warning_msg () {
     fi
 }
 
-log_warning_msg_nn () {
-    if have_tput ; then
+log_warning_msg_nn() {
+    if _have_tput ; then
         YELLOW="$("$TPUT" setaf 3)"
         printf " ${BLUE}*${NORMAL} $@"
     else
@@ -72,14 +72,14 @@ log_warning_msg_nn () {
 }
 
 # int log_begin_message (char *message)
-log_begin_msg () {
+log_begin_msg() {
         if [ "$#" -eq 0 ]; then
                 return 1
         fi
         printf " ${GREEN}*${NORMAL} $@\n"
 }
 
-log_begin_msg_nn () {
+log_begin_msg_nn() {
         if [ "$#" -eq 0 ]; then
                 return 1
         fi
@@ -90,14 +90,14 @@ log_begin_msg_nn () {
 SUBMSG="   ${GREEN}-${NORMAL} "
 
 # int log_end_message (int exitstatus)
-log_end_msg () {
+log_end_msg() {
 
     # If no arguments were passed, return
     [ "$#" -eq 0 ] && return 1
 
     # Only do the fancy stuff if we have an appropriate terminal
     # and if /usr is already mounted
-    if have_tput ; then
+    if _have_tput ; then
         COLS="$("$TPUT" cols)"
         if [ -n "$COLS" ]; then
             COL=$(( "$COLS" - 7 ))
@@ -167,23 +167,6 @@ RC_DEFAULT_INDENT=2
 #RC_DOT_PATTERN=' .'
 RC_DOT_PATTERN=''
 
-# void splash(...)
-#
-#  Notify bootsplash/splashutils/gensplash/whatever about
-#  important events.
-#
-splash() {
-    return 0
-}
-
-# void profiling(...)
-#
-#  Notify bootsplash/whatever about important events.
-#
-profiling() {
-    return 0
-}
-
 # void get_bootconfig()
 #
 #    Get the BOOTLEVEL and SOFTLEVEL by setting
@@ -488,50 +471,6 @@ get_bootparam() {
     return ${retval}
 }
 
-# Safer way to list the contents of a directory,
-# as it do not have the "empty dir bug".
-#
-# char *dolisting(param)
-#
-#    print a list of the directory contents
-#
-#    NOTE: quote the params if they contain globs.
-#          also, error checking is not that extensive ...
-#
-dolisting() {
-    local x
-    local y
-    local tmpstr
-    local mylist
-    local mypath="$*"
-
-    if [ "${mypath%/\*}" != "${mypath}" ]
-    then
-        mypath="${mypath%/\*}"
-    fi
-
-    for x in ${mypath}
-    do
-        [ ! -e "${x}" ] && continue
-
-        if [ ! -d "${x}" ] && ( [ -L "${x}" ] || [ -f "${x}" ] )
-        then
-            mylist="${mylist} $(ls "${x}" 2> /dev/null)"
-        else
-            [ "${x%/}" != "${x}" ] && x="${x%/}"
-
-            cd "${x}"; tmpstr="$(ls)"
-
-            for y in ${tmpstr}
-            do
-                mylist="${mylist} ${x}/${y}"
-            done
-        fi
-    done
-
-    printf "${mylist}\n"
-}
-
 # char *add_suffix(char * configfile)
 #
 #    Returns a config file name with the softlevel suffix
@@ -547,35 +486,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