Re: some more single user mode in /etc/rc

2016-09-05 Thread Jason McIntyre
On Mon, Sep 05, 2016 at 10:58:47AM -0400, Rob Pierce wrote:
> I wasn't actually looking for this, but stumbled across it while reviewing
> /etc/rc.
> 
> Rob
> 

well the code is different, at least for me. someone else might pick
this up, but i won't - sorry. i mean, to do the job right, you'd have to
check /usr/src, and then check for things like "multi user" or
"multiuser", and then...

jmc

> Index: rc
> ===
> RCS file: /cvs/src/etc/rc,v
> retrieving revision 1.486
> diff -u -p -r1.486 rc
> --- rc10 Jul 2016 09:08:18 -  1.486
> +++ rc5 Sep 2016 14:54:47 -
> @@ -262,7 +262,7 @@ do_fsck() {
>  stty status '^T'
>  
>  # Set shell to ignore SIGINT (2), but not children; shell catches SIGQUIT (3)
> -# and returns to single user after fsck.
> +# and returns to single-user mode after fsck.
>  trap : 2
>  trap : 3 # Shouldn't be needed.
>  
> @@ -289,9 +289,9 @@ if [[ $1 == shutdown ]]; then
>   echo warning: cannot write random seed to disk
>   fi
>  
> - # If we are in secure level 0, assume single user mode.
> + # If we are in secure level 0, assume single-user mode.
>   if (($(sysctl -n kern.securelevel) == 0)); then
> - echo 'single user: not running shutdown scripts'
> + echo 'single-user mode: not running shutdown scripts'
>   else
>   pkg_scripts=${pkg_scripts%%*( )}
>   if [[ -n $pkg_scripts ]]; then



some more single user mode in /etc/rc

2016-09-05 Thread Rob Pierce
I wasn't actually looking for this, but stumbled across it while reviewing
/etc/rc.

Rob

Index: rc
===
RCS file: /cvs/src/etc/rc,v
retrieving revision 1.486
diff -u -p -r1.486 rc
--- rc  10 Jul 2016 09:08:18 -  1.486
+++ rc  5 Sep 2016 14:54:47 -
@@ -262,7 +262,7 @@ do_fsck() {
 stty status '^T'
 
 # Set shell to ignore SIGINT (2), but not children; shell catches SIGQUIT (3)
-# and returns to single user after fsck.
+# and returns to single-user mode after fsck.
 trap : 2
 trap : 3   # Shouldn't be needed.
 
@@ -289,9 +289,9 @@ if [[ $1 == shutdown ]]; then
echo warning: cannot write random seed to disk
fi
 
-   # If we are in secure level 0, assume single user mode.
+   # If we are in secure level 0, assume single-user mode.
if (($(sysctl -n kern.securelevel) == 0)); then
-   echo 'single user: not running shutdown scripts'
+   echo 'single-user mode: not running shutdown scripts'
else
pkg_scripts=${pkg_scripts%%*( )}
if [[ -n $pkg_scripts ]]; then