[src/netbsd-8]: src/distrib/atari/floppies Pull up following revision(s) (req...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/428604e9a6e2
branches:  netbsd-8
changeset: 851176:428604e9a6e2
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 27 11:31:52 2017 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #393):
        distrib/atari/floppies/install/list: revision 1.21
        distrib/atari/floppies/common/dot.profile: revision 1.6
Avoid use of expr(1).
It was removed from src/distrib/atari/floppies/install/list since rev 1.19
and the install script complains expr is not found.
Should be pulled up to netbsd-8.
Put back /bin/cp and /sbin/sysctl to installation binaries.
- cp(1) is explicitly required by sysinst(8), cp_to_target() in
  src/usr.sbin/sysinst/target.c, to copy bootloader to targetroot
- sysctl(8) is required by src/distrib/atari/floppies/common/dot.profile
  to detect the root device (fd or md)
This might cause floppy overflow on HEAD again, but works on 8.0_BETA.
Should be pulled up to netbsd-8.

diffstat:

 distrib/atari/floppies/common/dot.profile |  4 ++--
 distrib/atari/floppies/install/list       |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r ba14cf50d633 -r 428604e9a6e2 distrib/atari/floppies/common/dot.profile
--- a/distrib/atari/floppies/common/dot.profile Mon Nov 27 10:31:33 2017 +0000
+++ b/distrib/atari/floppies/common/dot.profile Mon Nov 27 11:31:52 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.5 2016/01/30 00:52:11 tsutsui Exp $
+# $NetBSD: dot.profile,v 1.5.8.1 2017/11/27 11:31:52 martin Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -79,7 +79,7 @@
                _num=0
                for i in $_maps; do
                        echo "  $_num  $i"
-                       _num=`expr $_num + 1`
+                       _num=$(( $_num + 1 ))
                done
                echo
                echo -n "Select the number of the map you want to activate: "
diff -r ba14cf50d633 -r 428604e9a6e2 distrib/atari/floppies/install/list
--- a/distrib/atari/floppies/install/list       Mon Nov 27 10:31:33 2017 +0000
+++ b/distrib/atari/floppies/install/list       Mon Nov 27 11:31:52 2017 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: list,v 1.20 2017/02/08 16:12:59 rin Exp $
+#      $NetBSD: list,v 1.20.4.1 2017/11/27 11:31:52 martin Exp $
 
 PROG   bin/cat
 PROG   bin/chmod
-#PROG  bin/cp
+PROG   bin/cp
 PROG   bin/dd
 PROG   bin/df
 PROG   bin/ln
@@ -31,7 +31,7 @@
 PROG   sbin/ping
 PROG   sbin/reboot     sbin/halt
 PROG   sbin/route
-#PROG  sbin/sysctl
+PROG   sbin/sysctl
 PROG   sbin/umount
 
 PROG   usr/bin/ftp