From 3db2012126385e19923ecf742315b62c0b4b4ff8 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Fri, 21 Aug 2015 19:40:29 +0200 Subject: [PATCH] fshalt: remove kfs support --- rc/bin/fshalt | 24 ------------------------ sys/man/8/fshalt | 6 ++---- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/rc/bin/fshalt b/rc/bin/fshalt index 483151449..2fed2465a 100755 --- a/rc/bin/fshalt +++ b/rc/bin/fshalt @@ -22,21 +22,9 @@ unmount /mnt/consoles >[2]/dev/null kill consolefs | rc # don't compete with /mnt/consoles sleep 1 -k=`{ls /srv/kfs*cmd >[2]/dev/null|sort -r} c=`{ls /srv/cwfs*cmd >[2]/dev/null} h=`{ls /srv/hjfs*cmd >[2]/dev/null} -for (i in $k){ - echo -n $i... - switch($i){ - case /srv/kfs.cmd - disk/kfscmd sync - case * - disk/kfscmd -n `{echo $i | sed -n 's%/srv/kfs.(.*).cmd%\1%p'} sync - } - sleep 2 -} - # for scram, don't scram other systems bind -b '#P' /dev if(! ~ $reboot yes){ @@ -49,10 +37,7 @@ if(! ~ $reboot yes){ # halting (binaries we run can't be on the fs we're halting) ramfs builtin cd /tmp -cp /bin/dial/expect /tmp -cp /bin/disk/kfscmd /tmp cp /bin/echo /tmp -cp /bin/iostats /tmp mkdir /tmp/lib cp /rc/lib/rcmain /tmp/lib cp /bin/ns /tmp @@ -68,15 +53,6 @@ bind /tmp /bin fn x { echo echo -n halting... - for (i in $k){ - echo -n $i... - switch($i){ - case /srv/kfs.cmd - kfscmd halt - case * - kfscmd -n `{echo $i | sed -n 's%/srv/kfs.(.*).cmd%\1%p'} halt - } - } for (i in $c){ echo -n $i... echo halt >>$i diff --git a/sys/man/8/fshalt b/sys/man/8/fshalt index 09b7d737c..129d2cdb7 100644 --- a/sys/man/8/fshalt +++ b/sys/man/8/fshalt @@ -16,11 +16,9 @@ fshalt, scram, reboot \- halt any local file systems and optionally shut down or .SH DESCRIPTION .I Fshalt syncs and halts all local -.IR cwfs (4), -.IR hjfs (4), -.IR venti (8), +.IR cwfs (4) and -.IR kfs (4) +.IR hjfs (4) servers. If given .BR -r ,