Attachment #2229 for bug #13147

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

Lines 55-58 case "${CMD}$2" in Link Here

(-)a/bin/vznetcfg.in (+6 lines)
55	exit 1	55	exit 1
56	;;	56	;;
57	esac	57	esac
		58
		59	# Call the post external script if defined
		60	if [ -n "${POST_EXTERNAL_SCRIPT}" -a -x "${POST_EXTERNAL_SCRIPT}" ]; then
		61	exec "${POST_EXTERNAL_SCRIPT}" $@
		62	:
		63	fi
58	exit 0	64	exit 0

Lines 43-45 namesdir = $(pkgconfdir)/names Link Here

(-)a/paths.am (+1 lines)
43		43
44	vzdatadir = $(pkgdatadir)/scripts	44	vzdatadir = $(pkgdatadir)/scripts
45	vzcrondir = $(pkgdatadir)/scripts	45	vzcrondir = $(pkgdatadir)/scripts
		46	vznetdir = $(pkgdatadir)/scripts

Lines 24-29 pathsubst_RULES = \ Link Here

(-)a/pathsubst.am (+1 lines)
24	s!@'PKGDATADIR'@!$(pkgdatadir)!g; \	24	s!@'PKGDATADIR'@!$(pkgdatadir)!g; \
25	s!@'PKGLIBDIR'@!$(pkglibdir)!g; \	25	s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
26	s!@'CRONDDIR'@!$(cronddir)!g; \	26	s!@'CRONDDIR'@!$(cronddir)!g; \
		27	s!@'ETCNETDIR'@!$(etcnetdir)!g; \
27	s!@'DST_CRONDDIR'@!$(dst_cronddir)!g;	28	s!@'DST_CRONDDIR'@!$(dst_cronddir)!g;
28		29
29		30

Lines 17-22 Link Here

(-)a/scripts/Makefile.am (+5 lines)
17		17
18	include $(top_srcdir)/pathsubst.am	18	include $(top_srcdir)/pathsubst.am
19		19
		20	vznet_SCRIPTS = \
		21	veth-update_bri
		22
20	vzdata_SCRIPTS = \	23	vzdata_SCRIPTS = \
21	vps-create \	24	vps-create \
22	vps-functions \	25	vps-functions \
Lines 29-37 vzcron_SCRIPTS = \ Link Here
29	vpsreboot	32	vpsreboot
30		33
31	EXTRA_DIST = \	34	EXTRA_DIST = \
		35	$(vznet_SCRIPTS:%=%.in) \
32	$(vzdata_SCRIPTS:%=%.in) \	36	$(vzdata_SCRIPTS:%=%.in) \
33	$(vzcron_SCRIPTS:%=%.in)	37	$(vzcron_SCRIPTS:%=%.in)
34		38
35	CLEANFILES = \	39	CLEANFILES = \
		40	$(vznet_SCRIPTS) \
36	$(vzdata_SCRIPTS) \	41	$(vzdata_SCRIPTS) \
37	$(vzcron_SCRIPTS)	42	$(vzcron_SCRIPTS)

Line 0 Link Here

(-)a/scripts/veth-update_bri.in (+7 lines)
	1	#! /bin/sh
	2
	3	if [ -x /sbin/brctl -a -x @ETCNETDIR@/scripts/setup-bri ]; then
	4	/sbin/brctl show \| \
	5	sed '1d;/^[[:space:]]/d;s/^$[^[:space:]]\+$[[:space:]].*$/\1/' \| \
	6	xargs -i @ETCNETDIR@/scripts/setup-bri {}
	7	fi

Return to bug 13147