Attachment #141405 for bug #206815

Lines 29-38 Link Here

(-)scriptlets.d.old/network (-4 / +10 lines)
29	# Don't bring down lo in auto mode.	29	# Don't bring down lo in auto mode.
30	[ "$int" = "lo" ] && continue	30	[ "$int" = "lo" ] && continue
31	fi	31	fi
32	vecho 2 "Bringing down interface $int"	32	# Only bring down interfaces that are actually up.
33	network_ifdown $int	33	if network_if_is_up $int ; then
34	[ $? -ne 0 ] && ret=1	34	vecho 2 "Bringing down interface $int"
35	NETWORK_DOWNEDIFS="$int $NETWORK_DOWNEDIFS"	35	network_ifdown $int
		36	[ $? -ne 0 ] && ret=1
		37	NETWORK_DOWNEDIFS="$int $NETWORK_DOWNEDIFS"
		38	fi
36	done	39	done
37	return $ret	40	return $ret
38	}	41	}
Lines 97-102 Link Here
97	network_ifdown() {	100	network_ifdown() {
98	[ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop	101	[ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop
99	}	102	}
		103	network_if_is_up() {
		104	[ -x "/etc/init.d/net.$1" ] && return `/etc/init.d/net.$1 --quiet status`
		105	}
100	;;	106	;;
101	suse)	107	suse)
102	network_ifup() {	108	network_ifup() {

Lines 15-20 Link Here

(-)scriptlets.d.old/xstatus (-1 / +4 lines)
15	### KDE bits:	15	### KDE bits:
16		16
17	XStatusProgressStart_kde() {	17	XStatusProgressStart_kde() {
		18	# Check if KDE is running.
		19	[ -z `pidof -s kdesktop` ] && return 1
		20
18	KDEPB_DCOPREF=	21	KDEPB_DCOPREF=
19		22
20	# Set $PATH for distros that aren't quite standard.	23	# Set $PATH for distros that aren't quite standard.
Lines 33-39 Link Here
33	return 0	36	return 0
34	fi	37	fi
35		38
36	KDEPB_DCOPREF="`su $XUSER -c \"$KSTART_BIN --windowclass KDialog --alldesktops $KDIALOG_BIN --title Hibernating --progressbar \\\"$1\\\" 100\"`"	39	KDEPB_DCOPREF="`su $XUSER -c \"$KSTART_BIN --windowclass KDialog --alldesktops $KDIALOG_BIN --title Hibernating --icon kmenu --progressbar \\\"$1\\\" 100\"`"
37	su $XUSER -c "$DCOP_BIN \"$KDEPB_DCOPREF\" showCancelButton 1"	40	su $XUSER -c "$DCOP_BIN \"$KDEPB_DCOPREF\" showCancelButton 1"
38	}	41	}
39		42

Return to bug 206815