wok view vzctl/stuff/vzctl-3.0.23.u @ rev 11800

ppp: build rp-pppoe.so (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Feb 25 11:17:36 2012 +0100 (2012-02-25)
parents
children
line source
1 --- vzctl-3.0.23-ori/Makefile.am Thu Oct 30 14:24:43 2008
2 +++ vzctl-3.0.23/Makefile.am Mon Nov 16 21:43:03 2009
3 @@ -49,7 +49,8 @@
4 install-redhat \
5 install-gentoo \
6 install-suse \
7 - install-debian
8 + install-debian \
9 + install-slitaz
10
11 $(DISTRO_TARGETS):
12 $(MAKE) $(AM_MAKEFLAGS) -C etc $@
13 --- vzctl-3.0.23-ori/Makefile.in Thu Oct 30 14:24:52 2008
14 +++ vzctl-3.0.23/Makefile.in Mon Nov 16 21:43:03 2009
15 @@ -217,7 +217,8 @@
16 install-redhat \
17 install-gentoo \
18 install-suse \
19 - install-debian
20 + install-debian \
21 + install-slitaz
22
23 all: all-recursive
24
25 --- vzctl-3.0.23-ori/etc/Makefile.am Thu Oct 30 14:24:43 2008
26 +++ vzctl-3.0.23/etc/Makefile.am Mon Nov 16 21:43:03 2009
27 @@ -43,6 +43,9 @@
28
29 install-debian:
30 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
31 +
32 +install-slitaz:
33 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
34
35 install-gentoo:
36 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
37 --- vzctl-3.0.23-ori/etc/Makefile.in Thu Oct 30 14:24:49 2008
38 +++ vzctl-3.0.23/etc/Makefile.in Mon Nov 16 21:43:03 2009
39 @@ -563,6 +563,9 @@
40 install-debian:
41 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
42
43 +install-slitaz:
44 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
45 +
46 install-gentoo:
47 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
48 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
49 --- vzctl-3.0.23-ori/etc/init.d/Makefile.am Thu Oct 30 14:24:43 2008
50 +++ vzctl-3.0.23/etc/init.d/Makefile.am Mon Nov 16 21:46:42 2009
51 @@ -31,6 +31,11 @@
52
53 install-debian: install-redhat
54
55 +install-slitaz:
56 + $(mkinstalldirs) $(DESTDIR)$(initddir)
57 + $(INSTALL_SCRIPT) vz-redhat $(DESTDIR)$(initddir)/vz
58 + sed -e 's!/subsys!!'
59 +
60 install-gentoo: vz-gentoo
61 $(mkinstalldirs) $(DESTDIR)$(initddir)
62 $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
63 --- vzctl-3.0.23-ori/etc/init.d/Makefile.in Thu Oct 30 14:24:50 2008
64 +++ vzctl-3.0.23/etc/init.d/Makefile.in Mon Nov 16 22:12:15 2009
65 @@ -404,6 +404,11 @@
66
67 install-debian: install-redhat
68
69 +install-slitaz: install-redhat
70 + sed -i -e 's!/subsys!!' $(DESTDIR)$(initddir)/vz
71 + sed -i -e 's/sysctl -q/sysctl -n/' $(DESTDIR)$(initddir)/vz
72 +
73 +
74 install-gentoo: vz-gentoo
75 $(mkinstalldirs) $(DESTDIR)$(initddir)
76 $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
77 --- vzctl-3.0.23-ori/scripts/vps-create.in Thu Oct 30 14:24:43 2008
78 +++ vzctl-3.0.23/scripts/vps-create.in Mon Nov 16 22:26:20 2009
79 @@ -37,7 +37,7 @@
80 vzerror "Tarball does not exist: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT}
81 HEADER="$(od -A n -N 2 -t x1 -- "$PRIVATE_TEMPLATE")" ||
82 vzerror "Invalid tarball: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT}
83 - TMP="$(df -P "$VE_PRVT")" ||
84 + TMP="$(df "$VE_PRVT")" ||
85 vzerror "Failed to calculate available disk space on $VE_PRVT" ${VZ_FS_NEW_VE_PRVT}
86 AVAIL="$(echo "$TMP" | awk 'END{print $4}')"
87 if [ "$HEADER" = ' 1f 8b' ]; then
88 --- vzctl-3.0.23-ori/scripts/vps-functions.in Thu Oct 30 14:24:43 2008
89 +++ vzctl-3.0.23/scripts/vps-functions.in Mon Nov 16 22:25:52 2009
90 @@ -126,10 +126,10 @@
91
92 route="$(${IP_CMD} route get "$1" |grep ' dev .* src ')"
93 # match: $1 ... dev $dev ...
94 - dev="$(echo "$route" |sed -ne '/ via /! s/^.* dev \+\([^ ]\+\) .*$/\1/p;Q')"
95 + dev="$(echo "$route" |sed -ne '/ via /! s/^.* dev \+\([^ ]\+\) .*$/\1/p;q')"
96 [ -n "$dev" ] ||
97 # match: $1 ... via $1 ... dev $dev ...
98 - dev="$(echo "$route" |sed -ne 's/^\([^ ]\+\) \(.* \)\?via \+\1 \(.* \)\?dev \+\([^ ]\+\) .*$/\4/p;Q')"
99 + dev="$(echo "$route" |sed -ne 's/^\([^ ]\+\) \(.* \)\?via \+\1 \(.* \)\?dev \+\([^ ]\+\) .*$/\4/p;q')"
100 [ -n "$dev" ] || return 0
101
102 for netdev in $NETDEVICES; do