=================================================================== RCS file: /cvs2/dgamelaunch-openbsd/dgl-create-chroot,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- dgamelaunch-openbsd/dgl-create-chroot 2021/03/09 14:48:42 1.2 +++ dgamelaunch-openbsd/dgl-create-chroot 2021/04/02 09:59:19 1.6 @@ -14,7 +14,7 @@ CHROOT="/opt/nethack/nethack.alt.org/" # the user & group from dgamelaunch config file. USRGRP="games:games" # COMPRESS from include/config.h; the compression binary to copy. leave blank to skip. -COMPRESSBIN="/bin/gzip" +COMPRESSBIN="/usr/bin/gzip" # nethack binary to copy into chroot (leave blank to skip) #NETHACKBIN="/home/paxed/hacking/coding/nethacksource/nethack-3.4.3-nao/nh343/nethack.343-nao" # fixed data to copy (leave blank to skip) @@ -27,6 +27,9 @@ NH_VAR_PLAYGROUND="/nh343/var/" # only define this if dgl was configured with --enable-sqlite SQLITE_DBFILE="/dgldir/dgamelaunch.db" +# only define this is dgl was configured without --enable-sqlite +#PASSWD_FILE="/dgldir/dgl-login" + # END OF CONFIG ############################################################################## @@ -78,21 +81,21 @@ fi CURDIR="`pwd`" -if [ ! -e "$CURDIR/dgamelaunch" ]; then - errorexit "Cannot find dgamelaunch in $CURDIR" +if [ ! -e "$CURDIR/dgamelaunch-openbsd" ]; then + errorexit "Cannot find dgamelaunch-openbsd in $CURDIR" fi DGLFILE="dgamelaunch.`date +%Y%m%d`" echo "Setting up chroot in $CHROOT" -LIBS="`findlibs dgamelaunch`" +LIBS="`findlibs dgamelaunch-openbsd`" mkdir -p "$CHROOT" || errorexit "Cannot create chroot" cd "$CHROOT" mkdir dgldir etc lib mail usr bin chown "$USRGRP" dgldir mail -cp "$CURDIR/dgamelaunch" "$DGLFILE" +cp "$CURDIR/dgamelaunch-openbsd" "$DGLFILE" ln -s "$DGLFILE" dgamelaunch mkdir -p "$CHROOT/dgldir/inprogress-nh343" @@ -110,9 +113,15 @@ if [ -n "$SQLITE_DBFILE" ]; then SQLITE_DBFILE="`echo ${SQLITE_DBFILE#/}`" sqlite3 "$CHROOT/$SQLITE_DBFILE" "create table dglusers (id integer primary key, username text, email text, env text, password text, flags integer);" chown "$USRGRP" "$CHROOT/$SQLITE_DBFILE" + chmod 0700 "$CHROOT/$SQLITE_DBFILE" fi fi +if [ -n "PASSWD_FILE" ]; then + echo "Creating password file at $PASSWD_FILE" + touch "$CHROOT/$PASSWD_FILE" + chmod 0700 "$CHROOT/$PASSWD_FILE" +fi if [ -n "$COMPRESSBIN" -a -e "`which $COMPRESSBIN`" ]; then COMPRESSDIR="`dirname $COMPRESSBIN`" @@ -127,7 +136,11 @@ fi mkdir -p dev cd dev -mknod urandom c 1 9 +if test $(uname -s) == OpenBSD; then + mknod urandom c 45 0 +else + mknod urandom c 1 9 +fi cd ..