[commit] BSDanywhere - r266 - trunk
bsdan...@startek.ch
Date: Tue May 5 14:58:47 2009
New Revision: 266
Log:
sync
Added:
trunk/etc_group.tpl
trunk/etc_master.passwd.tpl
trunk/etc_sudoers.tpl
Modified:
trunk/build.sh
trunk/etc_hosts.tpl
trunk/etc_rc.local.tpl
trunk/etc_rc.tpl
trunk/etc_welcome.tpl
Modified: trunk/build.sh
==============================================================================
--- trunk/build.sh Tue May 5 11:56:09 2009 (r265)
+++ trunk/build.sh Tue May 5 14:58:47 2009 (r266)
@@ -1,8 +1,12 @@
+#!/bin/ksh
+#
# $Id$
#
# Build script for creating the BSDanywhere OpenBSD Live CD image.
+# Execute this script with ./build
#
-# Copyright (c) 2008 Rene Maroufi, Stephan A. Rickauer
+# Copyright (c) 2009 Stephan A. Rickauer
+# Copyright (c) 2008-2009 Rene Maroufi, Stephan A. Rickauer
#
# All rights reserved.
# Redistribution and use in source and binary forms, with or without modification,
@@ -25,46 +29,36 @@
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-# USAGE INFORMATION
-# Call this script with 'cat build.sh | ksh'. Do NOT invoke build.sh
-# directly as this will overwrite your entire / file system! Also
-# ensure $BASE resides on file system mounted without restrictions.
+
#
# Variables
#
-export BASE=/specify/base/path
+BASE=/specify/base/path
+
+ARCH=$(uname -m)
+RELEASE=$(uname -r)
+R=$(echo $RELEASE | awk -F. '{print $1$2 }')
+
+IMAGE_ROOT=$BASE/image
+CACHE_ROOT=$BASE/cache
+
+export PKG_DBDIR=$IMAGE_ROOT/var/db/pkg
+export PKG_CACHE=$CACHE_ROOT
+
+MIRROR=http://mirror.switch.ch/ftp/pub/OpenBSD
+export PKG_PATH=$PKG_CACHE:$MIRROR/$RELEASE/packages/$ARCH/
+
+CWD=$(pwd)
+THIS_OS=$(uname)
+MIN_SPACE_REQ='1600000'
-export ARCH=$(uname -m)
-export RELEASE=$(uname -r)
-export R=$(echo $RELEASE | awk -F. '{print $1$2 }')
-
-export IMAGE_ROOT=$BASE/image
-export CACHE_ROOT=$BASE/cache
-
-export MIRROR1=http://mirror.switch.ch/ftp/pub/OpenBSD
-export MIRROR2=http://mirror.startek.ch
-export PKG_PATH=$MIRROR1/$RELEASE/packages/$ARCH/:$MIRROR2/OpenBSD/packages/$RELEASE/$ARCH/
-
-export CWD=$(pwd)
-export THIS_OS=$(uname)
-export MIN_SPACE_REQ='1600000'
#
# Functions go first.
#
examine_environment() {
- echo -n 'Invocation: '
- if [ "$0" = 'ksh' ]; then
- echo 'via ksh (ok)'
- else
- echo "$0 directly (NOT ok)"
- return 1
- fi
-
echo -n 'This user: '
if [ "$USER" = 'root' ]; then
echo 'root (ok)'
@@ -138,38 +132,33 @@
echo done
}
-# Get custom kernels.
-install_custom_kernels() {
- for i in bsd bsd.mp
- do
- test -r $CACHE_ROOT/$i || \
- ftp -o $CACHE_ROOT/$i $MIRROR2/BSDanywhere/$RELEASE/$ARCH/$i
- echo -n "Installing $i ... "
- cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
- echo done
- done
-}
-
-# Get generic boot loaders.
+# Get generic kernels and boot loaders.
install_boot_files() {
- for i in cdbr cdboot
+ for i in bsd bsd.mp cdbr cdboot
do
- test -r $CACHE_ROOT/$i || \
- ftp -o $CACHE_ROOT/$i $MIRROR1/$RELEASE/$ARCH/$i
- echo -n "Installing $i ... "
- cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
- echo done
+ if [ ! -r "$CACHE_ROOT/$i" ]
+ then
+ echo "$i not cached, fetching:"
+ ftp -Vo $CACHE_ROOT/$i $MIRROR/$RELEASE/$ARCH/$i
+ fi
+ echo -n "Installing $i ... "
+ cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
+ echo done
done
}
# Get all OpenBSD file sets except compXX.tgz.
install_filesets() {
- for i in base game man misc etc xbase xetc xfont xserv xshare
+ for fs in base game man misc etc xbase xetc xfont xserv xshare
do
- test -r $CACHE_ROOT/$i$R.tgz || \
- ftp -o $CACHE_ROOT/$i$R.tgz $MIRROR1/$RELEASE/$ARCH/$i$R.tgz
- echo -n "Installing $i ... "
- tar -C $IMAGE_ROOT -xzphf $CACHE_ROOT/$i$R.tgz
+ fs=$fs$R.tgz
+ if [ ! -r "$CACHE_ROOT/$fs" ]
+ then
+ echo "$fs not cached, fetching:"
+ ftp -Vo $CACHE_ROOT/$fs $MIRROR/$RELEASE/$ARCH/$fs
+ fi
+ echo -n "Installing $fs ... "
+ tar -C $IMAGE_ROOT -xzphf $CACHE_ROOT/$fs
echo done
done
}
@@ -184,120 +173,136 @@
echo done
}
+install_packages() {
+ # Download and install packages.
+ pkg_add -x -B $IMAGE_ROOT $(grep -v '#' $CWD/tools/package_list)
+}
+
+install_template_files() {
+ # Install modified OpenBSD template files. Always make a backup copy so
+ # people can understand what the BSDanywhere specific modifications are.
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_fstab.tpl $IMAGE_ROOT/etc/fstab
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_myname.tpl $IMAGE_ROOT/etc/myname
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_motd.tpl $IMAGE_ROOT/etc/motd
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_boot.conf.tpl $IMAGE_ROOT/etc/boot.conf
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_hosts.tpl $IMAGE_ROOT/etc/hosts
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_sysctl.conf.tpl $IMAGE_ROOT/etc/sysctl.conf
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_rc.tpl $IMAGE_ROOT/etc/rc
+ install -b -B .orig -o root -g wheel -m 755 $CWD/etc_rc.local.tpl $IMAGE_ROOT/etc/rc.local
+ install -b -B .orig -o root -g wheel -m 440 $CWD/etc_sudoers.tpl $IMAGE_ROOT/etc/sudoers
+ install -b -B .orig -o root -g wheel -m 600 $CWD/etc_master.passwd.tpl $IMAGE_ROOT/etc/master.passwd
+ install -b -B .orig -o root -g wheel -m 644 $CWD/etc_group.tpl $IMAGE_ROOT/etc/group
+ install -o root -g wheel -m 644 /dev/null $IMAGE_ROOT/fastboot
+
+ # Install BSDanywhere specific template files.
+ install -o root -g wheel -m 644 $CWD/etc_welcome.tpl $IMAGE_ROOT/etc/welcome
+ install -o root -g wheel -m 755 $CWD/etc_rc.restore.tpl $IMAGE_ROOT/etc/rc.restore
+ install -o root -g wheel -m 755 $CWD/usr_local_sbin_syncsys.tpl $IMAGE_ROOT/usr/local/sbin/syncsys
+
+ # Install those template files that need prerequisites.
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/bin/
+ install -o 1000 -g 10 -m 555 $CWD/home_live_bin_mkbackup.tpl $IMAGE_ROOT/home/live/bin/mkbackup
+ install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.profile.tpl $IMAGE_ROOT/home/live/.profile
+ install -o 1000 -g 10 -m 644 $CWD/home_live_.kshrc.tpl $IMAGE_ROOT/home/live/.kshrc
+ install -o 1000 -g 10 -m 644 $CWD/home_live_.xinitrc.tpl $IMAGE_ROOT/home/live/.xinitrc
+ install -o root -g wheel -m 644 $CWD/usr_local_share_applications_xterm.desktop.tpl $IMAGE_ROOT/usr/local/share/applications/xterm.desktop
+
+ # E17 specific installs.
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.config/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.config/menus/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/menu/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/bar/
+ install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/bar/default/
+ install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.e_e_applications_menu_favorite.menu.tpl $IMAGE_ROOT/home/live/.e/e/applications/menu/favorite.menu
+ install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.e_e_applications_bar_default_.order.tpl $IMAGE_ROOT/home/live/.e/e/applications/bar/default/.order
+ install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.config_menus_applications.menu.tpl $IMAGE_ROOT/home/live/.config/menus/applications.menu
+}
+
+generate_pwdb() {
+ # (Re-)Generate password databases.
+ pwd_mkdb -d $IMAGE_ROOT/etc/ $IMAGE_ROOT/etc/master.passwd
+}
+
+compress_binaries() {
+ # Using gzexe we can compress binaries to speed up
+ # cdrom reads by saving space at the same time!
+ echo 'Compressing binary executables ... '
+ find $IMAGE_ROOT/bin \
+ $IMAGE_ROOT/usr/bin \
+ $IMAGE_ROOT/usr/sbin \
+ $IMAGE_ROOT/usr/local/bin \
+ $IMAGE_ROOT/usr/local/sbin \
+ $IMAGE_ROOT/usr/X11R6/bin \
+ ! -perm -4000 ! -name stty ! -name cp ! -name mkdir \
+ ! -name chmod ! -name chgrp ! -name chown \
+ ! -name tar ! -name pax ! -name cpio \
+ ! -name sh ! -name ksh ! -name rksh \
+ -type f -size +200 -exec gzexe {} \;
+
+ echo -n 'Removing gzexe ~ copies ... '
+ find $IMAGE_ROOT/bin \
+ $IMAGE_ROOT/usr/bin \
+ $IMAGE_ROOT/usr/sbin \
+ $IMAGE_ROOT/usr/local/bin \
+ $IMAGE_ROOT/usr/local/sbin \
+ $IMAGE_ROOT/usr/X11R6/bin -type f -name "*~" -exec rm {} \;
+ echo 'done'
+}
+
+package_dirlayout() {
+ # Prepare to-be-mfs file systems by packaging their directories into
+ # individual tgz's. They will be untar'ed on each boot by /etc/rc.
+ # This will greatly reduce boot time compared to using -P in newfs.
+ for fs in var etc root home
+ do
+ echo -n "Packaging $fs ... "
+ tar cphf - $fs | gzip -9 > $IMAGE_ROOT/stand/$fs.tgz
+ echo done
+ done
+}
+
+prepare_image() {
+ # To save space on the image, we clean out what is not needed to boot.
+ rm -r $IMAGE_ROOT/var/* && ln -s /var/tmp $IMAGE_ROOT/tmp
+ rm -r $IMAGE_ROOT/home/*
+ rm $IMAGE_ROOT/etc/fbtab
+}
+
+burn_cdimage() {
+ # Finally, create the image.
+ cd $IMAGE_ROOT/..
+ echo 'Creating ISO image:'
+ mkhybrid -A "BSDanywhere $RELEASE" -quiet -l -R -o bsdanywhere$R-$ARCH.iso -b cdbr -c boot.catalog image
+}
+
+clean_buildenv() {
+ echo -n "Cleanup build environment ... "
+ rm /tmp/gzexe*
+ rm -rf $IMAGE_ROOT
+ echo done
+}
+
+
+#
+# Main
+#
+
examine_environment
[ $? = 0 ] || exit 1
prepare_build
-install_custom_kernels
install_boot_files
install_filesets
prepare_filesystem
-
-# Help chroot to find a name server.
-cp /etc/resolv.conf $IMAGE_ROOT/etc/
-
-# Install modified OpenBSD template files. Always make a backup copy so
-# people can understand what the BSDanywhere specific modifications are.
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_fstab.tpl $IMAGE_ROOT/etc/fstab
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_myname.tpl $IMAGE_ROOT/etc/myname
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_motd.tpl $IMAGE_ROOT/etc/motd
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_boot.conf.tpl $IMAGE_ROOT/etc/boot.conf
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_hosts.tpl $IMAGE_ROOT/etc/hosts
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_sysctl.conf.tpl $IMAGE_ROOT/etc/sysctl.conf
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_rc.tpl $IMAGE_ROOT/etc/rc
-install -b -B .orig -o root -g wheel -m 755 $CWD/etc_rc.local.tpl $IMAGE_ROOT/etc/rc.local
-install -o root -g wheel -m 644 /dev/null $IMAGE_ROOT/fastboot
-
-# Install BSDanywhere specific template files.
-install -o root -g wheel -m 644 $CWD/etc_welcome.tpl $IMAGE_ROOT/etc/welcome
-install -o root -g wheel -m 755 $CWD/etc_rc.restore.tpl $IMAGE_ROOT/etc/rc.restore
-install -o root -g wheel -m 755 $CWD/usr_local_sbin_syncsys.tpl $IMAGE_ROOT/usr/local/sbin/syncsys
-
- #
- # Enter change-root and customize system within.
- #
- chroot $IMAGE_ROOT
- ldconfig
- echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
- # Create 'live' account with an empty password.
- useradd -G wheel,operator,dialer -c "BSDanywhere Live CD Account" -d /home/live -k /etc/skel -s /bin/ksh -m live
- perl -p -i -e 's/\Qlive:*************:1000\E/live::1000/g' /etc/master.passwd
- pwd_mkdb /etc/master.passwd
-
- # Download and install packages.
- echo
- pkg_add -x iperf nmap tightvnc-viewer rsync pftop trafshow pwgen hexedit hping firefox3 mozilla-thunderbird gqview bzip2 epdfview-0.1.6p5 ipcalc BitchX imapfilter privoxy tor arping e-20071211p3 screen-4.0.3p1 smartmontools aescrypt aiccu amap angst httptunnel udptunnel hydra iodine minicom nano nbtscan nepim netfwd netpipe ngrep galculator mboxgrep nemesis newsfetch queso radiusniff scanssh smtpscan ssldump stress stunnel dnstop-20080502 dnstracer
-
- # Leave the chroot environment.
- exit
-
-# Install those template files that need prerequisites.
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/bin/
-install -o 1000 -g 10 -m 555 $CWD/home_live_bin_mkbackup.tpl $IMAGE_ROOT/home/live/bin/mkbackup
-install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.profile.tpl $IMAGE_ROOT/home/live/.profile
-install -o 1000 -g 10 -m 644 $CWD/home_live_.kshrc.tpl $IMAGE_ROOT/home/live/.kshrc
-install -o 1000 -g 10 -m 644 $CWD/home_live_.xinitrc.tpl $IMAGE_ROOT/home/live/.xinitrc
-install -o root -g wheel -m 644 $CWD/usr_local_share_applications_xterm.desktop.tpl $IMAGE_ROOT/usr/local/share/applications/xterm.desktop
-install -b -B .orig -o root -g wheel -m 644 $CWD/etc_privoxy_config.tpl $IMAGE_ROOT/etc/privoxy/config
-
-# E17 specific installs.
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.config/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.config/menus/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/menu/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/bar/
-install -d -o 1000 -g 10 -m 755 $IMAGE_ROOT/home/live/.e/e/applications/bar/default/
-install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.e_e_applications_menu_favorite.menu.tpl $IMAGE_ROOT/home/live/.e/e/applications/menu/favorite.menu
-install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.e_e_applications_bar_default_.order.tpl $IMAGE_ROOT/home/live/.e/e/applications/bar/default/.order
-install -b -B .orig -o 1000 -g 10 -m 644 $CWD/home_live_.config_menus_applications.menu.tpl $IMAGE_ROOT/home/live/.config/menus/applications.menu
-
-# Using gzexe we can compress binaries to speed up
-# cdrom reads by saving space at the same time!
-echo 'Compressing binary executables ... '
-find $IMAGE_ROOT/bin \
- $IMAGE_ROOT/usr/bin \
- $IMAGE_ROOT/usr/sbin \
- $IMAGE_ROOT/usr/local/bin \
- $IMAGE_ROOT/usr/local/sbin \
- $IMAGE_ROOT/usr/X11R6/bin \
- ! -perm -4000 ! -name stty ! -name cp ! -name mkdir \
- ! -name chmod ! -name chgrp ! -name chown \
- ! -name tar ! -name pax ! -name cpio \
- ! -name sh ! -name ksh ! -name rksh \
- -type f -size +200 -exec gzexe {} \;
-
-echo -n 'Removing gzexe ~ copies ... '
-find $IMAGE_ROOT/bin \
- $IMAGE_ROOT/usr/bin \
- $IMAGE_ROOT/usr/sbin \
- $IMAGE_ROOT/usr/local/bin \
- $IMAGE_ROOT/usr/local/sbin \
- $IMAGE_ROOT/usr/X11R6/bin -type f -name "*~" -exec rm {} \;
-echo 'done'
-
-# Prepare to-be-mfs file systems by packaging their directories into
-# individual tgz's. They will be untar'ed on each boot by /etc/rc.
-# This will greatly reduce boot time compared to using -P in newfs.
-for fs in var etc root home
-do
- echo -n "Packaging $fs ... "
- tar cphf - $fs | gzip -9 > $IMAGE_ROOT/stand/$fs.tgz
- echo done
-done
-
-# Cleanup build environment.
-rm $IMAGE_ROOT/etc/resolv.conf
-rm /tmp/gzexe*
-
-# To save space on the image, we clean out what is not needed to boot.
-rm -r $IMAGE_ROOT/var/* && ln -s /var/tmp $IMAGE_ROOT/tmp
-rm -r $IMAGE_ROOT/home/*
-rm $IMAGE_ROOT/etc/fbtab
-
-# Finally, create the image.
-cd $IMAGE_ROOT/..
-echo 'Creating ISO image:'
-mkhybrid -A "BSDanywhere $RELEASE" -quiet -l -R -o bsdanywhere$R-$ARCH.iso -b cdbr -c boot.catalog image
+install_packages
+install_template_files
+generate_pwdb
+compress_binaries
+package_dirlayout
+prepare_image
+burn_cdimage
+clean_buildenv
Added: trunk/etc_group.tpl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/etc_group.tpl Tue May 5 14:58:47 2009 (r266)
@@ -0,0 +1,64 @@
+wheel:*:0:root:live
+daemon:*:1:daemon
+kmem:*:2:root
+sys:*:3:root
+tty:*:4:root
+operator:*:5:root:live
+bin:*:7:
+news:*:8:
+wsrc:*:9:
+users:*:10:
+auth:*:11:
+games:*:13:
+staff:*:20:root
+smmsp:*:25:
+popa3d:*:26:
+sshd:*:27:
+_portmap:*:28:
+_identd:*:29:
+_rstatd:*:30:
+guest:*:31:root
+_rusersd:*:32:
+_fingerd:*:33:
+_sshagnt:*:34:
+_x11:*:35:
+utmp:*:45:
+_kdc:*:59:
+_kadmin:*:60:
+_lkm:*:61:
+_spamd:*:62:
+_radius:*:63:
+_token:*:64:
+_shadow:*:65:
+crontab:*:66:
+www:*:67:
+_isakmpd:*:68:
+network:*:69:
+named:*:70:
+proxy:*:71:
+authpf:*:72:
+_syslogd:*:73:
+_pflogd:*:74:
+_bgpd:*:75:
+_tcpdump:*:76:
+_dhcp:*:77:
+_mopd:*:78:
+_tftpd:*:79:
+_rbootd:*:80:
+_afs:*:81:
+_ppp:*:82:
+_ntp:*:83:
+_ftp:*:84:
+_ospfd:*:85:
+_hostapd:*:86:
+_dvmrpd:*:87:
+_ripd:*:88:
+_relayd:*:89:
+_ospf6d:*:90:
+_snmpd:*:91:
+_rtadvd:*:92:
+_ypldap:*:93:
+_btd:*:94:
+dialer:*:117:live
+nogroup:*:32766:
+nobody:*:32767:
Modified: trunk/etc_hosts.tpl
==============================================================================
--- trunk/etc_hosts.tpl Tue May 5 11:56:09 2009 (r265)
+++ trunk/etc_hosts.tpl Tue May 5 14:58:47 2009 (r266)
@@ -1,4 +1,4 @@
-# $OpenBSD: hosts,v 1.11 2002/09/26 23:35:51 krw Exp $
+# $OpenBSD: hosts,v 1.12 2009/03/10 00:42:13 deraadt Exp $
#
# Host Database
#
@@ -7,7 +7,5 @@
# 172.16.0.0 172.31.255.255
# 192.168.0.0 192.168.255.255
#
-::1 localhost.my.domain localhost
-127.0.0.1 localhost.my.domain localhost
-::1 live.BSDanywhere.org live
-127.0.0.1 live.BSDanywhere.org live
+127.0.0.1 localhost
+::1 localhost
Added: trunk/etc_master.passwd.tpl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/etc_master.passwd.tpl Tue May 5 14:58:47 2009 (r266)
@@ -0,0 +1,45 @@
+root::0:0:daemon:0:0:Charlie &:/root:/bin/ksh
+daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin
+operator:*:2:5::0:0:System &:/operator:/sbin/nologin
+bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
+smmsp:*:25:25::0:0:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
+popa3d:*:26:26::0:0:POP3 Server:/var/empty:/sbin/nologin
+sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin
+_portmap:*:28:28::0:0:portmap:/var/empty:/sbin/nologin
+_identd:*:29:29::0:0:identd:/var/empty:/sbin/nologin
+_rstatd:*:30:30::0:0:rpc.rstatd:/var/empty:/sbin/nologin
+_rusersd:*:32:32::0:0:rpc.rusersd:/var/empty:/sbin/nologin
+_fingerd:*:33:33::0:0:fingerd:/var/empty:/sbin/nologin
+_x11:*:35:35::0:0:X Server:/var/empty:/sbin/nologin
+_kdc:*:59:59::0:0:Kerberos Server:/var/empty:/sbin/nologin
+_kadmin:*:60:60::0:0:Kerberos Admin Server:/var/empty:/sbin/nologin
+_spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
+uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/usr/libexec/uucp/uucico
+www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin
+_isakmpd:*:68:68::0:0:isakmpd privsep:/var/empty:/sbin/nologin
+named:*:70:70::0:0:BIND Name Service Daemon:/var/named:/sbin/nologin
+proxy:*:71:71::0:0:Proxy Services:/nonexistent:/sbin/nologin
+_syslogd:*:73:73::0:0:Syslog Daemon:/var/empty:/sbin/nologin
+_pflogd:*:74:74::0:0:pflogd privsep:/var/empty:/sbin/nologin
+_bgpd:*:75:75::0:0:BGP Daemon:/var/empty:/sbin/nologin
+_tcpdump:*:76:76::0:0:tcpdump privsep:/var/empty:/sbin/nologin
+_dhcp:*:77:77::0:0:DHCP programs:/var/empty:/sbin/nologin
+_mopd:*:78:78::0:0:MOP Daemon:/var/empty:/sbin/nologin
+_tftpd:*:79:79::0:0:TFTP Daemon:/var/empty:/sbin/nologin
+_rbootd:*:80:80::0:0:rbootd Daemon:/var/empty:/sbin/nologin
+_afs:*:81:81::0:0:afs Daemon:/var/empty:/sbin/nologin
+_ppp:*:82:82::0:0:PPP utilities:/var/empty:/sbin/nologin
+_ntp:*:83:83::0:0:NTP Daemon:/var/empty:/sbin/nologin
+_ftp:*:84:84::0:0:FTP Daemon:/var/empty:/sbin/nologin
+_ospfd:*:85:85::0:0:OSPF Daemon:/var/empty:/sbin/nologin
+_hostapd:*:86:86::0:0:HostAP Daemon:/var/empty:/sbin/nologin
+_dvmrpd:*:87:87::0:0:DVMRP Daemon:/var/empty:/sbin/nologin
+_ripd:*:88:88::0:0:RIP Daemon:/var/empty:/sbin/nologin
+_relayd:*:89:89::0:0:Relay Daemon:/var/empty:/sbin/nologin
+_ospf6d:*:90:90::0:0:OSPF6 Daemon:/var/empty:/sbin/nologin
+_snmpd:*:91:91::0:0:SNMP Daemon:/var/empty:/sbin/nologin
+_rtadvd:*:92:92::0:0:IPv6 Router Advertisement Daemon:/var/empty:/sbin/nologin
+_ypldap:*:93:93::0:0:YP to LDAP Daemon:/var/empty:/sbin/nologin
+_btd:*:94:94::0:0:Bluetooth Daemon:/var/empty:/sbin/nologin
+nobody:*:32767:32767::0:0:Unprivileged user for NFS:/nonexistent:/sbin/nologin
+live::1000:10::0:0:BSDanywhere Live CD Account:/home/live:/bin/ksh
Modified: trunk/etc_rc.local.tpl
==============================================================================
--- trunk/etc_rc.local.tpl Tue May 5 11:56:09 2009 (r265)
+++ trunk/etc_rc.local.tpl Tue May 5 14:58:47 2009 (r266)
@@ -1,3 +1,5 @@
+# $OpenBSD: rc.local,v 1.39 2006/07/28 20:19:46 sturm Exp $
+
# Site-specific startup actions, daemons, and other things which
# can be done AFTER your system goes into securemode. For actions
# which should be done BEFORE your system has gone into securemode
@@ -5,16 +7,7 @@
echo -n 'starting local daemons:'
-#if [ -x /usr/local/bin/tor ]; then
-# echo -n ' tor';
-# /usr/local/bin/tor >/dev/null 2>&1
-#fi
-
-#if [ -x /usr/local/sbin/privoxy ]; then
-# echo -n ' privoxy';
-# /usr/local/sbin/privoxy --user _privoxy._privoxy \
-# /etc/privoxy/config >/dev/null 2>&1
-#fi
+# Add your local startup actions here.
echo '.'
Modified: trunk/etc_rc.tpl
==============================================================================
--- trunk/etc_rc.tpl Tue May 5 11:56:09 2009 (r265)
+++ trunk/etc_rc.tpl Tue May 5 14:58:47 2009 (r266)
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.318 2008/07/09 20:23:47 djm Exp $
+# $OpenBSD: rc,v 1.321 2008/12/11 15:44:00 naddy Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -615,7 +615,7 @@
if [ ! -f /etc/isakmpd/private/local.key ]; then
echo -n "openssl: generating new isakmpd RSA key... "
- if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 1024 \
+ if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
> /dev/null 2>&1; then
chmod 600 /etc/isakmpd/private/local.key
openssl rsa -out /etc/isakmpd/local.pub \
@@ -696,6 +696,13 @@
echo -n ' hostapd'; /usr/sbin/hostapd ${hostapd_flags};
fi
+if [ X"${bt}" != X"NO" ]; then
+ echo -n ' btd'; /usr/sbin/btd
+ if [ -f ${bt_rules} ]; then
+ btctl -f ${bt_rules}
+ fi
+fi
+
if [ X"${rwhod}" = X"YES" ]; then
echo -n ' rwhod'; rwhod
fi
@@ -743,7 +750,7 @@
spamd_flags="${spamd_flags} -b"
fi
echo -n ' spamd'; eval /usr/libexec/spamd ${spamd_flags}
- /usr/libexec/spamd-setup
+ /usr/libexec/spamd-setup -D
if [ X"${spamd_black}" = X"NO" ]; then
echo -n ' spamlogd'
/usr/libexec/spamlogd ${spamlogd_flags}
Added: trunk/etc_sudoers.tpl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/etc_sudoers.tpl Tue May 5 14:58:47 2009 (r266)
@@ -0,0 +1,44 @@
+# $OpenBSD: sudoers,v 1.21 2008/04/11 20:51:57 thib Exp $
+#
+# sudoers file.
+#
+# This file MUST be edited with the 'visudo' command as root.
+# Failure to use 'visudo' may result in syntax or file permission errors
+# that prevent sudo from running.
+#
+# See the sudoers man page for the details on how to write a sudoers file.
+#
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# Defaults specification
+Defaults env_keep +="DESTDIR FETCH_CMD FLAVOR FTPMODE GROUP MAKE MULTI_PACKAGES"
+Defaults env_keep +="OKAY_FILES OWNER PKG_DBDIR PKG_DESTDIR PKG_CACHE PKG_PATH"
+Defaults env_keep +="PKG_TMPDIR PORTSDIR RELEASEDIR SUBPACKAGE WRKOBJDIR"
+Defaults env_keep +="SSH_AUTH_SOCK EDITOR VISUAL SHARED_ONLY"
+
+# Uncomment to disable the lecture the first time you run sudo
+#Defaults !lecture
+
+# Uncomment to preserve the environment for users in group wheel
+#Defaults:%wheel !env_reset
+
+# Runas alias specification
+
+# User privilege specification
+root ALL=(ALL) SETENV: ALL
+
+# Uncomment to allow people in group wheel to run all commands
+# and set environment variables.
+%wheel ALL=(ALL) SETENV: ALL
+
+# Same thing without a password
+# %wheel ALL=(ALL) NOPASSWD: SETENV: ALL
+
+# Samples
+# %users ALL=/sbin/mount /cdrom,/sbin/umount /cdrom
+# %users localhost=/sbin/shutdown -h now
Modified: trunk/etc_welcome.tpl
==============================================================================
--- trunk/etc_welcome.tpl Tue May 5 11:56:09 2009 (r265)
+++ trunk/etc_welcome.tpl Tue May 5 14:58:47 2009 (r266)
@@ -1,5 +1,5 @@
-Welcome to BSDanywhere 4.4 - enlightenment at your fingertips!
+Welcome to BSDanywhere 4.5 - enlightenment at your fingertips!
You may now log in using either 'live' or 'root' as a user name. Both
accounts have no default password set. If you'd like to set one, use the