diff options
author | 2005-09-03 18:31:49 +0000 | |
---|---|---|
committer | 2005-09-03 18:31:49 +0000 | |
commit | fc41125cf5436505b2bb6f1dcecf3997798fc2a2 (patch) | |
tree | 964ce707f7e8f8cdef759c24bafc25d2c2de9cb0 /sbin | |
parent | Removing any reference to $NET (diff) | |
download | baselayout-vserver-fc41125cf5436505b2bb6f1dcecf3997798fc2a2.tar.gz baselayout-vserver-fc41125cf5436505b2bb6f1dcecf3997798fc2a2.tar.bz2 baselayout-vserver-fc41125cf5436505b2bb6f1dcecf3997798fc2a2.zip |
Removing any reference to net_*
svn path=/baselayout-vserver/trunk/; revision=20
Diffstat (limited to 'sbin')
-rwxr-xr-x | sbin/functions.sh | 24 | ||||
-rwxr-xr-x | sbin/rc | 17 | ||||
-rwxr-xr-x | sbin/rc-help.sh | 20 | ||||
-rwxr-xr-x | sbin/rc-update | 9 |
4 files changed, 1 insertions, 69 deletions
diff --git a/sbin/functions.sh b/sbin/functions.sh index a210c4f..92a2e25 100755 --- a/sbin/functions.sh +++ b/sbin/functions.sh @@ -35,7 +35,6 @@ RC_ENDCOL="yes" # Default values for rc system # RC_TTY_NUMBER=11 -RC_NET_STRICT_CHECKING="no" RC_PARALLEL_STARTUP="no" RC_USE_CONFIG_PROFILE="yes" @@ -603,29 +602,6 @@ get_base_ver() { echo ${ver##* } } -# 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 davfs gfs ncpfs nfs nfs4 ocfs2 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 - [[ " ${NET_FS_LIST} " == *" ${fstype} "* ]] - return $? -} - # bool is_uml_sys() # # return 0 if the currently running system is User Mode Linux @@ -770,23 +770,6 @@ dep_stop() { [[ ! -L ${svcdir}/softscripts.new/${myservice} ]] || \ return 0 - # If this is a 'net' service, we do not want to stop it if it was - # not in the previous runlevel, and we are not shutting down, - # rebooting or going to single runlevel. This is because the user - # (or hotplut) might have started it (net.ppp?) ... - if net_service "${myservice}" && \ - [[ ${SOFTLEVEL} != "reboot" && \ - ${SOFTLEVEL} != "shutdown" && \ - ${SOFTLEVEL} != "single" ]] ; then - if [[ -z ${OLDSOFTLEVEL} ]] || \ - ! in_runlevel "${myservice}" "${OLDSOFTLEVEL}" - then - # This service is not in the previous runlevel, so - # do not stop it ... - return 0 - fi - fi - # Should not work for 'use' if [[ -z $(needsme "${myservice}") ]] ; then # Nothing depends on me diff --git a/sbin/rc-help.sh b/sbin/rc-help.sh index 2a28859..499af88 100755 --- a/sbin/rc-help.sh +++ b/sbin/rc-help.sh @@ -50,8 +50,7 @@ ${CYAN}Options:${OFF} ${GREEN}pause${OFF} Same as 'stop', but the services that depends on it, will not be - stopped. This is useful for stopping a network interface without - stopping all the network services that depend on 'net'. + stopped. ${GREEN}zap${OFF} Reset a service that is currently stopped, but still marked as started, @@ -156,23 +155,6 @@ ${CYAN}Dependencies:${OFF} recommend using it with the 'need' or 'use' dependency type ... you have been warned! -${CYAN}'net' Dependency and 'net.*' Services:${OFF} - Example: - - depend() { - need net - } - - This is a special dependency of type 'need'. It represents a state where - a network interface or interfaces besides lo is up and active. Any service - starting with 'net.' will be treated as a part of the 'net' dependency, - if: - - 1. It is part of the 'boot' runlevel - 2. It is part of the current runlevel - - A few examples are the /etc/init.d/net.eth0 and /etc/init.d/net.lo services. - ${CYAN}Configuration files:${OFF} There are two files which will be sourced for possible configuration by the rc-scripts. They are (sourced from top to bottom): diff --git a/sbin/rc-update b/sbin/rc-update index b13e406..65cd011 100755 --- a/sbin/rc-update +++ b/sbin/rc-update @@ -15,19 +15,10 @@ usage: rc-update -a|add script runlevel2 [runlevel2 ...] rc-update -s|show [runlevel1 ...] examples: - # rc-update add net.eth0 default - Adds the net.eth0 script (in /etc/init.d) to the "default" runlevel. - # rc-update del sysklogd Deletes the sysklogd script from all runlevels. The original script is not deleted, just any symlinks to the script in /etc/runlevels/*. - # rc-update del net.eth2 default wumpus - Delete the net.eth2 script from the default and wumpus runlevels. - All other runlevels are unaffected. Again, the net.eth2 script - residing in /etc/init.d is not deleted, just any symlinks in - /etc/runlevels/default and /etc/runlevels/wumpus. - # rc-update show Show all the available scripts and list at which runlevels they will execute. |