From be75c98a06d569fbaa2d86f92676af961795d094 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Fri, 21 Oct 2011 01:28:48 +0100 Subject: Add the mdkconf patch --- rc.d/init.d/functions | 338 +++++++++++++++++------ rc.d/init.d/halt | 178 +++++++++---- rc.d/init.d/killall | 2 +- rc.d/init.d/netconsole | 23 +- rc.d/init.d/netfs | 60 +++-- rc.d/init.d/network | 90 +++++-- rc.d/init.d/single | 18 +- rc.d/rc | 66 ++++- rc.d/rc.local | 12 +- rc.d/rc.sysinit | 709 ++++++++++++++++++++++++++++++++++++++++++------- 10 files changed, 1197 insertions(+), 299 deletions(-) (limited to 'rc.d') diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 3f2cbc50..b1ce5a72 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -5,6 +5,13 @@ # TEXTDOMAIN=initscripts +TEXTDOMAINDIR=/etc/locale +LOCPATH=/etc/locale +export TEXTDOMAINDIR LOCPATH + +TMP=/tmp +TMPDIR=/tmp +export TMP TMPDIR # Make sure umask is sane umask 022 @@ -50,22 +57,35 @@ systemctl_redirect () { action "$s" /bin/systemctl $options $command "$prog.service" } -# Get a sane screen width + +[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype <&2)" +# Get a sane screen width, and default to 80 when exact info not available +[ -z "${COLUMNS:-}" ] && COLUMNS=`stty -a 2>/dev/null | sed -n 's/.*columns \([0-9]*\);.*/\1/p'` [ -z "${COLUMNS:-}" ] && COLUMNS=80 -if [ -z "${CONSOLETYPE:-}" ]; then - if [ -r "/dev/stderr" ]; then - CONSOLETYPE="$(/sbin/consoletype < /dev/stderr)" - else - CONSOLETYPE="$(/sbin/consoletype)" - fi -fi +function load_i18_settings() { + if [ -f /etc/sysconfig/i18n -a -z "$NOLOCALE" ]; then + . /etc/sysconfig/i18n + if [ "$CONSOLETYPE" != "pty" ]; then + [ "$CONSOLE_NOT_LOCALIZED" = "yes" ] && GP_LANG=C + [ "$CONSOLE_NOT_LOCALIZED" = "yes" ] && GP_LANGUAGE=C + fi + if [ -z "$GP_LANG" ]; then + [ -n "$LC_CTYPE" ] && GP_LANG=$LC_CTYPE || GP_LANG=$LC_MESSAGES + fi + if [ -z "$GP_LANGUAGE" ]; then + [ -n "$LANGUAGE" ] && GP_LANGUAGE=$LANGUAGE || GP_LANGUAGE=$GP_LANG + fi + fi +} -if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n ] ; then - . /etc/profile.d/lang.sh 2>/dev/null - # avoid propagating LANGSH_SOURCED any further - unset LANGSH_SOURCED -fi +function reset_i18_settings() { + local CONSOLE_NOT_LOCALIZED=yes + LC_ALL=C + load_i18_settings +} + +load_i18_settings # Read in our configuration if [ -z "${BOOTUP:-}" ]; then @@ -73,9 +93,9 @@ if [ -z "${BOOTUP:-}" ]; then . /etc/sysconfig/init else # This all seem confusing? Look in /etc/sysconfig/init, - # or in /usr/doc/initscripts-*/sysconfig.txt + # or in /usr/share/doc/initscripts-*/sysconfig.txt BOOTUP=color - RES_COL=60 + RES_COL=$((COLUMNS - 15)) MOVE_TO_COL="echo -en \\033[${RES_COL}G" SETCOLOR_SUCCESS="echo -en \\033[1;32m" SETCOLOR_FAILURE="echo -en \\033[1;31m" @@ -93,6 +113,60 @@ if [ -z "${BOOTUP:-}" ]; then fi fi +gprintf() { + if [ -x /bin/gettext -a -n "$1" ]; then + if [ -n "$GP_LANG" ]; then + local TEXT=`LC_ALL=$GP_LANG LANGUAGE=$GP_LANGUAGE gettext -e --domain=$TEXTDOMAIN -- "$1"` + else + local TEXT=`gettext -e --domain=$TEXTDOMAIN -- "$1"` + fi + else + local TEXT=$1 + fi + [ "${1#*\\n}" ] || TEXT="$TEXT\n" + + shift + printf -- "$TEXT" "$@" +} + +# Frontend to gprintf (support up to 4 %s in format string) +# returns the message transleted in GPRINTF_MSG and +# the resting parms in GPRINTF_REST +# This simplifies a lot the call of functions like action, +# now with i18n support +gprintf_msg_rest() { +case "$1" in + *%s*%s*%s*%s*) + GPRINTF_MSG=$(gprintf "$1" "$2" "$3" "$4" "$5") + shift 5;; + *%s*%s*%s*) + GPRINTF_MSG=$(gprintf "$1" "$2" "$3" "$4") + shift 4;; + *%s*%s*) + GPRINTF_MSG=$(gprintf "$1" "$2" "$3") + shift 3;; + *%s*) + GPRINTF_MSG=$(gprintf "$1" "$2") + shift 2;; + *) + GPRINTF_MSG=$(gprintf "$1") + shift;; +esac +GPRINTF_REST="$@" +} + +# Check if $pid (could be plural) are running with +# the same root as this script +inmyroot() { + local i r + + for i in $* ; do + [ "/proc/$i/root" -ef "/proc/$$/root" ] && r="$r $i" + done + echo "$r" +} + + # Interpret escape sequences in an fstab entry fstab_decode_str() { fstab-decode echo "$1" @@ -159,23 +233,23 @@ __umount_loopback_loop() { local remaining devremaining sig= local retry=3 - remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts) - devremaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts) + remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" && $2 !~ /^\/live\// {print $2}' /proc/mounts) + devremaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" && $2 !~ /^\/live\// {print $1}' /proc/mounts) while [ -n "$remaining" -a "$retry" -gt 0 ]; do if [ "$retry" -eq 3 ]; then - action $"Unmounting loopback filesystems: " \ + action "Unmounting loopback filesystems: " \ fstab-decode umount $remaining else - action $"Unmounting loopback filesystems (retry):" \ + action "Unmounting loopback filesystems (retry):" \ fstab-decode umount $remaining fi for dev in $devremaining ; do losetup $dev > /dev/null 2>&1 && \ - action $"Detaching loopback device $dev: " \ + action "Detaching loopback device %s: " $dev \ losetup -d $dev done - remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts) - devremaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts) + remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" && $2 !~ /^\/live\// {print $2}' /proc/mounts) + devremaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" && $2 !~ /^\/live\// {print $1}' /proc/mounts) [ -z "$remaining" ] && break fstab-decode /sbin/fuser -k -m $sig $remaining >/dev/null sleep 3 @@ -229,7 +303,7 @@ daemon() { nicelevel=0 while [ "$1" != "${1##[-+]}" ]; do case $1 in - '') echo $"$0: Usage: daemon [+/-nicelevel] {program}" + '') gprintf "%s: Usage: daemon [+/-nicelevel] {program}\n" $0 return 1;; --check) base=$2 @@ -265,7 +339,7 @@ daemon() { nice="nice -n $1" shift ;; - *) echo $"$0: Usage: daemon [+/-nicelevel] {program}" + *) gprintf "%s: Usage: daemon [+/-nicelevel] {program}\n" $0 return 1;; esac done @@ -304,10 +378,11 @@ daemon() { if [ -z "$user" ]; then $cgroup $nice /bin/bash -c "$corelimit >/dev/null 2>&1 ; $*" else - $cgroup $nice runuser -s /bin/bash $user -c "$corelimit >/dev/null 2>&1 ; $*" + $cgroup $nice su -s /bin/bash - $user -c "$corelimit >/dev/null 2>&1 ; $*" fi - - [ "$?" -eq 0 ] && success $"$base startup" || failure $"$base startup" + rc=$? + [ $rc = 0 ] && success "%s startup" $base || failure "%s startup" $base + return $rc } # A function to stop a program. @@ -317,7 +392,7 @@ killproc() { RC=0; delay=3 # Test syntax. if [ "$#" -eq 0 ]; then - echo $"Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" + gprintf "Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" return 1 fi if [ "$1" = "-p" ]; then @@ -347,6 +422,9 @@ killproc() { fi fi + # Avoid killing processes not running in the same root + [ -n "$pid" ] && pid="`inmyroot $pid`" + # Kill it. if [ -n "$pid" ] ; then [ "$BOOTUP" = "verbose" -a -z "${LSB:-}" ] && echo -n "$base " @@ -364,14 +442,14 @@ killproc() { fi checkpid $pid RC=$? - [ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown" + [ "$RC" -eq 0 ] && failure "%s shutdown" $base || success "%s shutdown" $base RC=$((! $RC)) # use specified level only else if checkpid $pid; then kill $killlevel $pid >/dev/null 2>&1 RC=$? - [ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel" + [ "$RC" -eq 0 ] && success "%s %s" $base $killlevel || failure "%s %s" $base $killlevel elif [ -n "${LSB:-}" ]; then RC=7 # Program is not running fi @@ -380,7 +458,7 @@ killproc() { if [ -n "${LSB:-}" -a -n "$killlevel" ]; then RC=7 # Program is not running else - failure $"$base shutdown" + failure "%s shutdown" $base RC=0 fi fi @@ -397,8 +475,8 @@ pidfileofproc() { local pid # Test syntax. - if [ "$#" = 0 ] ; then - echo $"Usage: pidfileofproc {program}" + if [ "$#" -eq 0 ] ; then + gprintf "Usage: pidfileofproc {program}\n" return 1 fi @@ -413,7 +491,7 @@ pidofproc() { # Test syntax. if [ "$#" = 0 ]; then - echo $"Usage: pidofproc [-p pidfile] {program}" + gprintf "Usage: pidofproc [-p pidfile] {program}\n" return 1 fi if [ "$1" = "-p" ]; then @@ -439,7 +517,7 @@ status() { # Test syntax. if [ "$#" = 0 ] ; then - echo $"Usage: status [-p pidfile] {program}" + gprintf "Usage: status [-p pidfile] {program}\n" return 1 fi if [ "$1" = "-p" ]; then @@ -464,21 +542,21 @@ status() { pid="$(__pids_pidof "$1")" fi if [ -n "$pid" ]; then - echo $"${base} (pid $pid) is running..." + gprintf "%s (pid %s) is running...\n" ${base} "$pid" return 0 fi case "$RC" in 0) - echo $"${base} (pid $pid) is running..." + gprintf "%s (pid %s) is running...\n" ${base} "$pid" return 0 ;; 1) - echo $"${base} dead but pid file exists" + gprintf "%s dead but pid file exists\n" ${base} return 1 ;; 4) - echo $"${base} status unknown due to insufficient privileges." + gprintf "%s status unknown due to insufficient privileges." ${base} return 4 ;; esac @@ -487,10 +565,10 @@ status() { fi # See if /var/lock/subsys/${lock_file} exists if [ -f /var/lock/subsys/${lock_file} ]; then - echo $"${base} dead but subsys locked" + gprintf "%s dead but subsys locked\n" ${base} return 2 fi - echo $"${base} is stopped" + gprintf "%s is stopped\n" ${base} return 3 } @@ -498,7 +576,7 @@ echo_success() { [ "$BOOTUP" = "color" ] && $MOVE_TO_COL echo -n "[" [ "$BOOTUP" = "color" ] && $SETCOLOR_SUCCESS - echo -n $" OK " + gprintf " OK " [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL echo -n "]" echo -ne "\r" @@ -509,7 +587,7 @@ echo_failure() { [ "$BOOTUP" = "color" ] && $MOVE_TO_COL echo -n "[" [ "$BOOTUP" = "color" ] && $SETCOLOR_FAILURE - echo -n $"FAILED" + gprintf "FAILED" [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL echo -n "]" echo -ne "\r" @@ -520,7 +598,7 @@ echo_passed() { [ "$BOOTUP" = "color" ] && $MOVE_TO_COL echo -n "[" [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING - echo -n $"PASSED" + gprintf "PASSED" [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL echo -n "]" echo -ne "\r" @@ -531,7 +609,7 @@ echo_warning() { [ "$BOOTUP" = "color" ] && $MOVE_TO_COL echo -n "[" [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING - echo -n $"WARNING" + gprintf "WARNING" [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL echo -n "]" echo -ne "\r" @@ -540,14 +618,15 @@ echo_warning() { # Inform the graphical boot of our current state update_boot_stage() { - if [ -x /usr/bin/plymouth ]; then - /usr/bin/plymouth --update="$1" - fi - return 0 + rc_splash "$1" } # Log that something succeeded success() { + gprintf_msg_rest "$@" + #if [ -z "${IN_INITLOG:-}" ]; then + # initlog $INITLOG_ARGS -n $0 -s "$GPRINTF_MSG" -e 1 + #fi [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_success return 0 } @@ -555,14 +634,21 @@ success() { # Log that something failed failure() { local rc=$? + gprintf_msg_rest "$@" + #if [ -z "${IN_INITLOG:-}" ]; then + # initlog $INITLOG_ARGS -n $0 -s "$GPRINTF_MSG" -e 2 + #fi [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_failure - [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --details return $rc } # Log that something passed, but may have had errors. Useful for fsck passed() { local rc=$? + gprintf_msg_rest "$@" + #if [ -z "${IN_INITLOG:-}" ]; then + # initlog $INITLOG_ARGS -n $0 -s "$GPRINTF_MSG" -e 1 + #fi [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_passed return $rc } @@ -570,18 +656,21 @@ passed() { # Log a warning warning() { local rc=$? + gprintf_msg_rest "$@" + #if [ -z "${IN_INITLOG:-}" ]; then + # initlog $INITLOG_ARGS -n $0 -s "$1" -e 1 + #fi [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_warning return $rc } # Run some action. Log its output. action() { - local STRING rc + local rc + gprintf_msg_rest "$@" + echo -n "$GPRINTF_MSG " - STRING=$1 - echo -n "$STRING " - shift - "$@" && success $"$STRING" || failure $"$STRING" + $GPRINTF_REST && success "$GPRINTF_MSG" || failure "$GPRINTF_MSG" rc=$? echo return $rc @@ -593,22 +682,108 @@ strstr() { return 0 } + # Confirm whether we really want to run this service confirm() { - [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash - while : ; do - echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] " - read answer - if strstr $"yY" "$answer" || [ "$answer" = "" ] ; then - return 0 - elif strstr $"cC" "$answer" ; then - rm -f /var/run/confirm - [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash - return 2 - elif strstr $"nN" "$answer" ; then - return 1 - fi - done + gprintf "Start service %s (Y)es/(N)o/(C)ontinue? [Y] \n" $1 + local YES=`gprintf "yY"` + local NOT=`gprintf "nN"` + local CNT=`gprintf "cC"` + read answer + + if strstr "$YES" "$answer" || [ "$answer" = "" ] ; then + return 0 + elif strstr "$CNT" "$answer" ; then + return 2 + elif strstr "$NOT" "$answer" ; then + return 1 + fi + confirm $* +} + +initsplash() { + [[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash + [[ -n $SPLASH ]] && splash_rc=$SPLASH + [[ -x /sbin/plymouthd ]] || splash_rc=no + if [ -x /sbin/plymouthd ]; then + splash_mode=plymouth + if [ -r /proc/cmdline ] && grep -q splash /proc/cmdline && [ "$splash_rc" != "no" ]; then + splash_rc=yes + else + splash_rc=no + /bin/plymouth quit 2>/dev/null + PLYMOUTH= + fi + else + splash_rc=no + fi + + [[ $splash_rc != "no" && $splash_rc != "No" && $splash_rc != "NO" ]] && export splash_rc=yes + [[ $splash_mode = "plymouth" ]] || splash_rc= + if [[ -z "$1" ]]; then + set `/sbin/runlevel` + __runlevel=$2 + __previous=$1 + else + __runlevel=$1 + __previous=N + fi + [ "$splash_mode" = "plymouth" -a "$splash_rc" = "yes" -a -e /sys/class/graphics/fb0 ] && [ "$__runlevel" = 0 -o "$__runlevel" = 6 ] && /sbin/plymouthd --mode=shutdown + export splash_mode splash_rc +} + +rc_splash() { + [[ "$splash_rc" = "yes" ]] || return + if [ "$splash_mode" = "plymouth" ]; then + if [ "$1" = "start" ]; then + /bin/plymouth --show-splash 2>/dev/null + if [ "$2" = "1" ]; then + /bin/plymouth message --text="`OUTPUT_CHARSET=UTF-8 gprintf 'Booting the system... Press Esc for verbose mode.'`" 2> /dev/null + elif [ "$2" = "0" ]; then + /bin/plymouth message --text="`OUTPUT_CHARSET=UTF-8 gprintf 'Shutting down the system... Press Esc for verbose mode.'`" 2> /dev/null + else + /bin/plymouth message --text="`OUTPUT_CHARSET=UTF-8 gprintf 'Restarting the system... Press Esc for verbose mode.'`" 2> /dev/null + fi + elif [ "$1" = "stop" -o "$1" = "exit" ]; then + /bin/plymouth quit 2>/dev/null + elif [ "$1" = "umount" ]; then + /bin/plymouth quit --retain-splash 2>/dev/null + elif [ "$1" = "verbose" ]; then + /bin/plymouth --hide-splash 2>/dev/null + else + /bin/plymouth --update "$1" 2>/dev/null + fi + fi +} + +# +# This function finds the encoding of the current locale (it can +# be overwritten by a "CHARSET" variable if needed); the call +# to "locale charmap" should return the proper value; in case it +# fails, a guess from the locale name is done. +# this function is also defined in setsysfont script +# if you change it here change it there too, to have the same behaviour +# +get_locale_encoding() { + CHARSET=${CHARSET=`LC_ALL=$GP_LANG locale charmap 2> /dev/null`} + case "$CHARSET" in + ANSI_X3.4-1968) + # this means that the locale has not been + # correctly initialized; we will look at the + # locale naming and use the known + # default values for various languages + case "${LC_ALL}${LC_CTYPE}${LANG}" in + # the locale tells it is in UTF-8, or it is a language + # we know must be in UTF-8 by default + *.utf8*|*.UTF-8*| \ + am*|an*|ar*|as*|az*|bn*|cy*|eo*|fa*|gn*|gu*|he*|hi*|hy*| \ + id*|ka*|kn*|ku*|ky*|lo*|m*|ne*|om*|pa*|ph*|se*|sr*|st*| \ + ta*|te*|tg*|ti*|tk*|tl*|tt*|ug*|ur*|uz*|vi*|xh*|y*) + CHARSET="UTF-8" ;; + esac + ;; + esac + echo "$CHARSET" } # resolve a device node to its major:minor numbers in decimal or hex @@ -688,14 +863,14 @@ init_crypto() { if ! key_is_random "$key"; then mode=$(ls -l "$key" | cut -c 5-10) if [ "$mode" != "------" ]; then - echo $"INSECURE MODE FOR $key" + gprintf "INSECURE MODE FOR %s\n" $key fi fi if [ "$owner" != root ]; then - echo $"INSECURE OWNER FOR $key" + gprintf "INSECURE OWNER FOR %s\n" $key fi else - echo $"Key file for $dst not found, skipping" + gprintf "Key file for %s not found, skipping\n" $dst ret=1 continue fi @@ -733,21 +908,21 @@ init_crypto() { cipher) params="$params -c $value" if [ -z "$value" ]; then - echo $"$dst: no value for cipher option, skipping" + gprintf "%s: no value for cipher option, skipping\n" $dst skip="yes" fi ;; size) params="$params -s $value" if [ -z "$value" ]; then - echo $"$dst: no value for size option, skipping" + gprintf "%s: no value for size option, skipping\n" $dst skip="yes" fi ;; hash) params="$params -h $value" if [ -z "$value" ]; then - echo $"$dst: no value for hash option, skipping" + gprintf "%s: no value for hash option, skipping\n" $dst skip="yes" fi ;; @@ -767,7 +942,7 @@ init_crypto() { fi if [ -z "$makeswap" ] && cryptsetup isLuks "$src" 2>/dev/null ; then if key_is_random "$key"; then - echo $"$dst: LUKS requires non-random key, skipping" + gprintf "%s: LUKS requires non-random key, skipping\n" $dst ret=1 continue fi @@ -782,8 +957,15 @@ init_crypto() { mount_point="$(find_crypto_mount_point $dst)" [ -n "$mount_point" ] || mount_point=${src##*/} prompt=$(printf $"%s is password protected" "$mount_point") - plymouth ask-for-password --prompt "$prompt" --command="/sbin/cryptsetup luksOpen -T1 $src $dst" <&1 - rc=$? + if [ "$splash_rc" = yes] && [ -d /usr/share/plymouth ]; then + plymouth ask-for-password --prompt "$prompt" --command="/sbin/cryptsetup luksOpen -T1 $src $dst" <&1 + rc=$? + else + # stop splash to ask for password + rc_splash verbose + /sbin/cryptsetup luksOpen "$src" "$dst" <&1 && success || failure + rc=$? + fi fi else [ -z "$key" ] && plymouth --hide-splash diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index cb33cbed..3f6d5dac 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -20,7 +20,7 @@ halt_crypto() { [ -z "$dst" -o "${dst#\#}" != "$dst" ] && continue if [ -b "/dev/mapper/$dst" ]; then if /sbin/dmsetup info "$dst" | grep -q '^Open count: *0$'; then - action $"Stopping disk encryption for $dst" /sbin/cryptsetup remove "$dst" + action "Stopping disk encryption for %s" $dst /sbin/cryptsetup remove "$dst" else fnval=1 fi @@ -30,36 +30,27 @@ halt_crypto() { } kill_all() { - local STRING rc - - STRING=$1 - echo -n "$STRING " - shift /sbin/killall5 "$@" rc=$? - # Retval: 0: success 1: error 2: no processes found to kill if [ "$rc" == 1 ]; then - failure $"$STRING" - else - success $"$STRING" + return 1 fi - echo - return $rc + return 0 } # See how we were called. case "$0" in *halt) - message=$"Halting system..." + message=`gprintf "Halting system..."` command="/sbin/halt" ;; *reboot) - message=$"Please stand by while rebooting the system..." + message=`gprintf "Please stand by while rebooting the system..."` command="/sbin/reboot" kexec_command="/sbin/kexec" ;; *) - echo $"$0: call me as 'halt' or 'reboot' please!" + gprintf "%s: call me as 'halt' or 'reboot' please!\n" $0 exit 1 ;; esac @@ -67,44 +58,87 @@ case "$1" in *start) ;; *) - echo $"Usage: $0 {start}" + gprintf "Usage: %s\n" "$(basename $0) {start}" exit 1 ;; esac +# Recreate the /initrd if needed +if [ ! -d /initrd ]; then + action "Creating initrd directory" mkdir /initrd +fi +if [ -d /initrd -a ! -f /initrd/README.WARNING ]; then + cat > /initrd/README.WARNING </dev/null +action "Saving random seed: " dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=512 2>/dev/null -[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock --systohc +update_boot_stage clock +[ -x /sbin/hwclock ] && action "Syncing hardware clock to system time" /sbin/hwclock --systohc + +if [ -x /sbin/halt.pre ]; then + /sbin/halt.pre +fi + +update_boot_stage umount # Try to unmount tmpfs filesystems to avoid swapping them in. Ignore failures. tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; } @@ -114,7 +148,7 @@ tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; } # Turn off swap, then unmount file systems. [ -f /proc/swaps ] && SWAPS=$(awk '! /^Filename/ { print $1 }' /proc/swaps) if [ -n "$SWAPS" ]; then - action $"Turning off swap: " swapoff $SWAPS + action "Turning off swap: " swapoff $SWAPS for dst in $SWAPS; do if [[ "$dst" == /dev/mapper* ]] \ && [ "$(dmsetup status "$dst" | cut -d ' ' -f 3)" = crypt ]; then @@ -125,7 +159,11 @@ if [ -n "$SWAPS" ]; then done fi -[ -x /sbin/quotaoff ] && action $"Turning off quotas: " /sbin/quotaoff -aug +[ -x /sbin/quotaoff ] && action "Turning off quotas: " /sbin/quotaoff -aug + +# first remove entry /initrd/loopfs as it can't be unmounted :( +mtab=$(fgrep -v "/initrd/loopfs[^/]" /etc/mtab) +(IFS= ; echo $mtab > /etc/mtab) # Unmount file systems, killing processes if we have to. # Unmount loopback stuff first @@ -134,29 +172,61 @@ __umount_loopback_loop # Unmount RPC pipe file systems __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \ /proc/mounts \ - $"Unmounting pipe file systems: " \ - $"Unmounting pipe file systems (retry): " \ + "Unmounting pipe file systems: " \ + "Unmounting pipe file systems (retry): " \ -f LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/sys\/fs\/cgroup|^\/dev/{next} + $2 ~ /^\/live\//{next} $3 == "tmpfs" || $3 == "proc" {print $2 ; next} /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next} {print $2}' /proc/mounts \ - $"Unmounting file systems: " \ - $"Unmounting file systems (retry): " \ + "Unmounting file systems: " \ + "Unmounting file systems (retry): " \ -f -[ -f /proc/bus/usb/devices ] && $UMOUNT /proc/bus/usb +update_boot_stage lvm + +# stop crypto devices before lvm, as they can sit on top of LVM [ -f /etc/crypttab ] && halt_crypto +if [ -f /etc/lvm/lvm.conf -a -x /sbin/lvm2 ]; then + if grep -q -s 'device-mapper' /proc/devices; then + _vgchange_cmd="/sbin/lvm2 vgchange -a n" + fi +fi + +if [ -z "${_vgscan_cmd}" -a -f /etc/lvmtab -a -e /proc/lvm ] ; then + if [ -x /sbin/lvm1-vgchange ]; then + _vgchange_cmd="/sbin/lvm1-vgchange -a n" + elif [ -x /sbin/vgchange ]; then + _vgchange_cmd="/sbin/vgchange -a n" + fi +fi + +if [ -n "${_vgchange_cmd}" ]; then + action "Shutting down LVM:" ${_vgchange_cmd} +fi + +# for NUT +# do it here to have /proc/usb mounted for UPS on USB +if [ -f /etc/init.d/upsd ]; then + /etc/init.d/upsd powerdown + [ $? == 3 ] && exit 1 +fi + +[ -f /proc/bus/usb/devices ] && $UMOUNT /proc/bus/usb + # remove the crash indicator flag rm -f /.autofsck +update_boot_stage umount_force + # Try all file systems other than root, essential filesystems and RAM disks, # one last time. -awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /(^\/dev\/ram|cgroup)/ { print $2 }' \ - /proc/mounts | sort -r | \ +# eugeni: we should umount the filesystems in reverse order (#53042) +tac /proc/mounts | awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $2 !~ /^\/live\// && $1 !~ /(^\/dev\/ram|cgroup)/ { print $2 }' | \ while read line; do fstab-decode $UMOUNT -f $line done @@ -165,8 +235,7 @@ if [ -x /sbin/halt.local ]; then /sbin/halt.local fi -# Tell init to re-exec itself. -kill -TERM 1 +update_boot_stage remount_ro # Remount read only anything that's left mounted. # echo $"Remounting remaining filesystems readonly" @@ -174,34 +243,39 @@ mount | awk '{ print $1,$3 }' | while read dev dir; do fstab-decode mount -n -o ro,remount $dev $dir done +# (bor) it is impossible under systemd and is not required otherwise +# action "Unmounting proc file system: " umount /proc + +# See if this is a powerfail situation. +if [ -f /etc/apcupsd/powerfail ]; then + gprintf "APCUPSD will now power off the UPS!\n" + echo + /etc/apcupsd/apccontrol killpower + echo + gprintf "Please ensure that the UPS has powered off before rebooting\n" + gprintf "Otherwise, the UPS may cut the power during the reboot!!!\n" + echo +fi + +update_boot_stage halt + # If we left mdmon's running wait for the raidsets to become clean if [ -n "$OMITARGS" ]; then mdadm --wait-clean --scan fi # Now halt or reboot. -echo $"$message" +echo "$message" if [ -f /fastboot ]; then - echo $"On the next boot fsck will be skipped." + gprintf "On the next boot fsck will be skipped.\n" elif [ -f /forcefsck ]; then - echo $"On the next boot fsck will be forced." -fi - -# Shutdown UPS drivers -if [ "$command" = /sbin/halt ] && [ -f /etc/sysconfig/ups ]; then - . /etc/sysconfig/ups - if [ -z $POWERDOWNFLAG ]; then - POWERDOWNFLAG=/etc/killpower - fi - if [ "$SERVER" = "yes" ] && [ -f $POWERDOWNFLAG ]; then - /sbin/upsdrvctl shutdown - fi + gprintf "On the next boot fsck will be forced.\n" fi # First, try kexec. If that fails, fall back to rebooting the old way. [ -n "$kexec_command" ] && $kexec_command -e -x >& /dev/null -HALTARGS="-d" +HALTARGS="-i -d" [ "$INIT_HALT" != "HALT" ] && HALTARGS="$HALTARGS -p" exec $command $HALTARGS diff --git a/rc.d/init.d/killall b/rc.d/init.d/killall index 4405879c..574f4f6f 100755 --- a/rc.d/init.d/killall +++ b/rc.d/init.d/killall @@ -7,7 +7,7 @@ case "$1" in *start) ;; *) - echo $"Usage: $0 {start}" + gprintf "Usage: %s {start}\n" $0 exit 1 ;; esac diff --git a/rc.d/init.d/netconsole b/rc.d/init.d/netconsole index 7f91a6c6..520a846b 100644 --- a/rc.d/init.d/netconsole +++ b/rc.d/init.d/netconsole @@ -6,6 +6,15 @@ # description: Initializes network console logging # config: /etc/sysconfig/netconsole # +### BEGIN INIT INFO +# Provides: netconsole +# Required-Start: $network +# Required-Stop: $network +# Short-Description: Initializes network console logging +# Description: By starting this service you allow a remote syslog daemon +# to record console output from this system. +### END INIT INFO + # Copyright 2002 Red Hat, Inc. # # Based in part on a shell script by @@ -33,7 +42,7 @@ kernel=$(uname -r | cut -d. -f1-2) usage () { - echo $"Usage: $0 {start|stop|status|restart|condrestart}" 1>&2 + gprintf "Usage: %s {start|stop|status|restart|condrestart}\n" $0 1>&2 RETVAL=2 } @@ -73,13 +82,13 @@ start () fi fi if [ -z "$SYSLOGADDR" ] ; then - echo $"Server address not specified in /etc/sysconfig/netconsole" 1>&2 + gprintf "Server address not specified in /etc/sysconfig/netconsole\n" 1>&2 exit 6 fi eval $(print_address_info $SYSLOGADDR) if [ -z "$SYSLOGMACADDR" ]; then - echo $"netconsole: can't resolve MAC address of $SYSLOGADDR" 1>&2 + gprintf "netconsole: can't resolve MAC address of %s\n" $SYSLOGADDR 1>&2 exit 1 fi @@ -88,7 +97,7 @@ start () /usr/bin/logger -p daemon.info -t netconsole: inserting netconsole module with arguments \ $SYSLOGOPTS if [ -n "$SYSLOGOPTS" ]; then - action $"Initializing netconsole" modprobe netconsole \ + action "Initializing netconsole" modprobe netconsole \ $SYSLOGOPTS [ "$?" != "0" ] && RETVAL=1 fi @@ -98,7 +107,7 @@ start () stop () { if /sbin/lsmod | grep netconsole >/dev/null 2>&1 ; then - action $"Disabling netconsole" rmmod netconsole; + action "Disabling netconsole" rmmod netconsole; [ "$?" != "0" ] && RETVAL=1 fi @@ -108,10 +117,10 @@ stop () status () { if /sbin/lsmod | grep netconsole >/dev/null 2>&1 ; then - echo $"netconsole module loaded" + gprintf "netconsole module loaded\n" RETVAL=0 else - echo $"netconsole module not loaded" + gprintf "netconsole module not loaded\n" RETVAL=3 fi } diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 8d9854fb..d3f22714 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -9,10 +9,17 @@ # chkconfig: 345 25 75 # description: Mounts and unmounts all Network File System (NFS), \ # CIFS (Lan Manager/Windows), and NCP (NetWare) mount points. +# ### BEGIN INIT INFO # Provides: $remote_fs -# Short-Description: Mount and unmount network filesystems. -# Description: Mount and unmount network filesystems. +# Required-Start: $network +# Should-Start: $portmap nfs-common +# Required-Stop: $network +# Should-Stop: $portmap nfs-common +# Default-Start: 3 4 5 +# Short-Description: Mount network filesystems. +# Description: Mounts and unmounts all Network File System (NFS), +# SMB/CIFS (Lan Manager/Windows), and NCP (NetWare) mount points. ### END INIT INFO [ -f /etc/sysconfig/network ] || exit 0 @@ -36,11 +43,10 @@ case "$1" in [ "$EUID" != "0" ] && exit 4 [ -n "$NFSFSTAB" ] && { - [ ! -f /var/lock/subsys/rpcbind ] && service rpcbind start - action $"Mounting NFS filesystems: " mount -a -t nfs,nfs4 + action "Mounting NFS filesystems: " mount -a -t nfs,nfs4 } - [ -n "$CIFSFSTAB" ] && action $"Mounting CIFS filesystems: " mount -a -t cifs - [ -n "$NCPFSTAB" ] && action $"Mounting NCP filesystems: " mount -a -t ncpfs + [ -n "$CIFSFSTAB" ] && action "Mounting CIFS filesystems: " mount -a -t cifs + [ -n "$NCPFSTAB" ] && action "Mounting NCP filesystems: " mount -a -t ncpfs [ -n "$NETDEVFSTAB" ] && { if [ -f /etc/mdadm.conf ]; then @@ -55,7 +61,7 @@ case "$1" in fi if [ -x /sbin/lvm ]; then if /sbin/lvm vgscan > /dev/null 2>&1 ; then - action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y + action "Setting up Logical Volume Management:" /sbin/lvm vgchange -a y fi fi @@ -63,7 +69,7 @@ case "$1" in init_crypto 1 fi - STRING=$"Checking network-attached filesystems" + STRING=`gprintf "Checking network-attached filesystems"` echo $STRING fsck -A -T -R -a -t opts=_netdev @@ -85,11 +91,11 @@ case "$1" in tty >/dev/null 2>&1 || exit 1 echo echo - echo $"*** An error occurred during the file system check." - echo $"*** Dropping you to a shell; the system will reboot" - echo $"*** when you leave the shell." + gprintf "*** An error occurred during the file system check.\n" + gprintf "*** Dropping you to a shell; the system will reboot\n" + gprintf "*** when you leave the shell.\n" - str=$"(Repair filesystem)" + str=`gprintf "(Repair filesystem)"` PS1="$str \# # "; export PS1 [ "$SELINUX" = "1" ] && disable_selinux sulogin @@ -98,7 +104,7 @@ case "$1" in fi } touch /var/lock/subsys/netfs - action $"Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs + action "Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs -O noencrypted ;; stop) # Unmount loopback stuff first @@ -107,14 +113,14 @@ case "$1" in if [ -n "$NETDEVMTAB" ]; then __umount_loop '$4 ~ /_netdev/ && $2 != "/" {print $2}' \ /etc/mtab \ - $"Unmounting network block filesystems: " \ - $"Unmounting network block filesystems (retry): " + "Unmounting network block filesystems: " \ + "Unmounting network block filesystems (retry): " fi if [ -n "$NFSMTAB" ]; then __umount_loop '$3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" {print $2}' \ /proc/mounts \ - $"Unmounting NFS filesystems: " \ - $"Unmounting NFS filesystems (retry): " \ + "Unmounting NFS filesystems: " \ + "Unmounting NFS filesystems (retry): " \ "-f -l" fi if [ -n "$CIFSMTAB" ]; then @@ -132,39 +138,39 @@ case "$1" in status) if [ -f /proc/mounts ] ; then [ -n "$NFSFSTAB" ] && { - echo $"Configured NFS mountpoints: " + gprintf "Configured NFS mountpoints: \n" for fs in $NFSFSTAB; do echo $fs ; done } [ -n "$CIFSFSTAB" ] && { - echo $"Configured CIFS mountpoints: " + gprintf "Configured CIFS mountpoints: \n" for fs in $CIFSFSTAB; do echo $fs ; done } [ -n "$NCPFSTAB" ] && { - echo $"Configured NCP mountpoints: " + gprintf "Configured NCP mountpoints: \n" for fs in $NCPFSTAB; do echo $fs ; done } [ -n "$NETDEVFSTAB" ] && { - echo $"Configured network block devices: " + gprintf "Configured network block devices: \n" for fs in $NETDEVFSTAB; do echo $fs ; done } [ -n "$NFSMTAB" ] && { - echo $"Active NFS mountpoints: " + gprintf "Active NFS mountpoints: \n" for fs in $NFSMTAB; do echo $fs ; done } [ -n "$CIFSMTAB" ] && { - echo $"Active CIFS mountpoints: " + gprintf "Active CIFS mountpoints: \n" for fs in $CIFSMTAB; do echo $fs ; done } [ -n "$NCPMTAB" ] && { - echo $"Active NCP mountpoints: " + gprintf "Active NCP mountpoints: \n" for fs in $NCPMTAB; do echo $fs ; done } [ -n "$NETDEVMTAB" ] && { - echo $"Active network block devices: " + gprintf "Active network block devices: \n" for fs in $NETDEVMTAB; do echo $fs ; done } else - echo $"/proc filesystem unavailable" + gprintf "/proc filesystem unavailable\n" fi [ -r /var/lock/subsys/netfs ] || exit 3 ;; @@ -178,7 +184,7 @@ case "$1" in exit $? ;; *) - echo $"Usage: $0 {start|stop|restart|reload|status}" + gprintf "Usage: %s\n" "$(basename $0) {start|stop|restart|reload|status}" exit 2 esac diff --git a/rc.d/init.d/network b/rc.d/init.d/network index b31060b0..c10f5504 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -5,9 +5,16 @@ # chkconfig: - 10 90 # description: Activates/Deactivates all network interfaces configured to \ # start at boot time. +# probe: false # ### BEGIN INIT INFO -# Provides: $network +# Provides: network +# Should-Start: harddrake irda resolvconf slmodemd +# Should-Stop: irda resolvconf slmodemd +# Default-Start: 2 3 4 5 +# Short-Description: Bring up/down networking +# Description: Activates/Deactivates all network interfaces configured to +# start at boot time. # Should-Start: iptables ip6tables # Short-Description: Bring up/down networking # Description: Bring up/down networking @@ -17,6 +24,7 @@ . /etc/init.d/functions if [ ! -f /etc/sysconfig/network ]; then + echo "NETWORKING=no" > /etc/sysconfig/network exit 6 fi @@ -63,8 +71,12 @@ case "$1" in sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + if [ -r /etc/ethers -a -x /sbin/arp ]; then + action "Storing ARP mapping" /sbin/arp -f /etc/ethers + fi + # bring up loopback interface - action $"Bringing up loopback interface: " ./ifup ifcfg-lo + action "Bringing up loopback interface: " ./ifup ifcfg-lo case "$IPX" in yes|true) @@ -75,11 +87,16 @@ case "$1" in fi ;; esac + # depreciated but we still use it. + if [ -f /proc/sys/net/ipv4/ip_forward ] && [[ "$FORWARD_IPV4" = "yes" || "$FORWARD_IPV4" = "true" ]]; + then + action "Enabling IPv4 packet forwarding" sysctl -w net.ipv4.ip_forward=1 + fi case "$VLAN" in yes) if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1 ; then - echo $"No 802.1Q VLAN support available in kernel." + gprintf "No 802.1Q VLAN support available in kernel.\n" fi ;; esac @@ -89,6 +106,14 @@ case "$1" in xdslinterfaces="" bridgeinterfaces="" + # do we have wireless cards? + iwconfig 2>/dev/null | grep IEEE > /dev/null + has_wifi=$? + # configure CRDA domain + if [ -n "${CRDA_DOMAIN}" -a -x /sbin/iw -a "$has_wifi" == 0 ]; then + action "Configuring wireless regulatory domain " /sbin/iw reg set ${CRDA_DOMAIN} + fi + # bring up all other interfaces configured to come up at boot time for i in $interfaces; do unset DEVICE TYPE SLAVE @@ -102,7 +127,7 @@ case "$1" in vpninterfaces="$vpninterfaces $i" continue fi - if [ "$TYPE" = "xDSL" ]; then + if [ "$TYPE" = "xDSL" -o "$TYPE" = "ADSL" ]; then xdslinterfaces="$xdslinterfaces $i" continue fi @@ -131,11 +156,22 @@ case "$1" in continue fi # If we're in confirmation mode, get user confirmation. - if [ -f /var/run/confirm ]; then - confirm $i - test $? = 1 && continue - fi - action $"Bringing up interface $i: " ./ifup $i boot + [ -f /var/run/confirm ] && + { + confirm $i + case $? in + 0) + : + ;; + 2) + CONFIRM= + ;; + *) + continue + ;; + esac + } + action "Bringing up interface %s: " $i ./ifup $DEVICE boot [ $? -ne 0 ] && rc=1 done @@ -147,7 +183,7 @@ case "$1" in confirm $i test $? = 1 && continue fi - action $"Bringing up interface $i: " ./ifup $i boot + action "Bringing up interface %s: " $i ./ifup $i boot [ $? -ne 0 ] && rc=1 fi done @@ -165,10 +201,8 @@ case "$1" in fi # Run this again to catch any interface-specific actions sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 - - touch /var/lock/subsys/network - [ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY} + touch /var/lock/subsys/network ;; stop) [ "$EUID" != "0" ] && exit 4 @@ -219,7 +253,7 @@ case "$1" in bridgeinterfaces="$bridgeinterfaces $i" continue fi - if [ "$TYPE" = "xDSL" ]; then + if [ "$TYPE" = "xDSL" -o "$TYPE" = "ADSL" ]; then xdslinterfaces="$xdslinterfaces $i" continue fi @@ -236,7 +270,7 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi if ! check_device_down $DEVICE; then - action $"Shutting down interface $i: " ./ifdown $i boot + action "Shutting down interface %s: " $i ./ifdown $i boot [ $? -ne 0 ] && rc=1 fi ) @@ -250,9 +284,25 @@ case "$1" in ;; esac - action $"Shutting down loopback interface: " ./ifdown ifcfg-lo + action "Shutting down loopback interface: " ./ifdown ifcfg-lo - sysctl -w net.ipv4.ip_forward=0 > /dev/null 2>&1 + if [ -d /proc/sys/net/ipv4 ]; then + if [ -f /proc/sys/net/ipv4/ip_forward ]; then + if [ $(cat /proc/sys/net/ipv4/ip_forward) != 0 ]; then + action "Disabling IPv4 packet forwarding: " sysctl -w net.ipv4.ip_forward=0 + fi + fi + if [ -f /proc/sys/net/ipv4/ip_always_defrag ]; then + if [ $(cat /proc/sys/net/ipv4/ip_always_defrag) != 0 ]; then + action "Disabling IPv4 automatic defragmentation: " sysctl -w net.ipv4.ip_always_defrag=0 + fi + fi + fi + if [ -f /proc/sys/net/ipv4/tcp_syncookies ];then + if [ `cat /proc/sys/net/ipv4/tcp_syncookies` != 0 ]; then + sysctl -w net.ipv4.tcp_syncookies=0 + fi + fi # IPv6 hook (post IPv4 stop) if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then @@ -262,10 +312,10 @@ case "$1" in rm -f /var/lock/subsys/network ;; status) - echo $"Configured devices:" + gprintf "Configured devices:\n" echo lo $interfaces - echo $"Currently active devices:" + gprintf "Currently active devices:\n" echo $(/sbin/ip -o link show up | awk -F ": " '{ print $2 }') ;; restart|reload|force-reload) @@ -275,7 +325,7 @@ case "$1" in rc=$? ;; *) - echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}" + gprintf "Usage: %s\n" "$(basename $0) {start|stop|restart|reload|status}" exit 2 esac diff --git a/rc.d/init.d/single b/rc.d/init.d/single index 0ae9268e..8f37963a 100755 --- a/rc.d/init.d/single +++ b/rc.d/init.d/single @@ -16,9 +16,25 @@ if [ "$1" != "start" ]; then exit 0 fi +# killing splashy (#46169) +update_boot_stage exit + +# Kill all processes. +[ "${BASH+bash}" = bash ] && enable kill + +gprintf "Sending all processes the TERM signal...\n" +kill -15 -1 +sleep 5 +gprintf "Sending all processes the KILL signal..\n" +kill -9 -1 + # this looks nicer [ -x /usr/bin/clear ] && /usr/bin/clear # Now go to the single user level. -echo $"Telling INIT to go to single user mode." +gprintf "Telling INIT to go to single user mode.\n" + +# init hangs if LANG is set +unset LANG + exec init -t1 S diff --git a/rc.d/rc b/rc.d/rc index 678bb5e5..808283dd 100755 --- a/rc.d/rc +++ b/rc.d/rc @@ -25,6 +25,24 @@ runlevel=$2 previous=$1 export runlevel previous +# Get first argument. Set new runlevel to this argument. +if [ "$argv1" != "" ] ; then + newrunlevel="$argv1" +else + newrunlevel="$runlevel" +fi + +if [ "$previous" = "N" ];then + if [ -e /var/run/failsafe ];then + rm -f /var/run/failsafe + if [ -x /sbin/askrunlevel ];then + /sbin/askrunlevel --interactive && ASKRUNLEVEL=no + else + init 1 #jump to init 1 if not aksrunlevel. + fi + fi +fi + . /etc/init.d/functions export CONSOLETYPE @@ -37,10 +55,14 @@ UPSTART= # See if we want to be in user confirmation mode if [ "$previous" = "N" ]; then if [ "$do_confirm" = "yes" ]; then - echo $"Entering interactive startup" + gprintf "Entering interactive startup\n" else - echo $"Entering non-interactive startup" + gprintf "Entering non-interactive startup\n" fi +elif [[ "$newrunlevel" = "0" || "$newrunlevel" = "6" ]]; then + [ -x /etc/rc.d/init.d/dm -a -f /var/lock/subsys/dm ] && /etc/init.d/dm stop 2> /dev/null + chvt 1 + exec &> /dev/console fi # Get first argument. Set new runlevel to this argument. @@ -52,26 +74,44 @@ fi # Set language, vc settings once to avoid doing it for every init script # through functions if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n ] ; then - . /etc/profile.d/lang.sh 2>/dev/null + . /etc/profile.d/10lang.sh 2>/dev/null export LANGSH_SOURCED=1 fi +initsplash +[[ "$newrunlevel" = "0" || "$newrunlevel" = "6" ]] && [ "$splash_mode" = "plymouth" ] && rc_splash start $newrunlevel + +nopinit=`grep nopinit /proc/cmdline` + +rc_mode=K +export rc_mode + # First, run the KILL scripts. -for i in /etc/rc$runlevel.d/K* ; do +if [ -z "$nopinit" ]; then + /sbin/prcsys K /etc/rc$runlevel.d/ +else + for i in /etc/rc$runlevel.d/K* ; do # Check if the subsystem is already up. subsys=${i#/etc/rc$runlevel.d/K??} [ -f /var/lock/subsys/$subsys ] || [ -f /var/lock/subsys/$subsys.init ] || continue check_runlevel "$i" || continue + update_boot_stage "$subsys" # Bring the subsystem down. [ -n "$UPSTART" ] && initctl emit --quiet stopping JOB=$subsys - $i stop + action "Stopping %s: " $subsys $i stop [ -n "$UPSTART" ] && initctl emit --quiet stopped JOB=$subsys -done + done +fi + +rc_mode=S -# Now run the START scripts. -for i in /etc/rc$runlevel.d/S* ; do +if [ -z "$nopinit" ] && [ "$do_confirm" != "yes" -a "$runlevel" != "0" -a "$runlevel" != "1" -a "$runlevel" != "6" ]; then + /sbin/prcsys S /etc/rc$runlevel.d/ +else + # Now run the START scripts. + for i in /etc/rc$runlevel.d/S* ; do # Check if the subsystem is already up. subsys=${i#/etc/rc$runlevel.d/S??} @@ -97,8 +137,14 @@ for i in /etc/rc$runlevel.d/S* ; do export LC_ALL=C exec $i start fi - $i start + action "Starting %s: " $subsys $i start [ -n "$UPSTART" ] && initctl emit --quiet started JOB=$subsys -done + + done +fi + +if [[ "$newrunlevel" != "0" && "$newrunlevel" != "6" && "$newrunlevel" != "S" && "$newrunlevel" != "5" ]]; then + rc_splash stop +fi [ "$do_confirm" = "yes" ] && rm -f /var/run/confirm exit 0 diff --git a/rc.d/rc.local b/rc.d/rc.local index 0036e6c5..6d125d8b 100755 --- a/rc.d/rc.local +++ b/rc.d/rc.local @@ -1,7 +1,13 @@ #!/bin/sh # -# This script will be executed *after* all the other init scripts. -# You can put your own initialization stuff in here if you don't -# want to do the full Sys V style init stuff. +### BEGIN INIT INFO +# Provides: rc.local +# X-Mandriva-Compat-Mode +# Default-Start: 2 3 4 5 +# Short-Description: Local initialization script +# Description: This script will be executed *after* all the other init scripts. +# You can put your own initialization stuff in here if you don't +# want to do the full Sys V style init stuff. +### END INIT INFO touch /var/lock/subsys/local diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index f8f701af..b4779b18 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -7,11 +7,19 @@ HOSTNAME=$(/bin/hostname) +. /etc/init.d/functions + set -m if [ -f /etc/sysconfig/network ]; then . /etc/sysconfig/network fi + +# Read in config data. +if [ -f /etc/sysconfig/system ]; then + . /etc/sysconfig/system +fi + if [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; then HOSTNAME=localhost fi @@ -20,16 +28,131 @@ if [ ! -e /proc/mounts ]; then mount -n -t proc /proc /proc mount -n -t sysfs /sys /sys >/dev/null 2>&1 fi + +PLYMOUTH= +[ -x /bin/plymouth ] && PLYMOUTH=yes + + +# Only read this once. +cmdline=$(cat /proc/cmdline) + +for t in $cmdline; do + case $t in + -s|single|S|s) REQUESTED_RUNLEVEL="S" ;; + [1-9]) REQUESTED_RUNLEVEL="$t" ;; + esac +done +[ -z "$REQUESTED_RUNLEVEL" ] && REQUESTED_RUNLEVEL=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) +[ -z "$REQUESTED_RUNLEVEL" ] && REQUESTED_RUNLEVEL="3" + +# killing splash when using single-user mode +if [ "$REQUESTED_RUNLEVEL" == "S" ]; then + [ -n "$PLYMOUTH" ] && /bin/plymouth quit 2>/dev/null +fi + +uname_r=`uname -r` + +# Read in config data. +if [ -f /etc/sysconfig/speedboot ]; then + . /etc/sysconfig/speedboot +fi + +if strstr "$cmdline" speedboot= ; then + for arg in $cmdline ; do + if [ "${arg##speedboot=}" != "${arg}" ]; then + SPEEDBOOT=${arg##speedboot=} + fi + done +fi + +if [ "$REQUESTED_RUNLEVEL" != 5 -o -f /etc/rc.d/rc5.d/S*network-auth -o -f /etc/crypttab ]; then + SPEEDBOOT=no +fi + +# disable speedboot if more than one profile is found (and not selected in cmdline) +if echo /etc/netprofile/profiles/* | grep -q ' ' ; then + if ! strstr "$cmdline" PROFILE= ; then + SPEEDBOOT=no + fi +fi + +if strstr "$cmdline" failsafe ; then + SPEEDBOOT=no +fi + +# Check if a possible DKMS display driver is queued to be built on this boot +# or an interfering driver was loaded by initrd. +if [ "$SPEEDBOOT" != "no" ] && [ -x /sbin/display_driver_helper ] && ! /sbin/display_driver_helper --check-speedboot; then + SPEEDBOOT=no +fi + +if [ "$SPEEDBOOT" = "probe" ]; then + SPEEDBOOT_PROBE=yes +fi + +if [ "x$SPEEDBOOT" = "xauto" ]; then + STATUS=`grep -m 1 "$uname_r" /var/lib/speedboot/status 2>/dev/null` + case "$STATUS" in + *first\ time*) SPEEDBOOT=yes ;; + *FAILED*) SPEEDBOOT=no ;; + *OK*) SPEEDBOOT=yes ;; + *STANDARD\ BOOT*) SPEEDBOOT=yes ;; + *) SPEEDBOOT=no ;; + esac +fi + +if [ "$SPEEDBOOT" = "yes" ]; then + export SPEEDBOOT + PROMPT=no +else + unset SPEEDBOOT +fi + +if [ "x$SPEEDBOOT" != "xyes" ]; then if [ ! -d /proc/bus/usb ]; then - modprobe usbcore >/dev/null 2>&1 && mount -n -t usbfs /proc/bus/usb /proc/bus/usb + modprobe usbcore >/dev/null 2>&1 && mount -n -t usbfs -o devmode=0664,devgid=43 /proc/bus/usb /proc/bus/usb else - mount -n -t usbfs /proc/bus/usb /proc/bus/usb + mount -n -t usbfs -o devmode=0664,devgid=43 /proc/bus/usb /proc/bus/usb fi +fi #SPEEDBOOT -. /etc/init.d/functions +if [ -f /.readahead_collect -a -r /etc/sysconfig/readahead ]; then + . /etc/sysconfig/readahead + if [ "x$READAHEAD_COLLECT" == "xyes" -a ! -f /forcefsck -a -x /sbin/readahead-collector ]; then + /sbin/readahead-collector + fi +elif [ -x /sbin/readahead_early ]; then + /sbin/readahead_early > /dev/null 2>&1 +fi + +if [ -x /etc/rc.early.local ]; then + . /etc/rc.early.local +fi -PLYMOUTH= -[ -x /usr/bin/plymouth ] && PLYMOUTH=yes +# Unmount the initrd, if necessary +# (pixel) do not unmount if /initrd/loopfs is mounted (happens for root loopback) +# (bluca) handle udev /dev tmpfs here since kernel will happily umount /dev after initrd end +# (blino) do it before the udev service is started so that it uses the /dev tmpfs from initrd +if LC_ALL=C grep -q /initrd /proc/mounts && ! LC_ALL=C grep -q /initrd/loopfs /proc/mounts ; then + if LC_ALL=C grep -q /initrd/dev /proc/mounts; then + mount --move /initrd/dev /dev + fi + action "Unmounting initrd: " umount -l /initrd + /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1 +fi + +if [ "x$SPEEDBOOT" = "xyes" ]; then + /sbin/start_udev + udevadm trigger --action=add --subsystem-match=pci --attr-match=class="0x0c03*" + udevadm trigger --action=add --subsystem-match=block + udevadm settle & + UDEV_DISK_PID=$! + udevadm trigger --action=add --subsystem-match=mem --subsystem-match=input --subsystem-match=tty --subsystem-match=acpi --subsystem-match=rtc --subsystem-match=hid + udevadm trigger --action=add --subsystem-match=pci --attr-match=class="0x060000*" + udevadm trigger --action=add --subsystem-match=pci --attr-match=class="0x03*" + udevadm settle & + UDEV_PID=$! +fi # Check SELinux status SELINUX_STATE= @@ -47,9 +170,9 @@ if [ -n "$SELINUX_STATE" ] && [ -x /sbin/restorecon ] && __fgrep " /dev " /proc/ fi disable_selinux() { - echo $"*** Warning -- SELinux is active" - echo $"*** Disabling security enforcement for system recovery." - echo $"*** Run 'setenforce 1' to reenable." + gprintf "*** Warning -- SELinux is active\n" + gprintf "*** Disabling security enforcement for system recovery.\n" + gprintf "*** Run 'setenforce 1' to reenable.\n" echo "0" > "/selinux/enforce" } @@ -63,50 +186,57 @@ relabel_selinux() { if [ "$AUTORELABEL" = "0" ]; then echo - echo $"*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. " - echo $"*** /etc/selinux/config indicates you want to manually fix labeling" - echo $"*** problems. Dropping you to a shell; the system will reboot" - echo $"*** when you leave the shell." + gprintf "*** Warning -- SELinux %s policy relabel is required. \n" ${SELINUXTYPE} + gprintf "*** /etc/selinux/config indicates you want to manually fix labeling\n" + gprintf "*** problems. Dropping you to a shell; the system will reboot\n" + gprintf "*** when you leave the shell.\n" sulogin else echo - echo $"*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required." - echo $"*** Relabeling could take a very long time, depending on file" - echo $"*** system size and speed of hard drives." + gprintf "*** Warning -- SELinux %s policy relabel is required.\n" ${SELINUXTYPE} + gprintf "*** Relabeling could take a very long time, depending on file\n" + gprintf "*** system size and speed of hard drives.\n" /sbin/fixfiles -F restore > /dev/null 2>&1 fi rm -f /.autorelabel - echo $"Unmounting file systems" + gprintf "Unmounting file systems\n" umount -a mount -n -o remount,ro / - echo $"Automatic reboot in progress." + gprintf "Automatic reboot in progress.\n" reboot -f } # Print a text banner. -echo -en $"\t\tWelcome to " -read -r system_release < /etc/system-release -if [[ "$system_release" == *"Red Hat"* ]]; then - [ "$BOOTUP" = "color" ] && echo -en "\\033[0;31m" - echo -en "Red Hat" - [ "$BOOTUP" = "color" ] && echo -en "\\033[0;39m" - PRODUCT=$(sed "s/Red Hat \(.*\) release.*/\1/" /etc/system-release) - echo " $PRODUCT" -elif [[ "$system_release" == *Fedora* ]]; then - [ "$BOOTUP" = "color" ] && echo -en "\\033[0;34m" - echo -en "Fedora" - [ "$BOOTUP" = "color" ] && echo -en "\\033[0;39m" - PRODUCT=$(sed "s/Fedora \(.*\) \?release.*/\1/" /etc/system-release) - echo " $PRODUCT" +# C-like escape sequences don't work as 2nd and up parameters of gprintf, +# so real escap chars were written +PRODUCT=`sed "s/.*release \([0-9.]*\).*/\1/g" /etc/mandriva-release 2> /dev/null` +SYSTEM=${SYSTEM="Mandriva Linux"} + +if [ -r /etc/sysconfig/oem ]; then + . /etc/sysconfig/oem +fi + +if [ "$BOOTUP" != "serial" ]; then + gprintf "\t\t\tWelcome to %s" "`echo -en '\\033[1;36m'`$SYSTEM`echo -en '\\033[0;39m'` $PRODUCT" else - PRODUCT=$(sed "s/ release.*//g" /etc/system-release) - echo "$PRODUCT" + gprintf "\t\t\tWelcome to %s" "$SYSTEM $PRODUCT" +fi +echo -en "\r" +echo +if [ "$PROMPT" != "no" ]; then + gprintf "\t\tPress 'I' to enter interactive startup." + echo fi -# Only read this once. -cmdline=$(cat /proc/cmdline) +# Fix console loglevel +if [ -n "$LOGLEVEL" ]; then + /bin/dmesg -n $LOGLEVEL +fi + +initsplash 5 +rc_splash start 1 # Initialize hardware if [ -f /proc/sys/kernel/modprobe ]; then @@ -134,7 +264,9 @@ fi nashpid=$(pidof nash 2>/dev/null) [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1 unset nashpid -/sbin/start_udev +if [ "x$SPEEDBOOT" != "xyes" ]; then + /sbin/start_udev +fi #SPEEDBOOT # Load other user-defined modules for file in /etc/sysconfig/modules/*.modules ; do @@ -143,12 +275,19 @@ done # Load modules (for backward compatibility with VARs) if [ -f /etc/rc.modules ]; then + if [ "x$SPEEDBOOT" != "xyes" ]; then /etc/rc.modules + else + ionice -c 3 /etc/rc.modules & + MODULES_PID=$! + fi fi -mount -n /dev/pts >/dev/null 2>&1 +mount -n -t devpts -o mode=620 none /dev/pts >/dev/null 2>&1 [ -n "$SELINUX_STATE" ] && restorecon /dev/pts >/dev/null 2>&1 +mount -n -t tmpfs none /dev/shm >/dev/null 2>&1 + # Configure kernel parameters update_boot_stage RCkernelparam sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 @@ -157,18 +296,55 @@ for file in /etc/sysctl.d/* ; do test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1 done +if [ "x$SPEEDBOOT" != "xyes" ]; then + +# If brltty exist start it (after udev so that vcsa device nodes are created) +[ -x /bin/brltty -a "$BRLTTY" != "no" ] && action "Starting braille terminal" /bin/brltty && SPEEDBOOT="DISABLED reason: braille" + +fi #SPEEDBOOT + # Set the hostname. update_boot_stage RChostname -action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME} +action "Setting hostname %s: " ${HOSTNAME} hostname ${HOSTNAME} +# Set the NIS domain name +if [ -n "$NISDOMAIN" ]; then + action "Setting NIS domain name %s: " $NISDOMAIN nisdomainname $NISDOMAIN +fi + +if [ "x$SPEEDBOOT" != "xyes" ]; then +# Now that we load only one scsi_hostadapter in the initrd, we +# need to load the others here +modprobe scsi_hostadapter >/dev/null 2>&1 +# Now that we use modular IDE, we need to do the same for IDE controllers +modprobe ide-controller >/dev/null 2>&1 # Sync waiting for storage. { rmmod scsi_wait_scan ; modprobe scsi_wait_scan ; rmmod scsi_wait_scan ; } >/dev/null 2>&1 +# Start any MD RAID arrays that haven't been started yet +if [ -f /etc/mdadm.conf -a -x /sbin/mdadm ]; then + MDADM_RETURN=`/sbin/mdadm -As --auto=yes --run 2>&1` + RETVAL=$? + if [ $RETVAL -gt 0 ]; then + echo $MDADM_RETURN | grep -q 'No arrays found in config file' + RETVAL=$? + # only enable speedboot if no array is configured + if [ $RETVAL -gt 0 ]; then + SPEEDBOOT="DISABLED: reason:MD RAID" + fi + else # MD RAID arrays detected, better to disable speedboot + SPEEDBOOT="DISABLED: reason:MD RAID" + + fi +fi +fi #SPEEDBOOT + # Device mapper & related initialization if ! __fgrep "device-mapper" /proc/devices >/dev/null 2>&1 ; then modprobe dm-mod >/dev/null 2>&1 fi +if [ "x$SPEEDBOOT" != "xyes" ]; then if [ -f /etc/crypttab ]; then init_crypto 0 fi @@ -184,29 +360,31 @@ fi if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then modprobe dm-mirror >/dev/null 2>&1 - dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i) - if [ "$?" = "0" ]; then - for dmname in $dmraidsets; do - if [[ "$dmname" == isw_* ]] && \ - ! strstr "$cmdline" noiswmd; then - continue - fi - /sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1 - /sbin/kpartx -a -p p "/dev/mapper/$dmname" - done + dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i) + if [ "$dmraidsets" != "no raid disks" -a "$dmraidsets" != "no block devices found" ]; then + for dmname in $dmraidsets; do + if [[ "$dmname" =~ '^isw_.*' ]] && \ + ! strstr "$cmdline" noiswmd; then + continue + fi + + /sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1 + /sbin/kpartx -a -p p "/dev/mapper/$dmname" + SPEEDBOOT="DISABLED reason:dmraid" + done + fi fi -fi - -# Start any MD RAID arrays that haven't been started yet -[ -r /proc/mdstat -a -r /dev/md/md-device-map ] && /sbin/mdadm -IRs - +fi #SPEEDBOOT + if [ -x /sbin/lvm ]; then - action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit + action "Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --ignorelockingfailure fi +if [ "x$SPEEDBOOT" != "xyes" ]; then if [ -f /etc/crypttab ]; then init_crypto 0 fi +fi #SPEEDBOOT if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then fastboot=yes @@ -216,19 +394,22 @@ if [ -f /fsckoptions ]; then fsckoptions=$(cat /fsckoptions) fi +# (blino) always source autofsck settings, for AUTOFSCK_CRYPTO_TIMEOUT (#16029) +[ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck + if [ -f /forcefsck ] || strstr "$cmdline" forcefsck ; then fsckoptions="-f $fsckoptions" elif [ -f /.autofsck ]; then - [ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then AUTOFSCK_OPT="$AUTOFSCK_OPT -f" fi if [ -n "$AUTOFSCK_SINGLEUSER" ]; then [ -n "$PLYMOUTH" ] && plymouth --hide-splash + rc_splash verbose echo - echo $"*** Warning -- the system did not shut down cleanly. " - echo $"*** Dropping you to a shell; the system will continue" - echo $"*** when you leave the shell." + gprintf "*** Warning -- the system did not shut down cleanly. \n" + gprintf "*** Dropping you to a shell; the system will continue\n" + gprintf "*** when you leave the shell.\n" [ -n "$SELINUX_STATE" ] && echo "0" > /selinux/enforce sulogin [ -n "$SELINUX_STATE" ] && echo "1" > /selinux/enforce @@ -398,52 +579,51 @@ _RUN_QUOTACHECK=0 if strstr "$cmdline" forcequotacheck || [ -f /forcequotacheck ] ; then _RUN_QUOTACHECK=1 fi -if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then - - STRING=$"Checking filesystems" - echo $STRING - fsck -T -t noopts=_netdev -A $fsckoptions +Fsck() +{ + fsck $* rc=$? if [ "$rc" -eq "0" ]; then - success "$STRING" + echo_success echo elif [ "$rc" -eq "1" ]; then - passed "$STRING" + echo_passed echo + _RUN_QUOTACHECK=1 elif [ "$rc" -eq "2" -o "$rc" -eq "3" ]; then - echo $"Unmounting file systems" + gprintf "Unmounting file systems\n" umount -a mount -n -o remount,ro / - echo $"Automatic reboot in progress." + gprintf "Automatic reboot in progress.\n" reboot -f - fi - - # A return of 4 or higher means there were serious problems. - if [ $rc -gt 1 ]; then - [ -n "$PLYMOUTH" ] && plymouth --hide-splash - - failure "$STRING" + elif [ $((rc & 4)) = 4 ]; then + # Return code is a or between return codes for the filesystems + # 4 means that a filesystem remains corrupted + rc_splash verbose + echo_failure echo echo - echo $"*** An error occurred during the file system check." - echo $"*** Dropping you to a shell; the system will reboot" - echo $"*** when you leave the shell." + gprintf "*** An error occurred during the file system check.\n" + gprintf "*** Dropping you to a shell; the system will reboot\n" + gprintf "*** when you leave the shell.\n" - str=$"(Repair filesystem)" + str=`gprintf "(Repair filesystem)"` PS1="$str \# # "; export PS1 [ "$SELINUX_STATE" = "1" ] && disable_selinux sulogin - echo $"Unmounting file systems" + gprintf "Unmounting file systems\n" umount -a mount -n -o remount,ro / - echo $"Automatic reboot in progress." + gprintf "Automatic reboot in progress.\n" reboot -f - elif [ "$rc" -eq "1" ]; then - _RUN_QUOTACHECK=1 + else + echo_failure + echo + gprintf "*** A non fatal error occurred during the file system check.\n" fi -fi +} remount_needed() { local state oldifs @@ -461,23 +641,53 @@ remount_needed() { return 0 } +if [ "x$SPEEDBOOT" = "xyes" ]; then + wait $UDEV_DISK_PID +fi +# do not check / if already rw (for example with unionfs) +if [ -z "$fastboot" -a "$READONLY" != "yes" ] && remount_needed; then + gprintf "Checking root filesystem\n" + Fsck -T -a $fsckoptions / +fi +_RUN_QUOTACHECK=0 + # Remount the root filesystem read-write. update_boot_stage RCmountfs if remount_needed ; then - action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw / + action "Remounting root filesystem in read-write mode: " mount -n -o remount,rw / +fi + +# wait for usb storage scanning processes to finish +if ! strstr "$cmdline" nousb; then + LC_ALL=C grep '08' /sys/bus/usb/devices/*/bInterfaceClass >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + countdown=20 + until [ -d /sys/module/usb_storage -o $countdown -eq 0 ]; do + usleep 100000; let countdown=$countdown-1; + done + while ps -eocomm | grep -q usb-stor-scan; do + sleep 1; + done + fi fi +if [ "x$SPEEDBOOT" != "xyes" ]; then # Clean up SELinux labels if [ -n "$SELINUX_STATE" ]; then restorecon /etc/mtab /etc/ld.so.cache /etc/blkid/blkid.tab /etc/resolv.conf >/dev/null 2>&1 + SPEEDBOOT="DISABLED reason: SELinux" fi +[ -x /sbin/hibernate-cleanup.sh ] && /sbin/hibernate-cleanup.sh start + # If relabeling, relabel mount points. if [ -n "$SELINUX_STATE" -a "$READONLY" != "yes" ]; then if strstr "$cmdline" autorelabel || [ -f /.autorelabel ] ; then restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1 fi fi +fi if [ "$READONLY" != "yes" ] ; then # Clear mtab @@ -494,25 +704,109 @@ if [ "$READONLY" != "yes" ] ; then mount -f /dev/shm >/dev/null 2>&1 mount -f /proc/bus/usb >/dev/null 2>&1 fi +# (pixel) also added /initrd/loopfs for loopback root +mount -f /initrd/loopfs 2>/dev/null -# Mount all other filesystems (except for NFS and /proc, which is already +if [ -x /sbin/isapnp -a -f /etc/isapnp.conf -a ! -f /proc/isapnp ]; then + # check for arguments passed from kernel + if ! strstr "$cmdline" nopnp ; then + PNP=yes + fi + if [ -n "$PNP" ]; then + action "Setting up ISA PNP devices: " /sbin/isapnp /etc/isapnp.conf + else + action "Skipping ISA PNP configuration at users request: " /bin/true + fi +fi + +# tweak isapnp settings if needed. +if [ -n "$PNP" -a -f /proc/isapnp -a -x /sbin/sndconfig ]; then + /sbin/sndconfig --mungepnp >/dev/null 2>&1 +fi + +# Check filesystems +# (pixel) do not check loopback files, will be done later (aren't available yet) +if [ -z "$fastboot" ]; then + gprintf "Checking filesystems\n" + Fsck -T -R -A -a -t noopts=loop $fsckoptions +fi + +# Mount all other filesystems (except for network bases filesystems and /proc, which is already # mounted). Contrary to standard usage, # filesystems are NOT unmounted in single user mode. +# (pixel) also do not mount loopback and encrypted filesystems +# will be done later +( +# export locales (needed by mount.ntfs-3g) +export LC_ALL +export LANG if [ "$READONLY" != "yes" ] ; then - action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev + action "Mounting local filesystems: " mount -a -t nodevpts,nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev,noloop,noencrypted else - action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev + action "Mounting local filesystems: " mount -a -n -t nodevpts,nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev,noloop,noencrypted +fi +) + +if [ "x$SPEEDBOOT" != "xyes" ]; then +[[ -z $AUTOFSCK_CRYPTO_TIMEOUT ]] && AUTOFSCK_CRYPTO_TIMEOUT=15 + +#Mounting Encrypted filesystem +encrypted_swap= +if [[ ! -f /fastboot ]];then + encrypted= + while read -a entry;do + device=${entry[0]} + mountpoint=${entry[1]} + options=${entry[3]} + type=${entry[2]} + if [[ $options == *encryption=* || $options == *encrypted* ]];then + [[ $options == *noauto* ]] && continue + if [[ $type == *swap* ]];then + encrypted_swap="$encrypted_swap $device" + continue + fi + encrypted="$encrypted $mountpoint" + fi + done < /etc/fstab + if [[ -n $encrypted ]];then + modprobe cryptoloop + rc_splash verbose + echo "We have discovered Encrypted filesystems, do you want to mount them now ?" + MSG=`gprintf "Press Y within %%d seconds to mount your encrypted filesystems..."` + KEYS=`gprintf "yY"` + if /sbin/getkey -c $AUTOFSCK_CRYPTO_TIMEOUT -m "$MSG" "$KEYS"; then + echo -e '\n' + for i in ${encrypted};do + echo -n "${i} "; mount ${i} + done + else + echo -e '\n' + fi + fi fi +# (pixel) Check loopback filesystems +if [ ! -f /fastboot ]; then + modprobe loop + gprintf "Checking loopback filesystems" + Fsck -T -R -A -a -t opts=loop $fsckoptions +fi + +fi #SPEEDBOOT + +# Mount loopback +action "Mounting loopback filesystems: " mount -a -O loop + # Update quotas if necessary if [ X"$_RUN_QUOTACHECK" = X1 ] && [ -x /sbin/quotacheck ]; then - action $"Checking local filesystem quotas: " /sbin/quotacheck -anug + action "Checking local filesystem quotas: " /sbin/quotacheck -anug fi if [ -x /sbin/quotaon ]; then - action $"Enabling local filesystem quotas: " /sbin/quotaon -aug + action "Turning on user and group quotas for local filesystems: " /sbin/quotaon -aug fi +if [ "x$SPEEDBOOT" != "xyes" ]; then # Check to see if a full relabel is needed if [ -n "$SELINUX_STATE" -a "$READONLY" != "yes" ]; then if strstr "$cmdline" autorelabel || [ -f /.autorelabel ] ; then @@ -523,6 +817,7 @@ else [ -f /.autorelabel ] || touch /.autorelabel fi fi +fi #SPEEDBOOT # Initialize pseudo-random number generator if [ -f "/var/lib/random-seed" ]; then @@ -534,9 +829,10 @@ if [ "$READONLY" != "yes" ]; then chmod 600 /var/lib/random-seed dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=512 2>/dev/null fi - +if [ "x$SPEEDBOOT" != "xyes" ]; then if [ -f /etc/crypttab ]; then init_crypto 1 + SPEEDBOOT="DISABLED reason: crypto FS" fi # Configure machine if necessary. @@ -570,15 +866,21 @@ if [ -f /.unconfigured ]; then . /etc/sysconfig/network # Reset the hostname. - action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME} + action "Resetting hostname %s: " ${HOSTNAME} hostname ${HOSTNAME} + + # Reset the NIS domain name. + if [ -n "$NISDOMAIN" ]; then + action "Resetting NIS domain name %s: " $NISDOMAIN nisdomainname $NISDOMAIN + fi fi rm -f /.unconfigured fi +fi # Clean out /. rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \ - /poweroff /.suspended &> /dev/null + /poweroff /.suspended /etc/killpower &> /dev/null # Do we need (w|u)tmpx files? We don't set them up, but the sysadmin might... _NEED_XFILES= @@ -586,10 +888,15 @@ _NEED_XFILES= # Clean up /var. rm -rf /var/lock/cvs/* /var/run/screen/* -find /var/lock /var/run ! -type d -exec rm -f {} \; -rm -f /var/lib/rpm/__db* &> /dev/null -rm -f /var/gdm/.gdmfifo &> /dev/null +find /var/lock /var/run ! -type d ! -path '/var/lock/TMP_1ST' -exec rm -f {} \; +if [ "x$SPEEDBOOT" = "xyes" ]; then + wait $MODULES_PID + wait $UDEV_PID + /etc/rc.d/rc S & + RC_PID=$! +fi +{ # Clean up utmp/wtmp > /var/run/utmp touch /var/log/wtmp /var/log/btmp @@ -606,11 +913,12 @@ fi # Clean up various /tmp bits [ -n "$SELINUX_STATE" ] && restorecon /tmp -rm -f /tmp/.X*-lock /tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.* +rm -f /tmp/.X*-lock /tmp/.lock.* /tmp/.s.PGSQL.* rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \ /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-* \ - /tmp/scrollkeeper-* /tmp/ssh-* \ - /dev/.in_sysinit + /tmp/ssh-* /tmp/.fam_socket /tmp/.esd /tmp/.esd-* \ + /tmp/pulse-* /tmp/.sawfish-* /tmp/esrv* /tmp/kio* \ + /var/lib/gdm/core.* # Make ICE directory mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1 @@ -619,7 +927,7 @@ chown root:root /tmp/.ICE-unix # Start up swapping. update_boot_stage RCswap -action $"Enabling /etc/fstab swaps: " swapon -a -e +action "Enabling /etc/fstab swaps: " swapon -a -e 2>/dev/null if [ "$AUTOSWAP" = "yes" ]; then curswap=$(awk '/^\/dev/ { print $1 }' /proc/swaps | while read x; do get_numeric_dev dec $x ; echo -n " "; done) swappartitions=$(blkid -t TYPE=swap -o device) @@ -627,7 +935,7 @@ if [ "$AUTOSWAP" = "yes" ]; then for partition in $swappartitions ; do [ ! -e $partition ] && continue majmin=$(get_numeric_dev dec $partition) - echo $curswap | grep -qw "$majmin" || action $"Enabling local swap partitions: " swapon $partition + echo $curswap | grep -qw "$majmin" || action "Enabling local swap partitions: " swapon $partition done fi fi @@ -646,20 +954,221 @@ if [ -x /usr/sbin/system-config-network-cmd ]; then fi fi +( +# Now turn on swap in case we swap to files. +action "Enabling swap space: " swapon -a -e + +if [ "x$SPEEDBOOT" != "xyes" ]; then +# If a SCSI tape has been detected, load the st module unconditionally +# since many SCSI tapes don't deal well with st being loaded and unloaded +if [ -n "$USEMODULES" -a -f /proc/scsi/scsi ] && LC_ALL=C grep -q 'Type: Sequential-Access' /proc/scsi/scsi 2>/dev/null ; then + LC_ALL=C fgrep -q ' 9 st' /proc/devices || modprobe st >/dev/null 2>&1 + SPEEDBOOT="DISABLED reason: SCSI tape" +fi +fi #SPEEDBOOT + +( +# Turn on harddisk optimization +# There is only one file /etc/sysconfig/harddisks for all disks +# after installing the hdparm-RPM. If you need different hdparm parameters +# for each of your disks, copy /etc/sysconfig/harddisks to +# /etc/sysconfig/harddiskhda (hdb, hdc...) and modify it. +# Each disk which has no special parameters will use the defaults. +# Each non-disk which has no special parameters will be ignored. +# + +disk[0]=s; +disk[1]=hda; disk[2]=hdb; disk[3]=hdc; disk[4]=hdd; +disk[5]=hde; disk[6]=hdf; disk[7]=hdg; disk[8]=hdh; +disk[9]=hdi; disk[10]=hdj; disk[11]=hdk; disk[12]=hdl; +disk[13]=hdm; disk[14]=hdn; disk[15]=hdo; disk[16]=hdp; +disk[17]=hdq; disk[18]=hdr; disk[19]=hds; disk[20]=hdt; +disk[21]=sda; disk[22]=sdb; disk[23]=sdc; disk[24]=sdd; +disk[25]=sde; disk[26]=sdf; disk[27]=sdg; disk[28]=sdh; +disk[29]=sr0; disk[30]=sr1; disk[31]=sr2; disk[32]=sr3; +disk[33]=scd0; disk[34]=scd1; disk[35]=scd2; disk[36]=scd3; +disk[37]=sg0; disk[38]=sg1; disk[39]=sg2; disk[40]=sg3; + + +# Skip hard disks optimization if software RAID arrays are currently +# resyncing and disks heavily active, because hdparm might hang and +# lock system startup in such situation + +if [ ! -f /proc/mdstat ] || ! /bin/egrep -qi "re(cover|sync)|syncing" /proc/mdstat; then + if [ -x /sbin/hdparm ]; then + for device in {0..40}; do + unset MULTIPLE_IO USE_DMA EIDE_32BIT LOOKAHEAD EXTRA_PARAMS + if [ -f /etc/sysconfig/harddisk${disk[$device]} ]; then + . /etc/sysconfig/harddisk${disk[$device]} + HDFLAGS[$device]= + if [ -n "$MULTIPLE_IO" ]; then + HDFLAGS[$device]="-q -m$MULTIPLE_IO" + fi + if [ -n "$USE_DMA" ]; then + HDFLAGS[$device]="${HDFLAGS[$device]} -q -d$USE_DMA" + fi + if [ -n "$EIDE_32BIT" ]; then + HDFLAGS[$device]="${HDFLAGS[$device]} -q -c$EIDE_32BIT" + fi + if [ -n "$LOOKAHEAD" ]; then + HDFLAGS[$device]="${HDFLAGS[$device]} -q -A$LOOKAHEAD" + fi + if [ -n "$EXTRA_PARAMS" ]; then + HDFLAGS[$device]="${HDFLAGS[$device]} $EXTRA_PARAMS" + fi + else + HDFLAGS[$device]="${HDFLAGS[0]}" + fi + if [ -e "/proc/ide/${disk[$device]}/media" -o -e "/sys/block/${disk[$device]}/device/vendor" ]; then + if [ -e "/proc/ide/${disk[$device]}/media" ]; then + hdmedia=`cat /proc/ide/${disk[$device]}/media` + else + hdmedia=`cat /sys/block/${disk[$device]}/device/vendor` + fi + if [ "$hdmedia" = "disk" -o "$vendor" = "ATA" -o -f "/etc/sysconfig/harddisk${disk[$device]}" ]; then + if [ -n "${HDFLAGS[$device]}" ]; then + sleep 2 + action "Setting hard drive parameters for %s: " ${disk[$device]} /sbin/hdparm ${HDFLAGS[$device]} /dev/${disk[$device]} + fi + fi + fi + done + fi +else + action "RAID Arrays are resyncing. Skipping hard drive parameters section." /bin/true +fi +) & + + +# Adjust symlinks as necessary in /boot to keep system services from +# spewing messages about mismatched System maps and so on. +if [ -L /boot/System.map -a -r /boot/System.map-$uname_r -a \ + ! /boot/System.map -ef /boot/System.map-$uname_r ] ; then + ln -s -f System.map-$uname_r /boot/System.map 2>/dev/null +fi +if [ ! -e /boot/System.map -a -r /boot/System.map-$uname_r ] ; then + ln -s -f System.map-$uname_r /boot/System.map 2>/dev/null +fi + +# Adjust symlinks as necessary in /boot to have the default config +if [ -L /boot/config -a -r /boot/config-$uname_r ] ; then + ln -sf config-$uname_r /boot/config 2>/dev/null +fi +if [ ! -e /boot/config -a -r /boot/config-$uname_r ] ; then + ln -sf config-$uname_r /boot/config 2>/dev/null +fi + # Now that we have all of our basic modules loaded and the kernel going, # let's dump the syslog ring somewhere so we can find it later [ -f /var/log/dmesg ] && mv -f /var/log/dmesg /var/log/dmesg.old dmesg -s 131072 > /var/log/dmesg +) & # create the crash indicator flag to warn on crashes, offer fsck with timeout touch /.autofsck &> /dev/null +if [ "$PROMPT" != no ]; then + while :; do + pid=$(/sbin/pidof getkey) + [ -n "$pid" -o -e /var/run/getkey_done ] && break + usleep 100000 + done + [ -n "$pid" ] && kill -TERM "$pid" >/dev/null 2>&1 +fi +} & if strstr "$cmdline" confirm ; then touch /var/run/confirm fi +if [ "x$SPEEDBOOT" != "xyes" ]; then +if [ "$PROMPT" != "no" ]; then + /sbin/getkey i && touch /var/run/confirm + touch /var/run/getkey_done +fi +wait +[ "$PROMPT" != no ] && rm -f /var/run/getkey_done +fi + +if strstr "$cmdline" failsafe; then + touch /var/run/failsafe +fi + +if [ -f /var/lock/TMP_1ST ];then + if [ -f /etc/init.d/mandrake_firstime ];then + /bin/sh /etc/init.d/mandrake_firstime + fi +fi + +if [ "x$SPEEDBOOT" = "xyes" ]; then + if [ ! -f /.readahead_collect -a -x /sbin/readahead_later ]; then + /sbin/readahead_later > /dev/null 2>&1 + fi + wait $RC_PID + countdown=10 + until [ -e /tmp/.X11-unix/X0 -o $countdown -eq 0 ]; do + sleep 1; let countdown=$countdown-1; + done + + + + /sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=block --subsystem-nomatch=mem --subsystem-nomatch=input --subsystem-nomatch=acpi --subsystem-nomatch=rtc --subsystem-nomatch=hid + /sbin/udevadm settle --timeout=5 > /dev/null 2>&1 + /sbin/udevadm control --env=STARTUP= + mount -n -t usbfs -o devmode=0664,devgid=43 /proc/bus/usb /proc/bus/usb + + # (anssi) at this point plymouth should have quit, reopen descriptors to + # ensure that the output of the rest of this script is seen if the user is + # not in X11 + exec 0<>/proc/self/fd/0 1<>/proc/self/fd/1 2<>/proc/self/fd/2 +fi + +if [ -f /etc/init.d/mandrake_everytime ]; then + /bin/sh /etc/init.d/mandrake_everytime +fi + +if [ "x$SPEEDBOOT_PROBE" = "xyes" ]; then + sed -i -e "/$uname_r .*/d" /var/lib/speedboot/status 2>/dev/null + unset SPEEDBOOT_PROBE +fi + +if [ "x$SPEEDBOOT" = "xyes" -a ! -e /tmp/.X11-unix/X0 ]; then + /etc/init.d/dm stop + grep -q "$uname_r" /var/lib/speedboot/status 2> /dev/null + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + sed -i -e "s/^$uname_r FAILED (first time)/$uname_r FAILED/g" -e "/FAILED/!s/^$uname_r .*/$uname_r FAILED (first time)/g" /var/lib/speedboot/status + else + echo "$uname_r FAILED (first time)" >> /var/lib/speedboot/status + fi +fi + +# system configuration doesn't permit speedboot or speedboot failed, disable it +if strstr "$SPEEDBOOT" DISABLED ; then + grep -q $uname_r /var/lib/speedboot/status 2> /dev/null + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + sed -i -e "s/^$uname_r .*/$uname_r $SPEEDBOOT/g" /var/lib/speedboot/status + else + echo "$uname_r $SPEEDBOOT" >> /var/lib/speedboot/status + fi +fi + +unset SPEEDBOOT + +# (pixel) a kind of profile for XF86Config +# if no XFree=XXX given on kernel command-line, restore XF86Config.standard +for i in XF86Config XF86Config-4; do + if [ -L "/etc/X11/$i" ]; then + XFree=`sed -n 's/.*XFree=\(\w*\).*/\1/p' /proc/cmdline` + [ -n "$XFree" ] || XFree=standard + [ -r "/etc/X11/$i.$XFree" ] && ln -sf "$i.$XFree" "/etc/X11/$i" + fi +done # Let rhgb know that we're leaving rc.sysinit if [ -x /usr/bin/plymouth ]; then /usr/bin/plymouth --sysinit fi +# remove this file at the very end, for speedboot +rm -f /dev/.in_sysinit + -- cgit v1.2.1