summary refs log tree commit diff
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2002-08-28 18:55:45 +0000
committerGerrit Pape <pape@smarden.org>2002-08-28 18:55:45 +0000
commit98b12e0815f296fec5ea15a8c4354d2a066013e4 (patch)
tree8c162f126885609bbe20e66261e65f68db6804f2
parentcf62ba0128a8c40914556fda22167099f1c94705 (diff)
downloadrunit-98b12e0815f296fec5ea15a8c4354d2a066013e4.tar.gz
runit-98b12e0815f296fec5ea15a8c4354d2a066013e4.tar.xz
runit-98b12e0815f296fec5ea15a8c4354d2a066013e4.zip
utmpset in /command. registration requested.
-rwxr-xr-xdebian/rules6
-rwxr-xr-xetc/debian/getty-tty5/run2
-rwxr-xr-xetc/debian/getty-tty5/run.utmpset3
-rwxr-xr-xetc/freebsd/getty-ttyv4/run2
-rwxr-xr-xetc/openbsd/getty-ttyC4/run2
-rw-r--r--man/utmpset.82
-rw-r--r--package/commands1
-rwxr-xr-xpackage/compile2
8 files changed, 7 insertions, 13 deletions
diff --git a/debian/rules b/debian/rules
index 71ff272..a023d3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,13 +29,9 @@ build-stamp:
 	echo 'diet gcc -O2 -Wall' > src/conf-cc ; \
 	echo 'diet gcc -s -Os -pipe' > src/conf-ld ; \
 	package/compile ; \
-	echo 'gcc -O2 -Wall' > src/conf-cc ; \
-	echo 'gcc -s' > src/conf-ld ; \
-	( cd compile ; make utmpset ) ; \
 	echo "/package/admin/runit-0.5.0" > compile/home ; \
 	rm -f compile/src ; \
 	ln -s /package/admin/runit-0.5.0/src compile/src ; \
-	install -m0755 compile/utmpset command/utmpset ; \
 	)
 	touch build-stamp
 
@@ -76,7 +72,7 @@ install: build
 		debian/runit/etc/runit/
 	cp -p admin/runit-0.5.0/etc/debian/ctrlaltdel \
 		debian/runit/etc/runit/
-	cp -p admin/runit-0.5.0/etc/debian/getty-tty5/run.utmpset \
+	cp -p admin/runit-0.5.0/etc/debian/getty-tty5/run \
 		debian/runit/etc/runit/getty-5/run
 
 	# runit programs
diff --git a/etc/debian/getty-tty5/run b/etc/debian/getty-tty5/run
index db2e558..4abe2d3 100755
--- a/etc/debian/getty-tty5/run
+++ b/etc/debian/getty-tty5/run
@@ -1,3 +1,3 @@
 #!/bin/sh
-/package/admin/runit/command/utmpset -w tty5
+/command/utmpset -w tty5
 exec /sbin/getty 38400 tty5 linux
diff --git a/etc/debian/getty-tty5/run.utmpset b/etc/debian/getty-tty5/run.utmpset
deleted file mode 100755
index db2e558..0000000
--- a/etc/debian/getty-tty5/run.utmpset
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/package/admin/runit/command/utmpset -w tty5
-exec /sbin/getty 38400 tty5 linux
diff --git a/etc/freebsd/getty-ttyv4/run b/etc/freebsd/getty-ttyv4/run
index 6df5b17..c82bf33 100755
--- a/etc/freebsd/getty-ttyv4/run
+++ b/etc/freebsd/getty-ttyv4/run
@@ -1,3 +1,3 @@
 #!/bin/sh
-/package/admin/runit/command/utmpset -w ttyv4
+/command/utmpset -w ttyv4
 exec /usr/libexec/getty Pc ttyv4
diff --git a/etc/openbsd/getty-ttyC4/run b/etc/openbsd/getty-ttyC4/run
index 66f4677..6acb0b3 100755
--- a/etc/openbsd/getty-ttyC4/run
+++ b/etc/openbsd/getty-ttyC4/run
@@ -1,3 +1,3 @@
 #!/bin/sh
-/package/admin/runit/command/utmpset -w ttyC4
+/command/utmpset -w ttyC4
 exec /usr/libexec/getty Pc ttyC4
diff --git a/man/utmpset.8 b/man/utmpset.8
index e63981b..4cd424e 100644
--- a/man/utmpset.8
+++ b/man/utmpset.8
@@ -33,7 +33,7 @@ to the
 run scripts, e.g.:
 .P
  #!/bin/sh
- /package/admin/runit/command/utmpset -w tty5
+ /command/utmpset -w tty5
  exec /sbin/getty 38400 tty5 linux
 .SH OPTIONS
 .TP
diff --git a/package/commands b/package/commands
index 621f31c..cc7e351 100644
--- a/package/commands
+++ b/package/commands
@@ -2,3 +2,4 @@ runit
 runit-init
 svwaitdown
 svwaitup
+utmpset
diff --git a/package/compile b/package/compile
index c95b46e..2169ab9 100755
--- a/package/compile
+++ b/package/compile
@@ -20,7 +20,7 @@ echo 'Compiling everything in ./compile...'
 ( cd compile; exec make )
 
 echo 'Copying commands into ./command...'
-for i in `cat package/commands` utmpset
+for i in `cat package/commands`
 do
   rm -f command/$i'{new}'
   cp -p compile/$i command/$i'{new}'