diff --git a/bin/vznetcfg.in b/bin/vznetcfg.in index 876fc61..4eda20e 100755 --- a/bin/vznetcfg.in +++ b/bin/vznetcfg.in @@ -55,4 +55,10 @@ case "${CMD}$2" in exit 1 ;; esac + +# Call the post external script if defined +if [ -n "${POST_EXTERNAL_SCRIPT}" -a -x "${POST_EXTERNAL_SCRIPT}" ]; then + exec "${POST_EXTERNAL_SCRIPT}" $@ + : +fi exit 0 diff --git a/paths.am b/paths.am index 2e394ef..75ba17d 100644 --- a/paths.am +++ b/paths.am @@ -43,3 +43,4 @@ namesdir = $(pkgconfdir)/names vzdatadir = $(pkgdatadir)/scripts vzcrondir = $(pkgdatadir)/scripts +vznetdir = $(pkgdatadir)/scripts diff --git a/pathsubst.am b/pathsubst.am index 025c06a..6f4e05d 100644 --- a/pathsubst.am +++ b/pathsubst.am @@ -24,6 +24,7 @@ pathsubst_RULES = \ s!@'PKGDATADIR'@!$(pkgdatadir)!g; \ s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'CRONDDIR'@!$(cronddir)!g; \ + s!@'ETCNETDIR'@!$(etcnetdir)!g; \ s!@'DST_CRONDDIR'@!$(dst_cronddir)!g; diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6a2994a..d46dd6d 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -17,6 +17,9 @@ include $(top_srcdir)/pathsubst.am +vznet_SCRIPTS = \ + veth-update_bri + vzdata_SCRIPTS = \ vps-create \ vps-functions \ @@ -29,9 +32,11 @@ vzcron_SCRIPTS = \ vpsreboot EXTRA_DIST = \ + $(vznet_SCRIPTS:%=%.in) \ $(vzdata_SCRIPTS:%=%.in) \ $(vzcron_SCRIPTS:%=%.in) CLEANFILES = \ + $(vznet_SCRIPTS) \ $(vzdata_SCRIPTS) \ $(vzcron_SCRIPTS) diff --git a/scripts/veth-update_bri.in b/scripts/veth-update_bri.in new file mode 100755 index 0000000..4d3b6c7 --- /dev/null +++ b/scripts/veth-update_bri.in @@ -0,0 +1,7 @@ +#! /bin/sh + +if [ -x /sbin/brctl -a -x @ETCNETDIR@/scripts/setup-bri ]; then + /sbin/brctl show | \ + sed '1d;/^[[:space:]]/d;s/^\([^[:space:]]\+\)[[:space:]].*$/\1/' | \ + xargs -i @ETCNETDIR@/scripts/setup-bri {} +fi