[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 4/4] Make s390 shutdown/reboot/halt more like other systems.



> diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
> index a3ee665..acde20f 100644
> --- a/loader/linuxrc.s390
> +++ b/loader/linuxrc.s390
> @@ -93,24 +93,7 @@ function checkipv4()
>  function doshutdown()
>  {
>      echo $"about to exec shutdown"
> -    exec /sbin/shutdown
> -    exit 0
> -}
> -
> -function doreboot()
> -{
> -    if [ -e "/sys/firmware/reipl" ]; then
> -        read REIPL_TYPE < /sys/firmware/reipl/reipl_type
> -        echo "reipl_type=$REIPL_TYPE"
> -        pushd /sys/firmware/reipl/$REIPL_TYPE >/dev/null 2>&1
> -        for i in *; do
> -            echo "$i=`cat $i`"
> -        done
> -        popd >/dev/null 2>&1
> -    fi


It is helpful to know where the 390 was going to reboot into.

> -
> -    echo $"about to exec shutdown -r"
> -    exec /sbin/shutdown -r
> +    exec /sbin/shutdown -h
>      exit 0
>  }
>  
> @@ -3054,17 +3037,14 @@ EOF
>  
>      echo -n $$ > /var/run/init.pid
>  
> -    # shutdown (halt) on SIGUSR1
> -    trap doshutdown SIGUSR1
> -    # reboot on SIGUSR2
> -    trap doreboot SIGUSR2
> -
>      startinetd
>  
>      if [ -n "$RUNKS" ]; then
>          /sbin/loader
>      fi
>  
> +    # We only ever get here if anaconda exits abnormally, as usually anaconda
> +    # handles calling shutdown for us.
>      doshutdown
>  
>  fi # testing
> --
> 1.6.5.1

--
Mark

You must be the change you wish to see in the world. -- Mahatma Gandhi
Worrying is praying for that you do not wish to happen.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]