2c2
< # $Id: rc,v 1.192 1999/08/06 06:20:19 peter Exp $
---
> # $Id: rc,v 1.193 1999/08/06 06:22:43 peter Exp $
48c48
< if [ X$start_vinum = XYES ]; then
---
> if [ "${start_vinum}" = "YES" ]; then
50,51c50,51
< elif [ -n "$vinum_drives" ]; then
< vinum read $vinum_drives
---
> elif [ -n "${vinum_drives}" ]; then
> vinum read ${vinum_drives}
56c56
< if [ $1x = autobootx ]; then
---
> if [ "$1" = "autoboot" ]; then
98c98
< if [ "X$root_rw_mount" != "XNO" ]; then
---
> if [ "${root_rw_mount}" != "NO" ]; then
109c109
< if [ "X$early_nfs_mounts" != "XYES" ]; then
---
> if [ "${early_nfs_mounts}" != "YES" ]; then
122,124c122,124
< if [ "X$diskless_mount" != "X" ]; then
< if [ -f $diskless_mount ]; then
< sh $diskless_mount
---
> if [ -n "${diskless_mount}" ]; then
> if [ -f "${diskless_mount}" ]; then
> sh ${diskless_mount}
151,153c151,153
< if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then
< echo "Adding $swapfile as additional swap."
< vnconfig /dev/vn0b $swapfile && swapon /dev/vn0b
---
> if [ "${swapfile}" != "NO" -a -w "${swapfile}" -a -b /dev/vn0b ]; then
> echo "Adding ${swapfile} as additional swap."
> vnconfig /dev/vn0b ${swapfile} && swapon /dev/vn0b
198c198
< if [ "X${clear_tmp_enable}" = X"YES" ]; then
---
> if [ "${clear_tmp_enable}" = "YES" ]; then
220c220
< if [ "X${syslogd_enable}" = X"YES" ]; then
---
> if [ "${syslogd_enable}" = "YES" ]; then
236c236
< if [ "X${dumpdev}" != X"NO" -a -e ${dumpdev} -a -d /var/crash ]; then
---
> if [ "${dumpdev}" != "NO" -a -e ${dumpdev} -a -d /var/crash ]; then
242c242
< if [ -n "$network_pass1_done" ]; then
---
> if [ -n "${network_pass1_done}" ]; then
247c247
< if [ "X${enable_quotas}" = X"YES" ]; then
---
> if [ "${enable_quotas}" = "YES" ]; then
250c250
< if [ "X${check_quotas}" = X"YES" ]; then
---
> if [ "${check_quotas}" = "YES" ]; then
261c261
< if [ -n "$network_pass2_done" ]; then
---
> if [ -n "${network_pass2_done}" ]; then
277c277
< if [ "X${accounting_enable}" = X"YES" -a -d /var/account ]; then
---
> if [ "${accounting_enable}" = "YES" -a -d /var/account ]; then
288c288
< if [ X"`/usr/bin/objformat`" = X"elf" ]; then
---
> if [ "`/usr/bin/objformat`" = "elf" ]; then
290,292c290,292
< for i in $ldconfig_paths; do
< if test -d $i; then
< _LDC="${_LDC} $i"
---
> for i in ${ldconfig_paths}; do
> if test -d ${i}; then
> _LDC="${_LDC} ${i}"
300c300
< if [ X"`sysctl -n hw.machine`" = X"i386" ]; then
---
> if [ "`sysctl -n hw.machine`" = "i386" ]; then
304,306c304,306
< for i in $ldconfig_paths_aout; do
< if test -d $i; then
< _LDC="${_LDC} $i"
---
> for i in ${ldconfig_paths_aout}; do
> if test -d ${i}; then
> _LDC="${_LDC} ${i}"
317c317
< if [ "X${inetd_enable}" != X"NO" ]; then
---
> if [ "${inetd_enable}" != "NO" ]; then
321c321
< if [ "X${cron_enable}" != X"NO" ]; then
---
> if [ "${cron_enable}" != "NO" ]; then
325c325
< if [ "X${lpd_enable}" = X"YES" ]; then
---
> if [ "${lpd_enable}" = "YES" ]; then
329c329
< if [ "X${sendmail_enable}" = X"YES" -a -r /etc/sendmail.cf ]; then
---
> if [ "${sendmail_enable}" = "YES" -a -r /etc/sendmail.cf ]; then
333c333
< if [ "X${usbd_enable}" = X"YES" ]; then
---
> if [ "${usbd_enable}" = "YES" ]; then
347c347
< if [ "$vibackup" != '/var/tmp/vi.recover/vi.*' ]; then
---
> if [ "${vibackup}" != '/var/tmp/vi.recover/vi.*' ]; then
349c349
< for i in $vibackup; do
---
> for i in ${vibackup}; do
351c351
< if test ! -r $i; then
---
> if test ! -r ${i}; then
357,358c357,358
< if test -x $i -o ! -s $i; then
< rm -f $i
---
> if test -x ${i} -o ! -s ${i}; then
> rm -f ${i}
365,366c365,366
< if [ "$virecovery" != "/var/tmp/vi.recover/recover.*" ]; then
< for i in $virecovery; do
---
> if [ "${virecovery}" != "/var/tmp/vi.recover/recover.*" ]; then
> for i in ${virecovery}; do
368c368
< if test ! -r $i; then
---
> if test ! -r ${i}; then
375,377c375,377
< recfile=`awk '/^X-vi-recover-path:/{print $2}' < $i`
< if test -n "$recfile" -a -s "$recfile"; then
< sendmail -t < $i
---
> recfile=`awk '/^X-vi-recover-path:/{print $2}' < ${i}`
> if test -n "${recfile}" -a -s "${recfile}"; then
> sendmail -t < ${i}
379c379
< rm -f $i
---
> rm -f ${i}
391c391
< if [ "X${local_startup}" != X"NO" ]; then
---
> if [ "${local_startup}" != "NO" ]; then
402c402
< if [ "X${update_motd}" != X"NO" ]; then
---
> if [ "${update_motd}" != "NO" ]; then
405,408c405,408
< uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > $T
< awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> $T
< cmp -s $T /etc/motd || {
< cp $T /etc/motd
---
> uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
> awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
> cmp -s ${T} /etc/motd || {
> cp ${T} /etc/motd
411c411
< rm -f $T
---
> rm -f ${T}
440c440
< if [ "X${kern_securelevel_enable}" = X"YES" -a "${kern_securelevel}" -ge 0 ];
---
> if [ "${kern_securelevel_enable}" = "YES" -a "${kern_securelevel}" -ge 0 ];