diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | rc.torus | 33 |
2 files changed, 5 insertions, 47 deletions
diff --git a/Makefile b/Makefile index 0f940ed..4b73389 100644 --- a/Makefile +++ b/Makefile @@ -30,26 +30,17 @@ chroot.tar: client image server default8x16.psfu root \ root/bin \ root/home \ - root/usr/share/misc \ - root/usr/share/torus \ - root/var/run + root/usr/share/torus install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/home/${CHROOT_USER} - install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/var/run/torus cp -af /usr/share/locale root/usr/share - if test -e /usr/share/terminfo; then \ - cp -af /usr/share/terminfo root/usr/share; fi - if test -e /usr/share/misc/termcap.db; then \ - cp -fp /usr/share/misc/termcap.db root/usr/share/misc; fi - if test -e /rescue/sh; then \ - cp -fp /rescue/sh root/bin; else cp -fp /bin/sh root/bin; fi + cp -af /usr/share/terminfo root/usr/share + cp -fp /bin/sh root/bin install client image server root/bin install -m 644 default8x16.psfu root/usr/share/torus - tar -c -f chroot.tar -C root bin home usr var + tar -c -f chroot.tar -C root bin home usr -install: chroot.tar rc.torus explore.html index.html +install: chroot.tar explore.html index.html tar -px -f chroot.tar -C /home/${CHROOT_USER} - if test -d /usr/local/etc/rc.d; then \ - install rc.torus /usr/local/etc/rc.d/torus; fi install -o ${CHROOT_USER} -g ${CHROOT_GROUP} -m 644 \ explore.html index.html ${WEBROOT} diff --git a/rc.torus b/rc.torus deleted file mode 100644 index 660701f..0000000 --- a/rc.torus +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# PROVIDE: torus -# REQUIRE: LOGIN -# KEYWORD: shutdown - -. /etc/rc.subr - -name=torus -rcvar=torus_enable -load_rc_config ${name} - -: ${torus_enable:=NO} -: ${torus_user=torus} -: ${torus_group=${torus_user}} -: ${torus_user:+${torus_chroot=/home/${torus_user}}} -: ${torus_user:+${torus_data_path=/home/${torus_user}/torus.dat}} -: ${torus_user:+${torus_sock_path=/home/${torus_user}/torus.sock}} -torus_flags="\ - ${torus_data_path:+-d ${torus_data_path}} \ - ${torus_sock_path:+-s ${torus_sock_path}} \ - ${torus_flags}" - -torus_run=/var/run/${name} -torus_pid=${torus_run}/${name}.pid - -required_dirs=${torus_chroot}${torus_run} -pidfile=${torus_chroot}${torus_pid} - -command=/bin/server -command_args="-p ${torus_pid}" - -run_rc_command "$1" |