Attachment #7077 for bug #34626

View | Details | Raw Unified | Return to bug 34626
Collapse All | Expand All

Lines 104-110 Link Here

(-)62ucs-school-master.inst (-1 / +1 lines)
104		104
105	# Added dns-$hostname to the ignore list	105	# Added dns-$hostname to the ignore list
106	if [ -z "$connector_s4_mapping_user_ignorelist" ]; then	106	if [ -z "$connector_s4_mapping_user_ignorelist" ]; then
107	ucr set connector/s4/mapping/user/ignorelist?"root,pcpatch,ucs-s4sync,dns-$hostname"	107	ucr set connector/s4/mapping/user/ignorelist?"root,ucs-s4sync,dns-$hostname"
108	else	108	else
109	echo $connector_s4_mapping_user_ignorelist \| egrep -q "(,dns-$hostname,\|^dns-$hostname,\|,dns-$hostname$)" \|\| \	109	echo $connector_s4_mapping_user_ignorelist \| egrep -q "(,dns-$hostname,\|^dns-$hostname,\|,dns-$hostname$)" \|\| \
110	ucr set connector/s4/mapping/user/ignorelist="$connector_s4_mapping_user_ignorelist,dns-$hostname"	110	ucr set connector/s4/mapping/user/ignorelist="$connector_s4_mapping_user_ignorelist,dns-$hostname"

Lines 133-139 Link Here

(-)62ucs-school-nonedu-slave.inst (-1 / +1 lines)
133	eval "$(ucr shell connector/s4/mapping/user/ignorelist)"	133	eval "$(ucr shell connector/s4/mapping/user/ignorelist)"
134		134
135	if [ -z "$connector_s4_mapping_user_ignorelist" ]; then	135	if [ -z "$connector_s4_mapping_user_ignorelist" ]; then
136	ucr set connector/s4/mapping/user/ignorelist?"root,pcpatch,ucs-s4sync,${user}"	136	ucr set connector/s4/mapping/user/ignorelist?"root,ucs-s4sync,${user}"
137	else	137	else
138	echo $connector_s4_mapping_user_ignorelist \| egrep -q "(,${user},\|^${user},\|,${user}$)" \|\| \	138	echo $connector_s4_mapping_user_ignorelist \| egrep -q "(,${user},\|^${user},\|,${user}$)" \|\| \
139	ucr set connector/s4/mapping/user/ignorelist="$connector_s4_mapping_user_ignorelist,${user}"	139	ucr set connector/s4/mapping/user/ignorelist="$connector_s4_mapping_user_ignorelist,${user}"

Lines 151-157 Link Here

(-)62ucs-school-slave.inst (-1 / +1 lines)
151	eval "$(ucr shell connector/s4/mapping/user/ignorelist)"	151	eval "$(ucr shell connector/s4/mapping/user/ignorelist)"
152		152
153	if [ -z "$connector_s4_mapping_user_ignorelist" ]; then	153	if [ -z "$connector_s4_mapping_user_ignorelist" ]; then
154	ucr set connector/s4/mapping/user/ignorelist?"root,pcpatch,ucs-s4sync,${user}"	154	ucr set connector/s4/mapping/user/ignorelist?"root,ucs-s4sync,${user}"
155	else	155	else
156	echo $connector_s4_mapping_user_ignorelist \| egrep -q "(,${user},\|^${user},\|,${user}$)" \|\| \	156	echo $connector_s4_mapping_user_ignorelist \| egrep -q "(,${user},\|^${user},\|,${user}$)" \|\| \
157	ucr set connector/s4/mapping/user/ignorelist="$connector_s4_mapping_user_ignorelist,${user}"	157	ucr set connector/s4/mapping/user/ignorelist="$connector_s4_mapping_user_ignorelist,${user}"

Return to bug 34626