3c3
< # $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $
---
> # $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
17c17
< hostname $hostname
---
> hostname ${hostname}
22,23c22,23
< if [ -n "$nisdomainname" -a "x$nisdomainname" != "xNO" ] ; then
< domainname $nisdomainname
---
> if [ -n "${nisdomainname}" -a "${nisdomainname}" != "NO" ] ; then
> domainname ${nisdomainname}
29c29
< if [ "X${atm_enable}" = X"YES" -a -f /etc/rc.atm ]; then
---
> if [ "${atm_enable}" = "YES" -a -f /etc/rc.atm ]; then
35c35
< if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
---
> if [ "${isdn_enable}" = "YES" -a -f /etc/rc.isdn ]; then
54c54
< if [ "x${network_interfaces}" = "xauto" ]; then
---
> if [ "${network_interfaces}" = "auto" ]; then
67c67
< if [ X"${ifconfig_args}" = X"DHCP" ]; then
---
> if [ "${ifconfig_args}" = "XDHCP" ]; then
100c100
< if [ "X$ppp_enable" = X"YES" ]; then
---
> if [ "${ppp_enable}" = "YES" ]; then
102,103c102,103
< if [ "X$ppp_mode" != X"ddial" -a "X$ppp_mode" != X"direct" \
< -a "X$ppp_mode" != X"dedicated" ]; then \
---
> if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
> -a "${ppp_mode}" != "dedicated" ]; then \
109c109
< if [ "X$ppp_nat" = X"YES" ]; then
---
> if [ "${ppp_nat}" = "YES" ]; then
125c125
< if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then
---
> if [ ${firewall_in_kernel} = 0 -a "${firewall_enable}" = "YES" ] ; then
135c135
< if [ $firewall_in_kernel = 1 ]; then
---
> if [ ${firewall_in_kernel} = 1 ]; then
139c139
< if [ -f ${firewall_script} -a X"$firewall_enable" = X"YES" ]; then
---
> if [ -f ${firewall_script} -a "${firewall_enable}" = "YES" ]; then
144c144
< if [ X"${natd_enable}" = X"YES" -a -n "${natd_interface}" ]; then
---
> if [ "${natd_enable}" = "YES" -a -n "${natd_interface}" ]; then
156c156
< if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
---
> if [ "${IPFW_DEFAULT}" = "65535 deny ip from any to any" ]; then
171c171
< if [ "x$defaultrouter" != "xNO" ] ; then
---
> if [ "${defaultrouter}" != "NO" ] ; then
177c177
< if [ "x${static_routes}" != "x" ]; then
---
> if [ -n "${static_routes}" ]; then
185c185
< if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
---
> if [ -n "${tcp_extensions}" -a "${tcp_extensions}" != "YES" ] ; then
190c190
< if [ -n "$log_in_vain" -a "x$log_in_vain" != "xNO" ] ; then
---
> if [ -n "${log_in_vain}" -a "${log_in_vain}" != "NO" ] ; then
196c196
< if [ X"$icmp_bmcastecho" = X"YES" ]; then
---
> if [ "${icmp_bmcastecho}" = "YES" ]; then
201c201
< if [ "X$icmp_drop_redirect" = X"YES" ]; then
---
> if [ "${icmp_drop_redirect}" = "YES" ]; then
206c206
< if [ "X$icmp_log_redirect" = X"YES" ]; then
---
> if [ "${icmp_log_redirect}" = "YES" ]; then
211c211
< if [ "X$gateway_enable" = X"YES" ]; then
---
> if [ "${gateway_enable}" = "YES" ]; then
216c216
< if [ "X$forward_sourceroute" = X"YES" ]; then
---
> if [ "${forward_sourceroute}" = "YES" ]; then
221c221
< if [ "X$accept_sourceroute" = X"YES" ]; then
---
> if [ "${accept_sourceroute}" = "YES" ]; then
226c226
< if [ "X$tcp_keepalive" = X"YES" ]; then
---
> if [ "${tcp_keepalive}" = "YES" ]; then
231c231
< if [ "X$ipxgateway_enable" = X"YES" ]; then
---
> if [ "${ipxgateway_enable}" = "YES" ]; then
236c236
< if [ "X$arpproxy_all" = X"YES" ]; then
---
> if [ "${arpproxy_all}" = "YES" ]; then
243c243
< if [ "X$router_enable" = X"YES" ]; then
---
> if [ "${router_enable}" = "YES" ]; then
247c247
< if [ "X$ipxrouted_enable" = X"YES" ]; then
---
> if [ "${ipxrouted_enable}" = "YES" ]; then
252c252
< if [ "X${mrouted_enable}" = X"YES" ]; then
---
> if [ "${mrouted_enable}" = "YES" ]; then
256c256
< if [ "X$rarpd_enable" = X"YES" ]; then
---
> if [ "${rarpd_enable}" = "YES" ]; then
265c265
< if [ "X${named_enable}" = X"YES" ]; then
---
> if [ "${named_enable}" = "YES" ]; then
269c269
< if [ "X${ntpdate_enable}" = X"YES" ]; then
---
> if [ "${ntpdate_enable}" = "YES" ]; then
273c273
< if [ "X${xntpd_enable}" = X"YES" ]; then
---
> if [ "${xntpd_enable}" = "YES" ]; then
277c277
< if [ "X${timed_enable}" = X"YES" ]; then
---
> if [ "${timed_enable}" = "YES" ]; then
281c281
< if [ "X${portmap_enable}" = X"YES" ]; then
---
> if [ "${portmap_enable}" = "YES" ]; then
287c287
< if [ "X${nis_server_enable}" = X"YES" ]; then
---
> if [ "${nis_server_enable}" = "YES" ]; then
290c290
< if [ "X${nis_ypxfrd_enable}" = X"YES" ]; then
---
> if [ "${nis_ypxfrd_enable}" = "YES" ]; then
294c294
< if [ "X${nis_yppasswdd_enable}" = X"YES" ]; then
---
> if [ "${nis_yppasswdd_enable}" = "YES" ]; then
300c300
< if [ "X${nis_client_enable}" = X"YES" ]; then
---
> if [ "${nis_client_enable}" = "YES" ]; then
302c302
< if [ "X${nis_ypset_enable}" = X"YES" ]; then
---
> if [ "${nis_ypset_enable}" = "YES" ]; then
308c308
< if [ "X${keyserv_enable}" = X"YES" ]; then
---
> if [ "${keyserv_enable}" = "YES" ]; then
312c312
< if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
---
> if [ "${rpc_ypupdated_enable}" = "YES" ]; then
328c328
< if [ "X${nfs_server_enable}" = X"YES" -a -r /etc/exports ]; then
---
> if [ "${nfs_server_enable}" = "YES" -a -r /etc/exports ]; then
330c330
< if [ "X${weak_mountd_authentication}" = X"YES" ]; then
---
> if [ "${weak_mountd_authentication}" = "YES" ]; then
334c334
< if [ "X${nfs_reserved_port_only}" = X"YES" ]; then
---
> if [ "${nfs_reserved_port_only}" = "YES" ]; then
339c339
< if [ "X$rpc_lockd_enable" = X"YES" ]; then
---
> if [ "${rpc_lockd_enable}" = "YES" ]; then
342c342
< if [ "X$rpc_statd_enable" = X"YES" ]; then
---
> if [ "${rpc_statd_enable}" = "YES" ]; then
347c347
< if [ "X${nfs_client_enable}" = X"YES" ]; then
---
> if [ "${nfs_client_enable}" = "YES" ]; then
349c349
< if [ "X${nfs_access_cache}" != X ]; then
---
> if [ "${nfs_access_cache}" != "X" ]; then
356c356
< if [ "X${amd_enable}" = X"YES" ]; then
---
> if [ "${amd_enable}" = "YES" ]; then
358c358
< if [ "X${amd_map_program}" != X"NO" ]; then
---
> if [ "${amd_map_program}" != "NO" ]; then
361c361
< if [ -n "$amd_flags" ]
---
> if [ -n "${amd_flags}" ]
369c369
< if [ "X${rwhod_enable}" = X"YES" ]; then
---
> if [ "${rwhod_enable}" = "YES" ]; then
374,375c374,375
< if [ "X${kerberos_server_enable}" = X"YES" ]; then
< if [ "X${kerberos_stash}" = "XYES" ]; then
---
> if [ "${kerberos_server_enable}" = "YES" ]; then
> if [ "${kerberos_stash}" = "YES" ]; then
382c382
< if [ "X${kadmind_server_enable}" = "XYES" ]; then
---
> if [ "${kadmind_server_enable}" = "YES" ]; then
< # $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $
---
> # $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
17c17
< hostname $hostname
---
> hostname ${hostname}
22,23c22,23
< if [ -n "$nisdomainname" -a "x$nisdomainname" != "xNO" ] ; then
< domainname $nisdomainname
---
> if [ -n "${nisdomainname}" -a "${nisdomainname}" != "NO" ] ; then
> domainname ${nisdomainname}
29c29
< if [ "X${atm_enable}" = X"YES" -a -f /etc/rc.atm ]; then
---
> if [ "${atm_enable}" = "YES" -a -f /etc/rc.atm ]; then
35c35
< if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
---
> if [ "${isdn_enable}" = "YES" -a -f /etc/rc.isdn ]; then
54c54
< if [ "x${network_interfaces}" = "xauto" ]; then
---
> if [ "${network_interfaces}" = "auto" ]; then
67c67
< if [ X"${ifconfig_args}" = X"DHCP" ]; then
---
> if [ "${ifconfig_args}" = "XDHCP" ]; then
100c100
< if [ "X$ppp_enable" = X"YES" ]; then
---
> if [ "${ppp_enable}" = "YES" ]; then
102,103c102,103
< if [ "X$ppp_mode" != X"ddial" -a "X$ppp_mode" != X"direct" \
< -a "X$ppp_mode" != X"dedicated" ]; then \
---
> if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
> -a "${ppp_mode}" != "dedicated" ]; then \
109c109
< if [ "X$ppp_nat" = X"YES" ]; then
---
> if [ "${ppp_nat}" = "YES" ]; then
125c125
< if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then
---
> if [ ${firewall_in_kernel} = 0 -a "${firewall_enable}" = "YES" ] ; then
135c135
< if [ $firewall_in_kernel = 1 ]; then
---
> if [ ${firewall_in_kernel} = 1 ]; then
139c139
< if [ -f ${firewall_script} -a X"$firewall_enable" = X"YES" ]; then
---
> if [ -f ${firewall_script} -a "${firewall_enable}" = "YES" ]; then
144c144
< if [ X"${natd_enable}" = X"YES" -a -n "${natd_interface}" ]; then
---
> if [ "${natd_enable}" = "YES" -a -n "${natd_interface}" ]; then
156c156
< if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
---
> if [ "${IPFW_DEFAULT}" = "65535 deny ip from any to any" ]; then
171c171
< if [ "x$defaultrouter" != "xNO" ] ; then
---
> if [ "${defaultrouter}" != "NO" ] ; then
177c177
< if [ "x${static_routes}" != "x" ]; then
---
> if [ -n "${static_routes}" ]; then
185c185
< if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
---
> if [ -n "${tcp_extensions}" -a "${tcp_extensions}" != "YES" ] ; then
190c190
< if [ -n "$log_in_vain" -a "x$log_in_vain" != "xNO" ] ; then
---
> if [ -n "${log_in_vain}" -a "${log_in_vain}" != "NO" ] ; then
196c196
< if [ X"$icmp_bmcastecho" = X"YES" ]; then
---
> if [ "${icmp_bmcastecho}" = "YES" ]; then
201c201
< if [ "X$icmp_drop_redirect" = X"YES" ]; then
---
> if [ "${icmp_drop_redirect}" = "YES" ]; then
206c206
< if [ "X$icmp_log_redirect" = X"YES" ]; then
---
> if [ "${icmp_log_redirect}" = "YES" ]; then
211c211
< if [ "X$gateway_enable" = X"YES" ]; then
---
> if [ "${gateway_enable}" = "YES" ]; then
216c216
< if [ "X$forward_sourceroute" = X"YES" ]; then
---
> if [ "${forward_sourceroute}" = "YES" ]; then
221c221
< if [ "X$accept_sourceroute" = X"YES" ]; then
---
> if [ "${accept_sourceroute}" = "YES" ]; then
226c226
< if [ "X$tcp_keepalive" = X"YES" ]; then
---
> if [ "${tcp_keepalive}" = "YES" ]; then
231c231
< if [ "X$ipxgateway_enable" = X"YES" ]; then
---
> if [ "${ipxgateway_enable}" = "YES" ]; then
236c236
< if [ "X$arpproxy_all" = X"YES" ]; then
---
> if [ "${arpproxy_all}" = "YES" ]; then
243c243
< if [ "X$router_enable" = X"YES" ]; then
---
> if [ "${router_enable}" = "YES" ]; then
247c247
< if [ "X$ipxrouted_enable" = X"YES" ]; then
---
> if [ "${ipxrouted_enable}" = "YES" ]; then
252c252
< if [ "X${mrouted_enable}" = X"YES" ]; then
---
> if [ "${mrouted_enable}" = "YES" ]; then
256c256
< if [ "X$rarpd_enable" = X"YES" ]; then
---
> if [ "${rarpd_enable}" = "YES" ]; then
265c265
< if [ "X${named_enable}" = X"YES" ]; then
---
> if [ "${named_enable}" = "YES" ]; then
269c269
< if [ "X${ntpdate_enable}" = X"YES" ]; then
---
> if [ "${ntpdate_enable}" = "YES" ]; then
273c273
< if [ "X${xntpd_enable}" = X"YES" ]; then
---
> if [ "${xntpd_enable}" = "YES" ]; then
277c277
< if [ "X${timed_enable}" = X"YES" ]; then
---
> if [ "${timed_enable}" = "YES" ]; then
281c281
< if [ "X${portmap_enable}" = X"YES" ]; then
---
> if [ "${portmap_enable}" = "YES" ]; then
287c287
< if [ "X${nis_server_enable}" = X"YES" ]; then
---
> if [ "${nis_server_enable}" = "YES" ]; then
290c290
< if [ "X${nis_ypxfrd_enable}" = X"YES" ]; then
---
> if [ "${nis_ypxfrd_enable}" = "YES" ]; then
294c294
< if [ "X${nis_yppasswdd_enable}" = X"YES" ]; then
---
> if [ "${nis_yppasswdd_enable}" = "YES" ]; then
300c300
< if [ "X${nis_client_enable}" = X"YES" ]; then
---
> if [ "${nis_client_enable}" = "YES" ]; then
302c302
< if [ "X${nis_ypset_enable}" = X"YES" ]; then
---
> if [ "${nis_ypset_enable}" = "YES" ]; then
308c308
< if [ "X${keyserv_enable}" = X"YES" ]; then
---
> if [ "${keyserv_enable}" = "YES" ]; then
312c312
< if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
---
> if [ "${rpc_ypupdated_enable}" = "YES" ]; then
328c328
< if [ "X${nfs_server_enable}" = X"YES" -a -r /etc/exports ]; then
---
> if [ "${nfs_server_enable}" = "YES" -a -r /etc/exports ]; then
330c330
< if [ "X${weak_mountd_authentication}" = X"YES" ]; then
---
> if [ "${weak_mountd_authentication}" = "YES" ]; then
334c334
< if [ "X${nfs_reserved_port_only}" = X"YES" ]; then
---
> if [ "${nfs_reserved_port_only}" = "YES" ]; then
339c339
< if [ "X$rpc_lockd_enable" = X"YES" ]; then
---
> if [ "${rpc_lockd_enable}" = "YES" ]; then
342c342
< if [ "X$rpc_statd_enable" = X"YES" ]; then
---
> if [ "${rpc_statd_enable}" = "YES" ]; then
347c347
< if [ "X${nfs_client_enable}" = X"YES" ]; then
---
> if [ "${nfs_client_enable}" = "YES" ]; then
349c349
< if [ "X${nfs_access_cache}" != X ]; then
---
> if [ "${nfs_access_cache}" != "X" ]; then
356c356
< if [ "X${amd_enable}" = X"YES" ]; then
---
> if [ "${amd_enable}" = "YES" ]; then
358c358
< if [ "X${amd_map_program}" != X"NO" ]; then
---
> if [ "${amd_map_program}" != "NO" ]; then
361c361
< if [ -n "$amd_flags" ]
---
> if [ -n "${amd_flags}" ]
369c369
< if [ "X${rwhod_enable}" = X"YES" ]; then
---
> if [ "${rwhod_enable}" = "YES" ]; then
374,375c374,375
< if [ "X${kerberos_server_enable}" = X"YES" ]; then
< if [ "X${kerberos_stash}" = "XYES" ]; then
---
> if [ "${kerberos_server_enable}" = "YES" ]; then
> if [ "${kerberos_stash}" = "YES" ]; then
382c382
< if [ "X${kadmind_server_enable}" = "XYES" ]; then
---
> if [ "${kadmind_server_enable}" = "YES" ]; then