wok-6.x diff vzctl/stuff/vzctl-3.0.23.u @ rev 13745
Up: mc, mhwaveedit, viewnior
author | Alexander Medvedev <devl547@gmail.com> |
---|---|
date | Mon Dec 31 12:03:41 2012 +0300 (2012-12-31) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/vzctl/stuff/vzctl-3.0.23.u Mon Dec 31 12:03:41 2012 +0300 1.3 @@ -0,0 +1,102 @@ 1.4 +--- vzctl-3.0.23-ori/Makefile.am Thu Oct 30 14:24:43 2008 1.5 ++++ vzctl-3.0.23/Makefile.am Mon Nov 16 21:43:03 2009 1.6 +@@ -49,7 +49,8 @@ 1.7 + install-redhat \ 1.8 + install-gentoo \ 1.9 + install-suse \ 1.10 +- install-debian 1.11 ++ install-debian \ 1.12 ++ install-slitaz 1.13 + 1.14 + $(DISTRO_TARGETS): 1.15 + $(MAKE) $(AM_MAKEFLAGS) -C etc $@ 1.16 +--- vzctl-3.0.23-ori/Makefile.in Thu Oct 30 14:24:52 2008 1.17 ++++ vzctl-3.0.23/Makefile.in Mon Nov 16 21:43:03 2009 1.18 +@@ -217,7 +217,8 @@ 1.19 + install-redhat \ 1.20 + install-gentoo \ 1.21 + install-suse \ 1.22 +- install-debian 1.23 ++ install-debian \ 1.24 ++ install-slitaz 1.25 + 1.26 + all: all-recursive 1.27 + 1.28 +--- vzctl-3.0.23-ori/etc/Makefile.am Thu Oct 30 14:24:43 2008 1.29 ++++ vzctl-3.0.23/etc/Makefile.am Mon Nov 16 21:43:03 2009 1.30 +@@ -43,6 +43,9 @@ 1.31 + 1.32 + install-debian: 1.33 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.34 ++ 1.35 ++install-slitaz: 1.36 ++ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.37 + 1.38 + install-gentoo: 1.39 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.40 +--- vzctl-3.0.23-ori/etc/Makefile.in Thu Oct 30 14:24:49 2008 1.41 ++++ vzctl-3.0.23/etc/Makefile.in Mon Nov 16 21:43:03 2009 1.42 +@@ -563,6 +563,9 @@ 1.43 + install-debian: 1.44 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.45 + 1.46 ++install-slitaz: 1.47 ++ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.48 ++ 1.49 + install-gentoo: 1.50 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.51 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d 1.52 +--- vzctl-3.0.23-ori/etc/init.d/Makefile.am Thu Oct 30 14:24:43 2008 1.53 ++++ vzctl-3.0.23/etc/init.d/Makefile.am Mon Nov 16 21:46:42 2009 1.54 +@@ -31,6 +31,11 @@ 1.55 + 1.56 + install-debian: install-redhat 1.57 + 1.58 ++install-slitaz: 1.59 ++ $(mkinstalldirs) $(DESTDIR)$(initddir) 1.60 ++ $(INSTALL_SCRIPT) vz-redhat $(DESTDIR)$(initddir)/vz 1.61 ++ sed -e 's!/subsys!!' 1.62 ++ 1.63 + install-gentoo: vz-gentoo 1.64 + $(mkinstalldirs) $(DESTDIR)$(initddir) 1.65 + $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 1.66 +--- vzctl-3.0.23-ori/etc/init.d/Makefile.in Thu Oct 30 14:24:50 2008 1.67 ++++ vzctl-3.0.23/etc/init.d/Makefile.in Mon Nov 16 22:12:15 2009 1.68 +@@ -404,6 +404,11 @@ 1.69 + 1.70 + install-debian: install-redhat 1.71 + 1.72 ++install-slitaz: install-redhat 1.73 ++ sed -i -e 's!/subsys!!' $(DESTDIR)$(initddir)/vz 1.74 ++ sed -i -e 's/sysctl -q/sysctl -n/' $(DESTDIR)$(initddir)/vz 1.75 ++ 1.76 ++ 1.77 + install-gentoo: vz-gentoo 1.78 + $(mkinstalldirs) $(DESTDIR)$(initddir) 1.79 + $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 1.80 +--- vzctl-3.0.23-ori/scripts/vps-create.in Thu Oct 30 14:24:43 2008 1.81 ++++ vzctl-3.0.23/scripts/vps-create.in Mon Nov 16 22:26:20 2009 1.82 +@@ -37,7 +37,7 @@ 1.83 + vzerror "Tarball does not exist: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT} 1.84 + HEADER="$(od -A n -N 2 -t x1 -- "$PRIVATE_TEMPLATE")" || 1.85 + vzerror "Invalid tarball: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT} 1.86 +- TMP="$(df -P "$VE_PRVT")" || 1.87 ++ TMP="$(df "$VE_PRVT")" || 1.88 + vzerror "Failed to calculate available disk space on $VE_PRVT" ${VZ_FS_NEW_VE_PRVT} 1.89 + AVAIL="$(echo "$TMP" | awk 'END{print $4}')" 1.90 + if [ "$HEADER" = ' 1f 8b' ]; then 1.91 +--- vzctl-3.0.23-ori/scripts/vps-functions.in Thu Oct 30 14:24:43 2008 1.92 ++++ vzctl-3.0.23/scripts/vps-functions.in Mon Nov 16 22:25:52 2009 1.93 +@@ -126,10 +126,10 @@ 1.94 + 1.95 + route="$(${IP_CMD} route get "$1" |grep ' dev .* src ')" 1.96 + # match: $1 ... dev $dev ... 1.97 +- dev="$(echo "$route" |sed -ne '/ via /! s/^.* dev \+\([^ ]\+\) .*$/\1/p;Q')" 1.98 ++ dev="$(echo "$route" |sed -ne '/ via /! s/^.* dev \+\([^ ]\+\) .*$/\1/p;q')" 1.99 + [ -n "$dev" ] || 1.100 + # match: $1 ... via $1 ... dev $dev ... 1.101 +- dev="$(echo "$route" |sed -ne 's/^\([^ ]\+\) \(.* \)\?via \+\1 \(.* \)\?dev \+\([^ ]\+\) .*$/\4/p;Q')" 1.102 ++ dev="$(echo "$route" |sed -ne 's/^\([^ ]\+\) \(.* \)\?via \+\1 \(.* \)\?dev \+\([^ ]\+\) .*$/\4/p;q')" 1.103 + [ -n "$dev" ] || return 0 1.104 + 1.105 + for netdev in $NETDEVICES; do