wok-6.x view vzctl/stuff/vzctl-3.0.25.1-Makefile.u @ rev 22681

elilo: race condition
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jan 18 18:53:45 2020 +0100 (2020-01-18)
parents
children
line source
1 --- vzctl-3.0.25.1-ori/Makefile.am Fri Dec 24 12:45:32 2010
2 +++ vzctl-3.0.25.1/Makefile.am Fri Dec 31 09:27:42 2010
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_ALL = \
12 $(DISTRO_TARGETS) \
13 --- vzctl-3.0.25.1-ori/Makefile.in Fri Dec 24 12:45:44 2010
14 +++ vzctl-3.0.25.1/Makefile.in Fri Dec 31 09:27:42 2010
15 @@ -266,7 +266,8 @@
16 install-redhat \
17 install-gentoo \
18 install-suse \
19 - install-debian
20 + install-debian \
21 + install-slitaz
22
23 DISTRO_TARGETS_ALL = \
24 $(DISTRO_TARGETS) \
25 --- vzctl-3.0.25.1-ori/bin/Makefile.am Fri Dec 24 12:45:38 2010
26 +++ vzctl-3.0.25.1/bin/Makefile.am Fri Dec 31 09:35:38 2010
27 @@ -57,6 +57,8 @@
28
29 install-debian:
30
31 +install-slitaz:
32 +
33 install-gentoo:
34 @echo
35 @echo "***************************************************"
36 --- vzctl-3.0.25.1-ori/bin/Makefile.in Fri Dec 24 12:45:43 2010
37 +++ vzctl-3.0.25.1/bin/Makefile.in Fri Dec 31 09:35:39 2010
38 @@ -530,6 +530,8 @@
39
40 install-debian:
41
42 +install-slitaz:
43 +
44 install-gentoo:
45 @echo
46 @echo "***************************************************"
47 --- vzctl-3.0.25.1-ori/etc/Makefile.am Fri Dec 24 12:45:34 2010
48 +++ vzctl-3.0.25.1/etc/Makefile.am Fri Dec 31 09:27:42 2010
49 @@ -50,3 +50,6 @@
50 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
51 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
52 $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
53 +
54 +install-slitaz:
55 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
56 --- vzctl-3.0.25.1-ori/etc/Makefile.in Fri Dec 24 12:45:43 2010
57 +++ vzctl-3.0.25.1/etc/Makefile.in Fri Dec 31 09:27:42 2010
58 @@ -683,6 +683,10 @@
59 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
60 $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
61
62 +install-slitaz:
63 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
64 +
65 +
66 # Tell versions [3.59,3.63) of GNU make to not export all variables.
67 # Otherwise a system limit (for SysV at least) may be exceeded.
68 .NOEXPORT:
69 --- vzctl-3.0.25.1-ori/etc/init.d/Makefile.am Fri Dec 24 12:45:34 2010
70 +++ vzctl-3.0.25.1/etc/init.d/Makefile.am Fri Dec 31 09:27:42 2010
71 @@ -33,6 +33,8 @@
72
73 install-debian: install-redhat
74
75 +install-slitaz: install-redhat
76 +
77 install-gentoo: vz-gentoo vzeventd-gentoo
78 $(mkinstalldirs) $(DESTDIR)$(initddir)
79 $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
80 --- vzctl-3.0.25.1-ori/etc/init.d/Makefile.in Fri Dec 24 12:45:43 2010
81 +++ vzctl-3.0.25.1/etc/init.d/Makefile.in Fri Dec 31 09:27:40 2010
82 @@ -492,6 +492,8 @@
83
84 install-debian: install-redhat
85
86 +install-slitaz: install-redhat
87 +
88 install-gentoo: vz-gentoo vzeventd-gentoo
89 $(mkinstalldirs) $(DESTDIR)$(initddir)
90 $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
91 --- vzctl-3.0.25.1-ori/etc/init.d/initd-functions.in Fri Dec 24 12:45:35 2010
92 +++ vzctl-3.0.25.1/etc/init.d/initd-functions.in Sun Jan 2 14:29:21 2011
93 @@ -28,6 +28,9 @@
94 elif [ -r /etc/debian_version ]; then
95 DISTR=debian
96 VARLOCK=/var/lock
97 +elif [ -r /etc/slitaz-release ]; then
98 + DISTR=slitaz
99 + VARLOCK=/var/lock
100 fi
101
102 print_success()
103 --- vzctl-3.0.25.1-ori/etc/init.d/vz-redhat.in Fri Dec 24 12:45:35 2010
104 +++ vzctl-3.0.25.1/etc/init.d/vz-redhat.in Fri Dec 31 14:50:22 2010
105 @@ -189,7 +189,7 @@
106 if [ "${IPV6}" = "yes" ]; then
107 ip -6 addr add fe80::1/128 dev $VZDEV
108 fi
109 - sysctl -q -w net.ipv4.conf.$VZDEV.send_redirects=0
110 + sysctl -w net.ipv4.conf.$VZDEV.send_redirects=0
111 if [ "$(sysctl -n -e net.ipv4.ip_forward)" != "1" ]; then
112 print_warning "IP forwarding is not enabled"
113 fi
114 @@ -242,7 +242,7 @@
115 need_restart=""
116 velist=$(vzlist -aH -octid,onboot -s-bootorder |
117 awk '$2 == "yes" {print $1}')
118 - sysctl -q -w net.ipv4.route.src_check=0
119 + sysctl -w net.ipv4.route.src_check=0
120 for veid in $velist; do
121 [ "${veid}" = "0" ] && continue
122 __echo "Starting CT ${veid}: "
123 --- vzctl-3.0.25.1-ori/scripts/vps-create.in Fri Dec 24 12:45:37 2010
124 +++ vzctl-3.0.25.1/scripts/vps-create.in Fri Dec 31 14:53:35 2010
125 @@ -38,7 +38,7 @@
126 vzerror "Tarball does not exist: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT}
127 HEADER="$(od -A n -N 2 -t x1 -- "$PRIVATE_TEMPLATE")" ||
128 vzerror "Invalid tarball: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT}
129 - TMP="$(df -P "$VE_PRVT")" ||
130 + TMP="$(df "$VE_PRVT")" ||
131 vzerror "Failed to calculate available disk space on $VE_PRVT" ${VZ_FS_NEW_VE_PRVT}
132 AVAIL="$(echo "$TMP" | awk 'END{print $4}')"
133 if [ "$HEADER" = ' 1f 8b' ]; then