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

(-)scripts/75_join.sh (-17 / +3 lines)
 Lines 66-89    Link Here 
66
	rm -f /var/lib/univention-ldap/ldap/*
66
	rm -f /var/lib/univention-ldap/ldap/*
67
fi
67
fi
68
68
69
# be sure the network is up and running
70
test -x /etc/init.d/networking && invoke-rc.d networking restart
71
69
if [ "$server_role" != "domaincontroller_master" ] && [ -n "$domain_controller_account" -a -n "$domain_controller_password" ]; then
72
if [ "$server_role" != "domaincontroller_master" ] && [ -n "$domain_controller_account" -a -n "$domain_controller_password" ]; then
70
	if [ -n "$eth0_type" ] && [ "$eth0_type" = "dynamic" -o "$eth0_type" = "dhcp" ]; then
71
		dhclient eth0
72
	else
73
		# be sure eth0 is up and running for join. Bug #19547
74
		if [ -n "$eth0_ip" ] ; then
75
			ifup eth0
76
		fi
77
		if [ -n "$eth1_ip" ] ; then
78
			ifup eth1
79
		fi
80
		if [ -n "$eth2_ip" ] ; then
81
			ifup eth2
82
		fi
83
		if [ -n "$eth3_ip" ] ; then
84
			ifup eth3
85
		fi
86
	fi
87
	if [ -z "$auto_join" ] || [ "$auto_join" != "FALSE" -a "$auto_join" != "false" -a "$auto_join" != "False" ]; then
73
	if [ -z "$auto_join" ] || [ "$auto_join" != "FALSE" -a "$auto_join" != "false" -a "$auto_join" != "False" ]; then
88
		# send number of join scripts to progress dialog
74
		# send number of join scripts to progress dialog
89
		CNT="\$(ls -1 /usr/lib/univention-install/*.inst | wc -l)"
75
		CNT="\$(ls -1 /usr/lib/univention-install/*.inst | wc -l)"

Return to bug 27931