Move all services to /service

This concerns all services, a.k.a drivers, filesystem drivers, network
(inet, lwip, uds) servers, and the system servers.

Change-Id: I626fd15c795e15af42df2d10d47fb4a703665d63

distrib/sets/lists/minix/md.evbarm

@@ -1,13 +1,20 @@
-./boot/minix/.temp/mod07_tty		minix-sys
-./boot/minix/.temp/mod08_mfs		minix-sys
-./boot/minix/.temp/mod09_vm		minix-sys
-./boot/minix/.temp/mod10_pfs		minix-sys
-./boot/minix/.temp/mod11_init		minix-sys
 ./etc/rc.capes				minix-sys
 ./etc/rc.capes/BB-BONE-WTHR-01		minix-sys
 ./etc/system.conf.d/lan8710a		minix-sys
 ./etc/system.conf.d/usbd		minix-sys
-./sbin/gpio				minix-sys
+./service/bmp085			minix-sys
+./service/cat24c256			minix-sys
+./service/fb				minix-sys
+./service/gpio				minix-sys
+./service/i2c				minix-sys
+./service/lan8710a			minix-sys
+./service/random			minix-sys
+./service/sht21				minix-sys
+./service/tda19988			minix-sys
+./service/tps65217			minix-sys
+./service/tps65950			minix-sys
+./service/tsl2550			minix-sys
+./service/usbd				minix-sys
 ./usr/bin/eepromread			minix-sys
 ./usr/include/arm			minix-sys
 ./usr/include/arm/aeabi.h		minix-sys
@@ -100,18 +107,6 @@
 ./usr/lib/libi2cdriver_pic.a		minix-sys
 ./usr/man/man1/eepromread.1		minix-sys
 ./usr/mdec				minix-sys
-./usr/sbin/bmp085			minix-sys
-./usr/sbin/cat24c256			minix-sys
-./usr/sbin/fb				minix-sys
-./usr/sbin/i2c				minix-sys
-./usr/sbin/lan8710a			minix-sys
-./usr/sbin/random			minix-sys
-./usr/sbin/sht21			minix-sys
-./usr/sbin/tda19988			minix-sys
-./usr/sbin/tps65217			minix-sys
-./usr/sbin/tps65950			minix-sys
-./usr/sbin/tsl2550			minix-sys
-./usr/sbin/usbd				minix-sys
 ./usr/share/beaglebone			minix-sys
 ./usr/share/beaglebone/weather		minix-sys
 ./usr/share/beaglebone/weather/index.html		minix-sys

distrib/sets/lists/minix/md.i386

@@ -1,8 +1,3 @@
-./boot/minix/.temp/mod07_tty		minix-sys
-./boot/minix/.temp/mod08_mfs		minix-sys
-./boot/minix/.temp/mod09_vm		minix-sys
-./boot/minix/.temp/mod10_pfs		minix-sys
-./boot/minix/.temp/mod11_init		minix-sys
 ./etc/system.conf.d/atl2		minix-sys
 ./etc/system.conf.d/dec21140A		minix-sys
 ./etc/system.conf.d/e1000		minix-sys
@@ -11,13 +6,36 @@
 ./etc/system.conf.d/rtl8139		minix-sys
 ./etc/system.conf.d/rtl8169		minix-sys
 ./etc/system.conf.d/virtio_net		minix-sys
-./sbin/ahci				minix-sys
+./service/acpi				minix-sys
-./sbin/at_wini				minix-sys
+./service/ahci				minix-sys
-./sbin/floppy				minix-sys
+./service/amddev			minix-sys
-./sbin/hgfs				minix-sys
+./service/atl2				minix-sys
-./sbin/pckbd				minix-sys
+./service/at_wini			minix-sys
-./sbin/vbfs				minix-sys
+./service/dec21140A			minix-sys
-./sbin/virtio_blk			minix-sys
+./service/dp8390			minix-sys
+./service/dpeth				minix-sys
+./service/e1000				minix-sys
+./service/es1370			minix-sys
+./service/es1371			minix-sys
+./service/fbd				minix-sys
+./service/filter			minix-sys
+./service/floppy			minix-sys
+./service/fxp				minix-sys
+./service/hgfs				minix-sys
+./service/lance				minix-sys
+./service/orinoco			minix-sys
+./service/pci				minix-sys
+./service/pckbd				minix-sys
+./service/printer			minix-sys
+./service/random			minix-sys
+./service/rtl8139			minix-sys
+./service/rtl8169			minix-sys
+./service/sb16				minix-sys
+./service/ti1225			minix-sys
+./service/vbfs				minix-sys
+./service/vbox				minix-sys
+./service/virtio_blk			minix-sys
+./service/virtio_net			minix-sys
 ./usr/include/gcc-4.5/abmintrin.h	minix-sys	gcccmds
 ./usr/include/gcc-4.5/ammintrin.h	minix-sys	gcccmds
 ./usr/include/gcc-4.5/avxintrin.h	minix-sys	gcccmds
@@ -158,29 +176,6 @@
 ./usr/mdec/mbr_com0			minix-sys
 ./usr/mdec/mbr_com0_9600		minix-sys
 ./usr/mdec/mbr_ext			minix-sys
-./usr/sbin/acpi				minix-sys
-./usr/sbin/amddev			minix-sys
-./usr/sbin/atl2				minix-sys
-./usr/sbin/dec21140A			minix-sys
-./usr/sbin/dp8390			minix-sys
-./usr/sbin/dpeth			minix-sys
-./usr/sbin/e1000			minix-sys
-./usr/sbin/es1370			minix-sys
-./usr/sbin/es1371			minix-sys
-./usr/sbin/fbd				minix-sys
-./usr/sbin/filter			minix-sys
-./usr/sbin/fxp				minix-sys
-./usr/sbin/lance			minix-sys
-./usr/sbin/orinoco			minix-sys
-./usr/sbin/pci				minix-sys
-./usr/sbin/printer			minix-sys
-./usr/sbin/random			minix-sys
-./usr/sbin/rtl8139			minix-sys
-./usr/sbin/rtl8169			minix-sys
-./usr/sbin/sb16				minix-sys
-./usr/sbin/ti1225			minix-sys
-./usr/sbin/vbox				minix-sys
-./usr/sbin/virtio_net			minix-sys
 ./usr/tests/minix-posix/test47		minix-sys
 ./usr/tests/minix-posix/test51		minix-sys
 ./usr/tests/minix-posix/test57		minix-sys

distrib/sets/lists/minix/mi

@@ -65,6 +65,11 @@
 ./boot/minix/.temp/mod04_sched		minix-sys
 ./boot/minix/.temp/mod05_vfs		minix-sys
 ./boot/minix/.temp/mod06_memory		minix-sys
+./boot/minix/.temp/mod07_tty		minix-sys
+./boot/minix/.temp/mod08_mfs		minix-sys
+./boot/minix/.temp/mod09_vm		minix-sys
+./boot/minix/.temp/mod10_pfs		minix-sys
+./boot/minix/.temp/mod11_init		minix-sys
 ./boot/minix_default			minix-sys
 ./dev					minix-sys
 ./etc					minix-sys
@@ -130,26 +135,46 @@
 ./root/.profile				minix-sys
 ./sbin					minix-sys
 ./sbin/chown				minix-sys
-./sbin/devman				minix-sys
-./sbin/ext2				minix-sys
 ./sbin/fsck				minix-sys
 ./sbin/fsck_ext2fs			minix-sys
 ./sbin/fsck_mfs				minix-sys
 ./sbin/halt				minix-sys
 ./sbin/init				minix-sys
-./sbin/input				minix-sys
-./sbin/is				minix-sys
-./sbin/isofs				minix-sys
-./sbin/mfs				minix-sys
 ./sbin/mkfs.mfs				minix-sys
 ./sbin/mknod				minix-sys
 ./sbin/newfs_ext2fs			minix-sys
 ./sbin/nologin				minix-sys
 ./sbin/poweroff				minix-sys
-./sbin/procfs				minix-sys
-./sbin/readclock.drv			minix-sys
 ./sbin/reboot				minix-sys
 ./sbin/shutdown				minix-sys
+./service				minix-sys
+./service/devman			minix-sys
+./service/ds				minix-sys
+./service/ext2				minix-sys
+./service/hello				minix-sys
+./service/inet				minix-sys
+./service/input				minix-sys
+./service/ipc				minix-sys
+./service/is				minix-sys
+./service/isofs				minix-sys
+./service/log				minix-sys
+./service/lwip				minix-sys
+./service/memory			minix-sys
+./service/mfs				minix-sys
+./service/mmc				minix-sys
+./service/pfs				minix-sys
+./service/pm				minix-sys
+./service/procfs			minix-sys
+./service/pty				minix-sys
+./service/readclock.drv			minix-sys
+./service/rs				minix-sys
+./service/sched				minix-sys
+./service/tty				minix-sys
+./service/uds				minix-sys
+./service/usb_storage			minix-sys
+./service/vfs				minix-sys
+./service/vm				minix-sys
+./service/vnd				minix-sys
 ./sys					minix-sys
 ./tmp					minix-sys
 ./usr					minix-sys
@@ -5114,49 +5139,30 @@
 ./usr/sbin				minix-sys
 ./usr/sbin/chown			minix-sys
 ./usr/sbin/chroot			minix-sys
-./usr/sbin/ds				minix-sys
 ./usr/sbin/group			minix-sys
 ./usr/sbin/groupadd			minix-sys
 ./usr/sbin/groupdel			minix-sys
 ./usr/sbin/groupinfo			minix-sys
 ./usr/sbin/groupmod			minix-sys
-./usr/sbin/hello			minix-sys
 ./usr/sbin/i2cscan			minix-sys
-./usr/sbin/inet				minix-sys
 ./usr/sbin/installboot_nbsd		minix-sys
-./usr/sbin/ipc				minix-sys
 ./usr/sbin/kernel			minix-sys
 ./usr/sbin/link				minix-sys
-./usr/sbin/log				minix-sys
-./usr/sbin/lwip				minix-sys
-./usr/sbin/memory			minix-sys
 ./usr/sbin/mkfs.mfsv3			minix-sys
 ./usr/sbin/mkproto			minix-sys
-./usr/sbin/mmc				minix-sys
 ./usr/sbin/mtree			minix-sys
 ./usr/sbin/newfs_mfs			minix-sys
-./usr/sbin/pfs				minix-sys
-./usr/sbin/pm				minix-sys
 ./usr/sbin/postinstall			minix-sys
-./usr/sbin/pty				minix-sys
 ./usr/sbin/pwd_mkdb			minix-sys
 ./usr/sbin/rdate			minix-sys
-./usr/sbin/rs				minix-sys
-./usr/sbin/sched			minix-sys
-./usr/sbin/tty				minix-sys
-./usr/sbin/uds				minix-sys
 ./usr/sbin/unlink			minix-sys
-./usr/sbin/usb_storage			minix-sys
 ./usr/sbin/user				minix-sys
 ./usr/sbin/useradd			minix-sys
 ./usr/sbin/userdel			minix-sys
 ./usr/sbin/userinfo			minix-sys
 ./usr/sbin/usermod			minix-sys
-./usr/sbin/vfs				minix-sys
 ./usr/sbin/vipw				minix-sys
-./usr/sbin/vm				minix-sys
 ./usr/sbin/vnconfig			minix-sys
-./usr/sbin/vnd				minix-sys
 ./usr/sbin/vndconfig			minix-sys
 ./usr/sbin/zic				minix-sys
 ./usr/share				minix-sys

etc/defaults/minix.rc.conf

@@ -1,8 +1,8 @@
 # Minix-specific rc.conf default values
 
 # Where to find servers/drivers binaries
-PKG_SERVICE_DIR=/usr/pkg/minixservices
+PKG_SERVICE_DIR=/usr/pkg/service
-SERVICES_DIRS="/usr/sbin $PKG_SERVICE_DIR"
+SERVICES_DIRS="/service $PKG_SERVICE_DIR"
 
 # Where to find system.conf files and system.conf.d directories
 # for servers/drivers

etc/mtree/NetBSD.dist.base

@@ -29,6 +29,7 @@
 ./proc
 ./root
 ./sbin
+./service
 ./sys
 ./usr
 ./usr/adm

etc/rc

@@ -38,7 +38,7 @@ up()
     service=$1
     shift
 
-    service $opt up /sbin/$service "$@"
+    service $opt up /service/$service "$@"
 }
 
 edit()
@@ -54,10 +54,10 @@ edit()
     service=$1
     shift
 
-    # Assume binaries are always in /sbin or /usr/sbin
+    # Assume binaries are always in /service or /usr/pkg/service
-    binlocation=/usr/sbin/$service
+    binlocation=/service/$service
     if [ ! -x $binlocation ]
-    then	binlocation=/sbin/$service
+    then	binlocation=/usr/pkg/service/$service
     fi
     service $opt edit $binlocation -label $service "$@" 
 }
@@ -200,7 +200,7 @@ down|stop)
 	/usr/pkg/etc/rc.d/usbd stop
     fi
 
-    if [ -x /usr/sbin/usbd ]
+    if [ -x /service/usbd ]
     then
 	service down usbd
     fi

etc/rc.capes/BB-BONE-WTHR-01

@@ -4,17 +4,17 @@
 
 # TSL2550 Ambient Light Sensor
 test -e /dev/tsl2550b3s39 || (cd /dev && MAKEDEV tsl2550b3s39)
-/bin/service up /usr/sbin/tsl2550 -dev /dev/tsl2550b3s39 \
+/bin/service up /service/tsl2550 -dev /dev/tsl2550b3s39 \
 	-label tsl2550.3.39 -args 'bus=3 address=0x39' && echo -n " tsl2550"
 
 # SHT21 Temperature and Humidity Sensor
 test -e /dev/sht21b3s40 || (cd /dev && MAKEDEV sht21b3s40)
-/bin/service up /usr/sbin/sht21 -dev /dev/sht21b3s40 \
+/bin/service up /service/sht21 -dev /dev/sht21b3s40 \
 	-label sht21.3.40 -args 'bus=3 address=0x40' && echo -n " sht21"
 
 # BMP085 Temperature and Pressure Sensor
 test -e /dev/bmp085b3s77 || (cd /dev && MAKEDEV bmp085b3s77)
-/bin/service up /usr/sbin/bmp085 -dev /dev/bmp085b3s77 \
+/bin/service up /service/bmp085 -dev /dev/bmp085b3s77 \
 	-label bmp085.3.77 -args 'bus=3 address=0x77' && echo -n " bmp085"
 
 daemonize tcpd http /usr/share/beaglebone/weather/weatherstation.lua

etc/rs.inet

@@ -6,8 +6,7 @@
 kill_by_name()
 {
 	label="$1"
-	pid=`ps ax | grep "$label" | grep -v grep |
+	pid=`ps ax | grep "$label" | grep -v grep | sed 's,[ 	]*\([0-9]*\).*,\1,'`
-		sed 's,[ 	]*\([0-9]*\).*,\1,`
 	if [ X"$pid" = X ]
 	then
 		return 1	# No such process
@@ -65,10 +64,10 @@ kill_by_name syslogd
 sleep 3
 if [ X`/bin/sysenv lwip` = Xyes ]
 then
-	service up /usr/sbin/lwip -script /etc/rs.inet -dev /dev/ip
+	service up /service/lwip -script /etc/rs.inet -dev /dev/ip
 	dhcpd --lwip &
 else
-	service up /usr/sbin/inet -script /etc/rs.inet -dev /dev/ip
+	service up /service/inet -script /etc/rs.inet -dev /dev/ip
 	daemonize dhcpd
 fi
 daemonize nonamed -L

minix/commands/swifi/run_swifi

@@ -2,7 +2,7 @@
 
 LABEL=e1000_0
 NAME=e1000
-EXEDIR=/usr/src/drivers/$NAME
+EXEDIR=/service
 EXE=$EXEDIR/$NAME
 
 :>log
@@ -19,7 +19,7 @@ do_one()
 	while [ X"$pid" = X ]
 	do
 		pid=`ps ax | grep $NAME | grep -v grep |
-			sed 's,^[ 	]*,,;s,[ 	].*,,`
+			sed 's,^[ 	]*,,;s,[ 	].*,,'`
 		if [ X"$pid" != X ]
 		then
 			break

minix/commands/swifi/run_t1

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 LABEL=es1371
-EXEDIR=/usr/build/drivers/es1371
+EXEDIR=/service/es1371
 #LABEL=fxp
 #EXEDIR=/usr/build/drivers/fxp
 EXE=$EXEDIR/$LABEL
@@ -18,7 +18,7 @@ do_one()
 		ps ax | grep $LABEL | grep -v grep
 		pid=`ps ax | grep $LABEL | grep -v grep |
 			sort -n | tail -1 |
-			sed 's,^[ 	]*,,;s,[ 	].*,,`
+			sed 's,^[ 	]*,,;s,[ 	].*,,'`
 		if [ X"$pid" != X ]
 		then
 			break

minix/commands/swifi/run_t2

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 LABEL=dp8390
-EXEDIR=/usr/build/drivers/dp8390
+EXEDIR=/service/dp8390
 EXE=$EXEDIR/$LABEL
 DAYTIME_HOST=jetsam.cs.vu.nl
 FAULTS_PER_BLOCK=1
@@ -19,7 +19,7 @@ do_one()
 	while [ X"$pid" = X ]
 	do
 		pid=`ps ax | grep $LABEL | grep -v grep |
-			sed 's,^[ 	]*,,;s,[ 	].*,,`
+			sed 's,^[ 	]*,,;s,[ 	].*,,'`
 		if [ X"$pid" != X ]
 		then
 			break

minix/drivers/Makefile.inc

@@ -1,4 +1,4 @@
-BINDIR?=/usr/sbin
+BINDIR?= /service
 MAN?=
 
 LDADD+= -lminlib -lcompat_minix

minix/drivers/audio/Makefile.inc

@@ -1,4 +1,4 @@
-BINDIR?=/usr/sbin
+BINDIR?= /service
 MAN?=
 
 DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBMINLIB}

minix/drivers/audio/README

@@ -9,4 +9,4 @@ Needs updating:
 sb16/              SB16 ISA driver
 
 Running the drivers:
-* service up /usr/sbin/es137{0,1} -dev /dev/audio
+* service up /service/es137{0,1} -dev /dev/audio

minix/drivers/audio/sb16/README

@@ -11,8 +11,8 @@ Installation instructions SB16 driver Minix >= 3.0.7
 (default 7 and 220)
 - make install
 - MAKEDEV /dev/audio (if /dev/audio doesn't allready exist)
-- service up /usr/sbin/sb16_dsp -dev /dev/audio
+- service up /service/sb16_dsp -dev /dev/audio
-- service up /usr/sbin/sb16_mixer -dev /dev/mixer
+- service up /service/sb16_mixer -dev /dev/mixer
 done... (you can include the last 2 lines in /usr/etc/rc)
 
 

minix/drivers/bus/i2c/README.txt

@@ -33,9 +33,9 @@ cd /dev && MAKEDEV i2c-1 && MAKEDEV i2c-2 && MAKEDEV i2c-3
 
 Starting up the instances:
 
-/bin/service up /usr/sbin/i2c -dev /dev/i2c-1 -label i2c.1 -args instance=1
+/bin/service up /service/i2c -dev /dev/i2c-1 -label i2c.1 -args instance=1
-/bin/service up /usr/sbin/i2c -dev /dev/i2c-2 -label i2c.2 -args instance=2
+/bin/service up /service/i2c -dev /dev/i2c-2 -label i2c.2 -args instance=2
-/bin/service up /usr/sbin/i2c -dev /dev/i2c-3 -label i2c.3 -args instance=3
+/bin/service up /service/i2c -dev /dev/i2c-3 -label i2c.3 -args instance=3
 
 There is an i2cscan program from NetBSD which can detect devices on the bus:
 

minix/drivers/clock/Makefile.inc

@@ -1 +1,3 @@
+BINDIR?= /service
+
 .include "../Makefile.inc"

minix/drivers/clock/readclock/Makefile

@@ -1,17 +1,12 @@
 # Makefile for readclock 'driver'
 PROG=	readclock.drv
+SRCS+=	readclock.c forward.c forward.h
 
 .include "arch/${MACHINE_ARCH}/Makefile.inc"
 
-SRCS+=	readclock.c forward.c forward.h
-
 DPADD+= ${LIBSYS} ${LIBTIMERS}
 LDADD+= -lsys -ltimers
 
-MAN=
-
-BINDIR?= /sbin
-
 CPPFLAGS+= -D_SYSTEM=1 -I${.CURDIR}
 
 .include <minix.service.mk>

minix/drivers/eeprom/cat24c256/README.txt

@@ -12,5 +12,5 @@ Testing the Code
 
 Starting up an instance:
 
-/bin/service up /usr/sbin/cat24c256 -dev /dev/eepromb1s50 -label cat24c256.1.50 -args 'bus=1 address=0x50'
+/bin/service up /service/cat24c256 -dev /dev/eepromb1s50 -label cat24c256.1.50 -args 'bus=1 address=0x50'
 

minix/drivers/hid/pckbd/Makefile

@@ -5,8 +5,4 @@ SRCS=	pckbd.c table.c
 DPADD+=	${LIBINPUTDRIVER} ${LIBSYS} ${LIBTIMERS}
 LDADD+=	-linputdriver -lsys -ltimers
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/drivers/power/tps65950/README.txt

@@ -28,7 +28,7 @@ Testing the Code
 
 Starting up an instance:
 
-/bin/service up /usr/sbin/tps65950 -label tps65950.1.48 \
+/bin/service up /service/tps65950 -label tps65950.1.48 \
 	-args 'bus=1 address=0x48'
 
 Killing an instance:

minix/drivers/sensors/bmp085/README.txt

@@ -50,7 +50,7 @@ The driver should have been started by a script in /etc/rc.capes/ If not,
 this is how you start up an instance:
 
 cd /dev && MAKEDEV bmp085b3s77
-/bin/service up /usr/sbin/bmp085 -label bmp085.3.77 -dev /dev/bmp085b3s77 \
+/bin/service up /service/bmp085 -label bmp085.3.77 -dev /dev/bmp085b3s77 \
 	-args 'bus=3 address=0x77'
 
 Getting the sensor value:

minix/drivers/sensors/sht21/README.txt

@@ -54,7 +54,7 @@ The driver should have been started by a script in /etc/rc.capes/ If not,
 this is how you start up an instance:
 
 cd /dev && MAKEDEV sht21b3s40
-/bin/service up /usr/sbin/sht21 -label sht21.3.40 -dev /dev/sht21b3s40 \
+/bin/service up /service/sht21 -label sht21.3.40 -dev /dev/sht21b3s40 \
 	-args 'bus=3 address=0x40'
 
 Getting the sensor value:

minix/drivers/sensors/tsl2550/README.txt

@@ -33,7 +33,7 @@ The driver should have been started by a script in /etc/rc.capes/ If not,
 this is how you start up an instance:
 
 cd /dev && MAKEDEV tsl2550b3s39
-/bin/service up /usr/sbin/tsl2550 -label tsl2550.3.39 -dev /dev/tsl2550b3s39 \
+/bin/service up /service/tsl2550 -label tsl2550.3.39 -dev /dev/tsl2550b3s39 \
 	-args 'bus=3 address=0x39'
 
 Getting the sensor value:

minix/drivers/storage/ahci/Makefile

@@ -5,8 +5,4 @@ SRCS=	ahci.c
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBMTHREAD}
 LDADD+=	-lblockdriver -lsys -ltimers -lmthread
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/drivers/storage/at_wini/Makefile

@@ -5,8 +5,4 @@ SRCS=	at_wini.c liveupdate.c
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS}
 LDADD+=	-lblockdriver -lsys -ltimers
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/drivers/storage/floppy/Makefile

@@ -5,8 +5,4 @@ SRCS=	floppy.c liveupdate.c
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS}
 LDADD+=	-lblockdriver -lsys -ltimers
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/drivers/storage/mmc/mmcblk.c

@@ -97,7 +97,7 @@ apply_env()
 	 * log_level=[0-4] (NONE,WARN,INFO,DEBUG,TRACE) instance=[0-3]
 	 * instance/bus number to use for this driver Passing these arguments
 	 * is done when starting the driver using the service command in the
-	 * following way service up /sbin/mmc -args "log_level=2 instance=1
+	 * following way service up /service/mmc -args "log_level=2 instance=1
 	 * driver=dummy" -dev /dev/c2d0 */
 	char driver[16];
 	memset(driver, '\0', 16);

minix/drivers/storage/ramdisk/proto

@@ -15,7 +15,7 @@ d--755 0 0
 		sh ---755 0 0 sh
 		service ---755 0 0 service
 	$
-	sbin d--755 0 0
+	service d--755 0 0
 #ifdef __i386__
 		floppy ---755 0 0 floppy
 		ahci ---755 0 0 ahci
@@ -32,19 +32,17 @@ d--755 0 0
 		mfs ---755 0 0 mfs
 		procfs ---755 0 0 procfs
 		input ---755 0 0 input
+#ifdef __i386__
+#if RAMDISK_INC_ACPI == 1
+		acpi ---755 0 0 acpi
+#endif
+		pci ---755 0 0 pci
+#endif
 	$
 	usr d--755 0 0
 		bin d--755 0 0
 			loadramdisk ---755 0 0 loadramdisk
 		$
-		sbin d--755 0 0
-#ifdef __i386__
-#if RAMDISK_INC_ACPI == 1
-			acpi ---755 0 0 acpi
-#endif
-			pci ---755 0 0 pci
-#endif
-		$
 	$
 	proc d--755 0 0
 	$

minix/drivers/storage/ramdisk/rc

@@ -6,17 +6,17 @@ exec 2>/dev/log
 exec </dev/null
 
 FSCK=/bin/fsck_mfs
-ACPI=/usr/sbin/acpi
+ACPI=/service/acpi
 
 if [ X`/bin/sysenv arch` = Xi386 ]
 then	if [ -e $ACPI -a -n "`sysenv acpi`" ]
 	then
 		/bin/service -c up $ACPI
 	fi
-	/bin/service -c up /usr/sbin/pci
+	/bin/service -c up /service/pci
 
-	/bin/service -c up /sbin/input -dev /dev/kbdmux
+	/bin/service -c up /service/input -dev /dev/kbdmux
-	/bin/service -c up /sbin/pckbd
+	/bin/service -c up /service/pckbd
 
 	# Start procfs so we can access /proc/pci
 	mount -t procfs none /proc >/dev/null
@@ -30,27 +30,27 @@ then	if [ -e $ACPI -a -n "`sysenv acpi`" ]
 		virtio_blk=yes
         fi
 
-	/bin/service -cn up /sbin/floppy -dev /dev/fd0
+	/bin/service -cn up /service/floppy -dev /dev/fd0
 	if [ X`/bin/sysenv ahci` = Xyes ]
 	then
 		# this is here temporarily, for testing purposes
-		/bin/service -c up /sbin/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0
+		/bin/service -c up /service/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0
 	elif [ X"$virtio_blk" = Xyes ]
 	then
-		/bin/service -c up /sbin/virtio_blk -dev /dev/c0d0 -label virtio_blk_0 -args instance=0
+		/bin/service -c up /service/virtio_blk -dev /dev/c0d0 -label virtio_blk_0 -args instance=0
 	else
-		/bin/service -c up /sbin/at_wini -dev /dev/c0d0 -label at_wini_0
+		/bin/service -c up /service/at_wini -dev /dev/c0d0 -label at_wini_0
-		/bin/service -cr up /sbin/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1 2>/dev/null || :
+		/bin/service -cr up /service/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1 2>/dev/null || :
 	fi
 	/bin/umount /proc >/dev/null
 fi
 
 if [ X`/bin/sysenv arch` = Xearm ]
 then	echo Starting the mmc driver
-	/bin/service -c up /sbin/mmc -dev /dev/c0d0
+	/bin/service -c up /service/mmc -dev /dev/c0d0
 fi
 
-/bin/service up /sbin/procfs || echo "WARNING: couldn't start procfs"
+/bin/service up /service/procfs || echo "WARNING: couldn't start procfs"
 
 if /bin/sysenv rootdevname >/dev/null
 then	rootdevname=/dev/`/bin/sysenv rootdevname`

minix/drivers/storage/virtio_blk/Makefile

@@ -5,8 +5,4 @@ SRCS=	virtio_blk.c
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS} ${LIBMTHREAD} ${LIBVIRTIO}
 LDADD+=	-lblockdriver -lsys -lmthread -lvirtio
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/drivers/system/gpio/Makefile

@@ -5,12 +5,7 @@ SRCS=	gpio.c
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS} ${LIBGPIO} ${LIBCLKCONF}
 LDADD+=	-lvtreefs -lsys -lgpio -lclkconf
 
-#
 # This is a system driver.
 CPPFLAGS+= -D_SYSTEM=1
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/drivers/usb/usbd/base/earm/Makefile

@@ -3,7 +3,7 @@
 PROG=		usbd
 SRCS=		usbd.c usbd_earm.c hcd.c hcd_common.c hcd_ddekit.c musb_am335x.c musb_core.c
 MAN=
-BINDIR=		/usr/sbin
+BINDIR=		/service
 
 .PATH:		${.CURDIR}/../ ${.CURDIR}/../../hcd ${.CURDIR}/../../hcd/musb
 

minix/drivers/video/fb/README.txt

@@ -12,7 +12,7 @@ Testing the Code
 
 Starting up an instance:
 
-service up /usr/sbin/fb -dev /dev/fb0 -args edid.0=cat24c256.3.50
+service up /service/fb -dev /dev/fb0 -args edid.0=cat24c256.3.50
 
 The arguments take the following form:
 

minix/drivers/video/tda19988/README.txt

@@ -52,7 +52,7 @@ Testing the Code
 
 Starting up an instance:
 
-/bin/service up /usr/sbin/tda19988 -label tda19988.1.3470 \
+/bin/service up /service/tda19988 -label tda19988.1.3470 \
 	-args 'cec_bus=1 cec_address=0x34 hdmi_bus=1 hdmi_address=0x70'
 
 Killing an instance:
@@ -67,7 +67,7 @@ device file to read the EDID like this:
 cd /dev
 mknod tda19988 b 32 0
 chmod 600 tda19988
-/bin/service up /usr/sbin/tda19988 -label tda19988.1.3470 \
+/bin/service up /service/tda19988 -label tda19988.1.3470 \
 	-dev /dev/tda19988 \
 	-args 'cec_bus=1 cec_address=0x34 hdmi_bus=1 hdmi_address=0x70'
 dd if=/dev/tda19988 of=/root/edid.dat count=1 bs=128

minix/fs/Makefile.inc

@@ -1,4 +1,4 @@
-BINDIR?=/usr/sbin
+BINDIR?= /service
 MAN?=
 
 LDADD+= -lminlib -lcompat_minix

minix/fs/ext2/Makefile

@@ -10,9 +10,4 @@ LDADD+= -lminixfs -lbdev -lsys -lminlib
 
 WARNS=3
 
-MAN=
-
-BINDIR?= /sbin
-CFLAGS+= -Wall -Wextra
-
 .include <minix.service.mk>

minix/fs/hgfs/Makefile

@@ -5,8 +5,4 @@ SRCS=	hgfs.c
 DPADD+=	${LIBSFFS} ${LIBHGFS} ${LIBSYS}
 LDADD+=	-lsffs -lhgfs -lsys
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/fs/iso9660fs/Makefile

@@ -6,11 +6,6 @@ SRCS=	main.c table.c mount.c super.c inode.c \
 DPADD+=	${LIBBDEV} ${LIBSYS} ${LIBMINLIB}
 LDADD+=	-lbdev -lsys -lc -lminixfs -lminlib
 
-MAN=
+CPPFLAGS+= -DNR_BUFS=100
-
-BINDIR?= /sbin
-
-NR_BUFS= 100
-CPPFLAGS+= -DNR_BUFS=${NR_BUFS}
 
 .include <minix.service.mk>

minix/fs/mfs/Makefile

@@ -8,11 +8,6 @@ SRCS=	cache.c link.c \
 DPADD+=	${LIBMINIXFS} ${LIBBDEV} ${LIBSYS}
 LDADD+= -lminixfs -lbdev -lsys
 
-MAN=
+CPPFLAGS+= -DDEFAULT_NR_BUFS=1024
-
-BINDIR?= /sbin
-
-DEFAULT_NR_BUFS= 1024
-CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}
 
 .include <minix.service.mk>

minix/fs/pfs/Makefile

@@ -8,8 +8,4 @@ LDADD+=	-lchardriver -lsys
 
 LDADD+= -lc
 
-MAN=
-
-BINDIR?= /usr/sbin
-
 .include <minix.service.mk>

minix/fs/procfs/Makefile

@@ -1,6 +1,4 @@
 # Makefile for ProcFS server
-#
-
 .include <bsd.own.mk>
 
 PROG=	procfs
@@ -13,8 +11,4 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/minix/servers
 DPADD+=	${LIBVTREEFS} ${LIBMINLIB}
 LDADD+=	-lvtreefs -lminlib
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/fs/vbfs/Makefile

@@ -5,8 +5,4 @@ SRCS=	vbfs.c
 DPADD+=	${LIBSFFS} ${LIBVBOXFS} ${LIBSYS}
 LDADD+=	-lsffs -lvboxfs -lsys
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>

minix/include/minix/paths.h

@@ -15,7 +15,7 @@
 
 #define _PATH_RAMDISK	"/dev/ram"
 
-#define _PATH_DRIVERS	"/usr/sbin"
+#define _PATH_DRIVERS	"/service"
 
 #define	_PATH_SERVACCES	"/etc/serv.access"
 

minix/lib/libc/sys/mount.c

@@ -15,7 +15,7 @@
 
 #define FSDEFAULT "mfs"
 
-static char fspath[] = "/sbin/:/usr/pkg/bin/"; /* Must include trailing '/' */
+static char fspath[] = "/service/:/usr/pkg/service/"; /* Must include trailing '/' */
 
 static int rs_down(char *label)
 {

minix/net/Makefile.inc

@@ -1,4 +1,4 @@
-BINDIR?=/usr/sbin
+BINDIR?= /service
 MAN?=
 
 LDADD+= -lminlib -lcompat_minix

minix/servers/Makefile.inc

@@ -1,4 +1,5 @@
-BINDIR?=/usr/sbin
+BINDIR?= /service
+MAN?=
 
 LDADD+= -lminlib -lcompat_minix
 DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}

minix/servers/devman/Makefile

@@ -1,11 +1,7 @@
 PROG =	devman
-
 SRCS =  main.c device.c buf.c bind.c
 
-
 DPADD+=	${LIBSYS} ${LIBMINLIB}
 LDADD =  -lvtreefs -lsys -lminlib
-BINDIR?= /sbin
 
-MAN=
 .include <minix.service.mk>

minix/servers/ds/Makefile

@@ -5,8 +5,4 @@ SRCS=	main.c store.c
 DPADD+=	${LIBSYS}
 LDADD+=	-lsys
 
-MAN=
-
-BINDIR?= /usr/sbin
-
 .include <minix.service.mk>

minix/servers/input/Makefile

@@ -6,9 +6,5 @@ SRCS=	input.c
 DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
 LDADD+=	-lchardriver -lsys
 
-MAN=
-
-BINDIR?= /sbin
-
 .include <minix.service.mk>
 

minix/servers/ipc/Makefile

@@ -5,9 +5,6 @@ SRCS=	main.c utility.c shm.c sem.c
 DPADD+=	${LIBSYS}
 LDADD+=	-lsys
 
-MAN=
-
-BINDIR?= /usr/sbin
 FILES=ipc.conf
 FILESNAME=ipc
 FILESDIR= /etc/system.conf.d

minix/servers/is/Makefile

@@ -1,6 +1,4 @@
 # Makefile for Information Server (IS)
-#
-
 .include <bsd.own.mk>
 
 PROG=	is
@@ -9,10 +7,6 @@ SRCS=	main.c dmp.c dmp_kernel.c dmp_pm.c dmp_fs.c dmp_rs.c dmp_ds.c dmp_vm.c
 DPADD+=	${LIBSYS}
 LDADD+=	-lsys
 
-MAN=
-
-BINDIR?= /sbin
-
 CPPFLAGS.dmp_fs.c+=	-I${NETBSDSRCDIR}/minix/servers \
    			-I${NETBSDSRCDIR}/minix/fs
 CPPFLAGS.dmp_kernel.c+=	-I${NETBSDSRCDIR}/minix

minix/servers/pm/Makefile

@@ -9,10 +9,6 @@ SRCS=	main.c forkexit.c exec.c time.c alarm.c \
 DPADD+=	${LIBSYS} ${LIBTIMERS}
 LDADD+=	-lsys -ltimers
 
-MAN=
-
-BINDIR?= /usr/sbin
-
 CPPFLAGS.main.c+=	-I${NETBSDSRCDIR}/minix
 CPPFLAGS.misc.c+=	-I${NETBSDSRCDIR}/minix
 CPPFLAGS.schedule.c+=	-I${NETBSDSRCDIR}/minix

minix/servers/rs/Makefile

@@ -11,10 +11,6 @@ CPPFLAGS+= -DUSE_PCI
 DPADD+=	${LIBSYS} ${LIBEXEC}
 LDADD+=	-lsys -lexec
 
-MAN=
-
-BINDIR?= /usr/sbin
-
 CPPFLAGS+=	-I${NETBSDSRCDIR}/minix
 
 .include <minix.service.mk>

minix/servers/sched/Makefile

@@ -5,10 +5,6 @@ SRCS=	main.c schedule.c utility.c
 DPADD+=	${LIBSYS} ${LIBTIMERS}
 LDADD+=	-lsys -ltimers
 
-MAN=
-
-BINDIR?= /usr/sbin
-
 CPPFLAGS.main.c+=	-I${NETBSDSRCDIR}/minix
 CPPFLAGS.schedule.c+=	-I${NETBSDSRCDIR}/minix
 CPPFLAGS.utility.c+=	-I${NETBSDSRCDIR}/minix

minix/servers/vfs/Makefile

@@ -18,8 +18,4 @@ CFLAGS+= -Wall -Wextra -Wno-sign-compare -Werror
 DPADD+=	${LIBSYS} ${LIBTIMERS} ${LIBEXEC}
 LDADD+=	-lsys -ltimers -lexec -lmthread
 
-MAN=
-
-BINDIR?= /usr/sbin
-
 .include <minix.service.mk>

minix/servers/vm/Makefile

@@ -15,12 +15,6 @@ LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/vm.lds
 DPADD+=	${LIBSYS} ${LIBEXEC}
 LDADD+=	-lsys -lexec
 
-WARNS=5
-
-MAN=
-
-BINDIR?= /usr/sbin
-
 CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 CPPFLAGS+= -I${NETBSDSRCDIR}/minix
 

minix/tests/fbdtest/test.sh

@@ -82,7 +82,7 @@ read_test() {
   EXP=$2
   shift 2
   $RWBLOCKS $DEV $PAT
-  service up /usr/sbin/fbd -dev /dev/fbd -args "$PAIR" || exit 1
+  service up /service/fbd -dev /dev/fbd -args "$PAIR" || exit 1
   fbdctl add $@ >/dev/null
   #fbdctl list
   RES="`$RWBLOCKS /dev/fbd`"
@@ -115,7 +115,7 @@ write_test() {
   WS=$3
   shift 3
   $RWBLOCKS $DEV UUUUUUUUUUUUUUUU
-  service up /usr/sbin/fbd -dev /dev/fbd -args "$PAIR" || exit 1
+  service up /service/fbd -dev /dev/fbd -args "$PAIR" || exit 1
   fbdctl add $@ >/dev/null
   #fbdctl list
   $RWBLOCKS /dev/fbd $PAT $WS