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

(-)file_not_specified_in_diff (-12 / +27 lines)
Line  Link Here
0
-- contrib/50-ALTLinux-desktop
0
++ contrib/50-ALTLinux-desktop
Lines 7-9 DHCP_CLIENT=/sbin/dhcpcd Link Here
7
DHCP_TIMEOUT=30
7
DHCP_TIMEOUT=30
8
DHCP_GRACE_TIME=2
8
DHCP_GRACE_TIME=2
9
DHCP_HOSTNAME=localhost
9
DHCP_HOSTNAME=localhost
10
-- contrib/50-ALTLinux-server
10
BRCTL=/sbin/brctl
11
++ contrib/50-ALTLinux-server
Lines 7-9 DHCP_CLIENT=/sbin/dhcpcd Link Here
7
DHCP_TIMEOUT=30
7
DHCP_TIMEOUT=30
8
DHCP_GRACE_TIME=2
8
DHCP_GRACE_TIME=2
9
DHCP_HOSTNAME=localhost
9
DHCP_HOSTNAME=localhost
10
-- etc/net/scripts/create-bri
10
BRCTL=/sbin/brctl
11
++ etc/net/scripts/create-bri
Lines 7-19 pickup_options Link Here
7
is_no "$IFUP_PARENTS" || \
7
is_no "$IFUP_PARENTS" || \
8
	: ${HOST:?HOST must be set for $NAME}
8
	: ${HOST:?HOST must be set for $NAME}
9
9
10
if profiled_filename PROF_BRCTL "$MYIFACEDIR/brctl"; then
11
	print_error "ignoring brctl-style options in $PROF_BRCTL"
12
fi
13
14
$IP link add $NAME type bridge
10
$IP link add $NAME type bridge
15
$IP link set $NAME type bridge $BRIDGE_OPTIONS
11
$IP link set $NAME type bridge $BRIDGE_OPTIONS ||:
12
13
if profiled_filename_exist PROF_BRCTL "$MYIFACEDIR/brctl"; then
14
	[ -x "${BRCTL:=$DEFAULT_BRCTL}" ] || {
15
		print_error "$PROF_BRCTL options file found, but $BRCTL does not exist or is not executable. Try installing bridge-utils RPM."
16
		exit 1
17
	}
18
19
	$DENOISE $PROF_BRCTL |
20
		trim |
21
		sed "s/ AUTO / $NAME /" |
22
		xargs --max-lines=1 --no-run-if-empty $BRCTL
16
23
17
for host in $HOST; do
24
	for host in $HOST; do
18
	$IP link set $host master $NAME && print_progress
25
		$BRCTL addif $NAME $host
19
done
26
	done
27
else
28
	for host in $HOST; do
29
		$IP link set $host master $NAME ||:
30
	done
31
fi && print_progress
20
-- etc/net/scripts/functions
32
++ etc/net/scripts/functions
Lines 23-28 DEFAULT_WPA_CLI=/usr/sbin/wpa_cli Link Here
23
DEFAULT_PLIPCONFIG=/sbin/plipconfig
23
DEFAULT_PLIPCONFIG=/sbin/plipconfig
24
DEFAULT_VCONFIG=/usr/bin/vconfig
24
DEFAULT_VCONFIG=/usr/bin/vconfig
25
DEFAULT_IPSECADM=/usr/sbin/ipsecadm
25
DEFAULT_IPSECADM=/usr/sbin/ipsecadm
26
DEFAULT_BRCTL=/usr/sbin/brctl
26
DEFAULT_ETHTOOL=/usr/sbin/ethtool
27
DEFAULT_ETHTOOL=/usr/sbin/ethtool
27
DEFAULT_RESOLVCONFTOOL=/sbin/resolvconf
28
DEFAULT_RESOLVCONFTOOL=/sbin/resolvconf
28
DEFAULT_PPPD=/usr/sbin/pppd
29
DEFAULT_PPPD=/usr/sbin/pppd
(-)a/etc/net/scripts/shutdown-bri (-1 / +1 lines)
Lines 5-9 init_netprofile Link Here
5
pickup_options
5
pickup_options
6
6
7
for host in $HOST; do
7
for host in $HOST; do
8
	$IP link set $host nomaster
8
	$IP link set $host nomaster ||:
9
done
9
done

Return to bug 33296