diff options
Diffstat (limited to 'bootscripts/contrib/lsb-v3/etc/default')
-rw-r--r-- | bootscripts/contrib/lsb-v3/etc/default/createfiles | 2 | ||||
-rw-r--r-- | bootscripts/contrib/lsb-v3/etc/default/modules | 4 | ||||
-rw-r--r-- | bootscripts/contrib/lsb-v3/etc/default/rc | 16 | ||||
-rw-r--r-- | bootscripts/contrib/lsb-v3/etc/default/rc.site | 10 |
4 files changed, 10 insertions, 22 deletions
diff --git a/bootscripts/contrib/lsb-v3/etc/default/createfiles b/bootscripts/contrib/lsb-v3/etc/default/createfiles index 8d1f89dc6..c4c2428cb 100644 --- a/bootscripts/contrib/lsb-v3/etc/default/createfiles +++ b/bootscripts/contrib/lsb-v3/etc/default/createfiles @@ -1,5 +1,5 @@ ######################################################################## -# Begin /etc/sysconfig/createfiles +# Begin /etc/default/createfiles # # Description : Createfiles script config file # diff --git a/bootscripts/contrib/lsb-v3/etc/default/modules b/bootscripts/contrib/lsb-v3/etc/default/modules index 1c8493d45..40d1894c9 100644 --- a/bootscripts/contrib/lsb-v3/etc/default/modules +++ b/bootscripts/contrib/lsb-v3/etc/default/modules @@ -1,5 +1,5 @@ ######################################################################## -# Begin /etc/sysconfig/modules +# Begin /etc/default/modules # # Description : Module auto-loading configuration # @@ -15,4 +15,4 @@ # a space or a tab. ######################################################################## -# End /etc/sysconfig/modules +# End /etc/default/modules diff --git a/bootscripts/contrib/lsb-v3/etc/default/rc b/bootscripts/contrib/lsb-v3/etc/default/rc index ffb70d98c..96bd476d9 100644 --- a/bootscripts/contrib/lsb-v3/etc/default/rc +++ b/bootscripts/contrib/lsb-v3/etc/default/rc @@ -1,4 +1,4 @@ -# Begin /etc/sysconfig/rc +# Begin /etc/default/rc # Author: DJ Lucas - dj@linuxfromscratch.org # Version: 1.0 LSB V.3.1 @@ -7,7 +7,7 @@ # Local variables for the rc script are in lowercase # Source site specific rc configuration -. /etc/sysconfig/rc.site +. /etc/default/rc.site # This sets default terminal options. # stty sane - this has been removed as nobody recalls @@ -38,15 +38,7 @@ SET_COL="\\033[${COL}G" # at the $COL char SET_WCOL="\\033[${WCOL}G" # at the $WCOL char CURS_UP="\\033[1A\\033[0G" # Up one line, at the 0'th char -# Bootlogging and interactive startup require a valid tempfs mount -# if this mount is not present, disable them -if [ "${TEMPFS_MOUNT}" = "" -o ! -d "${TEMPFS_MOUNT}" ]; then - TEMPFS_MOUNT="" - iprompt="" - BOOTLOG_ENAB="" -fi - # Export the environment variables so they are inherited by the scripts -export PATH SET_COL SET_WCOL CURS_UP TEMPFS_MOUNT BOOTLOG_ENAB RUNLEVEL +export PATH SET_COL SET_WCOL CURS_UP BOOTLOG_ENAB -# End /etc/sysconfig/rc +# End /etc/default/rc diff --git a/bootscripts/contrib/lsb-v3/etc/default/rc.site b/bootscripts/contrib/lsb-v3/etc/default/rc.site index f3369db58..f617c16cb 100644 --- a/bootscripts/contrib/lsb-v3/etc/default/rc.site +++ b/bootscripts/contrib/lsb-v3/etc/default/rc.site @@ -3,12 +3,7 @@ RC_BASE="/etc" RC_FUNCTIONS="${RC_BASE}/init.d/lfs-functions" # Location of network device scripts and config files -NETWORK_DEVICES="/etc/sysconfig/network-devices" - -# Directory to store boot process accounting information -# Used for boot logging and interactive flag when rootfs -# is not writable -TEMPFS_MOUNT="${RC_BASE}/init.d/boottemp" +NETWORK_DEVICES="/etc/network" # Bootlogging (requires a tempfs mount) BOOTLOG_ENAB="yes" @@ -43,7 +38,7 @@ PREFIX_WARNING="${WARNING}**${NORMAL} " PREFIX_FAILURE="${FAILURE}***${NORMAL}" # Export varialbles so that they are inherited by the initscripts -export RC_BASE RC_FUNCTIONS NETWORK_DEVICES TEMPFS_MOUNT BOOTLOG_ENAB +export RC_BASE RC_FUNCTIONS NETWORK_DEVICES BOOTLOG_ENAB export HOSTNAME UTC CLOCKPARAMS FAILURE_ACTION export DISTRO DISTRO_CONTACT DISTRO_MINI export BRACKET FAILURE INFO NORMAL SUCCESS WARNING @@ -79,3 +74,4 @@ print_error_msg() $FAILURE_ACTION } + |