SAWADA Keiji
card_capto****@users*****
2006年 3月 29日 (水) 01:36:37 JST
Index: dlkit2/sv/install-client.sub diff -u dlkit2/sv/install-client.sub:1.1.2.2 dlkit2/sv/install-client.sub:1.1.2.3 --- dlkit2/sv/install-client.sub:1.1.2.2 Sun Mar 12 17:10:11 2006 +++ dlkit2/sv/install-client.sub Wed Mar 29 01:36:36 2006 @@ -219,6 +219,20 @@ fi done + # /etc/nsswitch.conf (again) + case "$CL_ETC_NSSWITCH_CONF" in + '*files*') + m4 -DSCHEME=files sv/nsswitch-templ.m4 > $pi_etc/nsswtich.conf ;; + '*nis*') + m4 -DSCHEME=nis sv/nsswitch-templ.m4 > $pi_etc/nsswtich.conf ;; + '*nisplus*') + m4 -DSCHEME=nisplus sv/nsswitch-templ.m4 > $pi_etc/nsswtich.conf ;; + '*dns*') + m4 -DSCHEME=dns sv/nsswitch-templ.m4 > $pi_etc/nsswtich.conf ;; + '*ldap*') + m4 -DSCHEME=ldap sv/nsswitch-templ.m4 > $pi_etc/nsswtich.conf ;; + esac + # /etc/inet/* for f in hosts ntp.conf; do var=`echo "cl_etc_inet_$f" | sed 's/\./_/g' | toupper` @@ -274,15 +288,6 @@ cp cl/s98xserver-check $pi_etc/rc2.d/S98xserver-check chmod a+x $pi_etc/rc2.d/S98xserver-check - # /etc/nsswitch.conf (again) - case "$CL_ETC_NSSWITCH_CONF" in - '*files*') echo 'files' > $trandir/nsswitch.templ ;; - '*nis*') echo 'nis' > $trandir/nsswitch.templ ;; - '*nisplus*') echo 'nisplus' > $trandir/nsswitch.templ ;; - '*dns*') echo 'dns' > $trandir/nsswitch.templ ;; - '*ldap*') echo 'ldap' > $trandir/nsswitch.templ ;; - esac - echo "." } Index: dlkit2/sv/nsswitch-templ.m4 diff -u /dev/null dlkit2/sv/nsswitch-templ.m4:1.1.2.1 --- /dev/null Wed Mar 29 01:36:36 2006 +++ dlkit2/sv/nsswitch-templ.m4 Wed Mar 29 01:36:36 2006 @@ -0,0 +1,41 @@ +dnl SCHEME is one of: files, dns, nis, nisplus, ldap + +define(DIR_SVC, ifelse(SCHEME, files, `', SCHEME, dns, `', SCHEME))dnl +define(FALLBACK_DIR_SVC, ifelse(SCHEME, files, `', SCHEME, dns, `', SCHEME [NOTFOUND=return]))dnl + +passwd: files DIR_SVC +group: files DIR_SVC + +define(DNSREOLV, ifelse(SCHEME, dns, dns))dnl +hosts: FALLBACK_DIR_SVC files DNSREOLV +ipnodes: FALLBACK_DIR_SVC files DNSREOLV + +networks: FALLBACK_DIR_SVC files +protocols: FALLBACK_DIR_SVC files +rpc: FALLBACK_DIR_SVC files +ethers: FALLBACK_DIR_SVC files +netmasks: FALLBACK_DIR_SVC files +bootparams: FALLBACK_DIR_SVC files + +define(PUBLICKEY, ifelse( + SCHEME, files, files, + SCHEME, dns, files, + SCHEME, nisplus, nisplus, + SCHEME [NOTFOUND=return] files))dnl +publickey: PUBLICKEY + +define(NETGROUP, ifelse(SCHEME, dns, files, SCHEME)) +netgroup: NETGROUP + +define(SERVICES, ifelse(SCHEME, dns, `', SCHEME, files, `', + SCHEME, nisplus, [NOTFOUND=return] nisplus, + SCHEME))dnl +automount: files DIR_SVC +aliases: files DIR_SVC +services: files SERVICES +printers: user files DIR_SVC + +auth_attr: files DIR_SVC +prof_attr: files DIR_SVC +define(PROJECT, ifelse(SCHEME, nis, nis, SCHEME, ldap, ldap)) +project: files PROJECT