emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indent fixes

Browse Source
This commit is contained in:
Roy Marples 2007-10-27 09:53:56 +00:00
parent c02cc42b1d
commit 42c231d760
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
init.d/bootmisc
View File

@ -14,7 +14,7 @@ cleanup_tmp_dir() {
mkdir -p "${dir}" mkdir -p "${dir}"
cd "${dir}" cd "${dir}"
if [ "${WIPE_TMP}" = "yes" ] ; then if [ "${WIPE_TMP}" = "yes" ]; then
ebegin "Wiping ${dir} directory" ebegin "Wiping ${dir} directory"
local startopts="-x . -depth" local startopts="-x . -depth"
[ "${RC_UNAME}" = "Linux" ] && startopts=". -xdev -depth" [ "${RC_UNAME}" = "Linux" ] && startopts=". -xdev -depth"
@ -50,29 +50,29 @@ cleanup_tmp_dir() {
start() { start() {
# Put a nologin file in /etc to prevent people from logging # Put a nologin file in /etc to prevent people from logging
# in before system startup is complete. # in before system startup is complete.
if [ "${DELAYLOGIN}" = "yes" ] ; then if [ "${DELAYLOGIN}" = "yes" ]; then
echo "System bootup in progress - please wait" > /etc/nologin echo "System bootup in progress - please wait" > /etc/nologin
cp /etc/nologin /etc/nologin.boot cp /etc/nologin /etc/nologin.boot
fi fi
if [ -e /etc/sysctl.conf -a ! -x /etc/init.d/sysctl ] ; then if [ -e /etc/sysctl.conf -a ! -x /etc/init.d/sysctl ]; then
if [ "${RC_SYS}" != "VPS" ] ; then if [ "${RC_SYS}" != "VPS" ]; then
ebegin "Configuring kernel parameters" ebegin "Configuring kernel parameters"
sysctl -p /etc/sysctl.conf >/dev/null sysctl -p /etc/sysctl.conf >/dev/null
eend $? eend $?
fi fi
fi fi
if ! mkdir /.test.$$ 2>/dev/null ; then if ! mkdir /.test.$$ 2>/dev/null; then
ewarn "Skipping /var and /tmp initialization (ro root?)" ewarn "Skipping /var and /tmp initialization (ro root?)"
return 0 return 0
fi fi
rmdir /.test.$$ rmdir /.test.$$
# Ensure that our basic dirs exist # Ensure that our basic dirs exist
for x in /var/lock /var/log /var/run /tmp ; do for x in /var/lock /var/log /var/run /tmp; do
if ! [ -d "${x}" ] ; then if ! [ -d "${x}" ]; then
if ! mkdir "${x}" ; then if ! mkdir "${x}"; then
eend 1 "failed to create needed directory ${x}" eend 1 "failed to create needed directory ${x}"
return 1 return 1
fi fi
@ -112,8 +112,8 @@ start() {
done done
# Reset pam_console permissions if we are actually using it # Reset pam_console permissions if we are actually using it
if [ -x /sbin/pam_console_apply ] && ! [ -c /dev/.devfsd ] ; then if [ -x /sbin/pam_console_apply ] && ! [ -c /dev/.devfsd ]; then
if grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep -q 'pam_console.so' ; then if grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep -q 'pam_console.so'; then
pam_console_apply -r pam_console_apply -r
fi fi
fi fi
@ -124,7 +124,7 @@ start() {
# Clean up /tmp directories # Clean up /tmp directories
local tmp local tmp
for tmp in ${WIPE_TMP_DIRS-/tmp} ; do for tmp in ${WIPE_TMP_DIRS-/tmp}; do
cleanup_tmp_dir "${tmp}" cleanup_tmp_dir "${tmp}"
done done
chmod +t /tmp /var/tmp chmod +t /tmp /var/tmp
@ -138,7 +138,7 @@ start() {
[ -x /sbin/restorecon ] && restorecon /tmp/.ICE-unix /tmp/.X11-unix [ -x /sbin/restorecon ] && restorecon /tmp/.ICE-unix /tmp/.X11-unix
# Create an 'after-boot' dmesg log # Create an 'after-boot' dmesg log
if [ "${RC_SYS}" != "VPS" ] ; then if [ "${RC_SYS}" != "VPS" ]; then
dmesg > /var/log/dmesg dmesg > /var/log/dmesg
chmod 640 /var/log/dmesg chmod 640 /var/log/dmesg
fi fi
@ -149,17 +149,15 @@ start() {
stop() { stop() {
# Reset pam_console permissions if we are actually using it # Reset pam_console permissions if we are actually using it
if [ -x /sbin/pam_console_apply ] && ! [ -c /dev/.devfsd ] ; then if [ -x /sbin/pam_console_apply ] && ! [ -c /dev/.devfsd ]; then
if grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep -q 'pam_console.so' ; then if grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep -q 'pam_console.so' ;then
/sbin/pam_console_apply -r /sbin/pam_console_apply -r
fi fi
fi fi
# Write a halt record if we're shutting down # Write a halt record if we're shutting down
case "${RC_SOFTLEVEL}" in case "${RC_SOFTLEVEL}" in
reboot|shutdown) reboot|shutdown) [ "${RC_UNAME}" = "Linux" ] && halt -w;;
[ "${RC_UNAME}" = "Linux" ] && halt -w
;;
esac esac
return 0 return 0