]> git.pld-linux.org Git - packages/vzctl.git/blame - vzctl-pld.patch
projects / packages / vzctl.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- libtoolize?
[packages/vzctl.git] / vzctl-pld.patch
CommitLineData
88d20d00
TP		 1diff -Nru vzctl-3.0.25.1.orig/bin/Makefile.am vzctl-3.0.25.1/bin/Makefile.am
2--- vzctl-3.0.25.1.orig/bin/Makefile.am 2010-12-24 12:45:38.000000000 +0100
3+++ vzctl-3.0.25.1/bin/Makefile.am 2011-01-03 10:44:51.000000000 +0100
4@@ -48,6 +48,27 @@
5 echo " ***************************************************"; \
6 echo; \
7 fi
8+install-pld-from-spec:
9+
10+install-pld:
11+ @if [ ! -e "$(DESTDIR)/sbin/ifup-local" -a \
12+ ! -L "$(DESTDIR)/sbin/ifup-local" ]; then \
13+ $(MKDIR_P) "$(DESTDIR)/sbin"; \
14+ $(LN_S) "..$(sbindir)/vzifup-post" \
15+ "$(DESTDIR)/sbin/ifup-local"; \
16+ elif readlink "$(DESTDIR)/sbin/ifup-local" | \
17+ fgrep -q vzifup-post; then \
18+ true; \
19+ else \
20+ echo; \
21+ echo " ***************************************************"; \
22+ echo " WARNING: file $(DESTDIR)/sbin/ifup-local is present!"; \
23+ echo " You have to manually edit the above file so that "; \
24+ echo " it calls $(sbindir)/vzifup-post"; \
25+ echo " ***************************************************"; \
26+ echo; \
27+ fi
28+
29
30
31 install-suse:
32diff -Nru vzctl-3.0.25.1.orig/etc/dists/Makefile.am vzctl-3.0.25.1/etc/dists/Makefile.am
33--- vzctl-3.0.25.1.orig/etc/dists/Makefile.am 2010-12-24 12:45:35.000000000 +0100
34+++ vzctl-3.0.25.1/etc/dists/Makefile.am 2011-01-03 10:44:51.000000000 +0100
35@@ -89,6 +89,9 @@
36 $(INSTALL_DATA) $(srcdir)/fedora-core.conf \
37 $(DESTDIR)$(distconfdir)/fedora.conf
38
39+pld:
40+ $(INSTALL_DATA) $(srcdir)/pld.conf $(DESTDIR)$(distconfdir)/pld.conf
41+
42 gentoo:
43 $(INSTALL_DATA) $(srcdir)/gentoo.conf $(DESTDIR)$(distconfdir)/gentoo.conf
44
45@@ -169,6 +172,7 @@
46 debian \
47 fc \
48 fedora \
49+ pld \
50 gentoo \
51 mandrake \
52 owl \
53diff -Nru vzctl-3.0.25.1.orig/etc/init.d/initd-functions.in vzctl-3.0.25.1/etc/init.d/initd-functions.in
54--- vzctl-3.0.25.1.orig/etc/init.d/initd-functions.in 2010-12-24 12:45:35.000000000 +0100
55+++ vzctl-3.0.25.1/etc/init.d/initd-functions.in 2011-01-05 16:17:46.000000000 +0100
56@@ -16,9 +16,12 @@
57
58 # Source function library.
59 if [ -r /etc/init.d/functions ]; then
60- source /etc/init.d/functions
61 if [ -r /etc/redhat-release ] || [ -r /etc/centos-release ]; then
62+ source /etc/init.d/functions
63 DISTR=redhat
64+ elif [ -r /etc/pld-release ]; then
65+ . /etc/init.d/functions
66+ DISTR=pld
67 fi
68 elif [ -r /etc/rc.status ]; then
69 source /etc/rc.status
70@@ -34,6 +37,8 @@
71 {
72 if [ "$DISTR" = "redhat" ]; then
73 echo_success
74+ elif [ "$DISTR" = "pld" ]; then
75+ ok
76 else
77 echo -n "$rc_done"
78 fi
79@@ -42,9 +47,10 @@
80
81 print_failure()
82 {
83- echo -n "$1"
84 if [ "$DISTR" = "redhat" ]; then
85 failure $"$1"
86+ elif [ "$DISTR" = "pld" ]; then
87+ fail
88 else
89 echo -n "$rc_failed"
90 fi
91@@ -56,6 +62,8 @@
92 if [ "$DISTR" = "redhat" ]; then
93 echo -n "$1"
94 warning $"$1"
95+ elif [ "$DISTR" = "pld" ]; then
96+ nls -n "$1"
97 else
98 echo -n "- Warning: $1 "
99 fi
100@@ -67,15 +75,23 @@
101 print_result()
102 {
103 if [ $? -eq 0 ] ; then
104- print_success
105+ if [ "$DISTR" = "pld" ]; then
106+ ok
107+ else
108+ print_success
109+ fi
110 else
111- print_failure "$1"
112+ if [ "$DISTR" = "pld" ]; then
113+ fail
114+ else
115+ print_failure "$1"
116+ fi
117 fi
118 }
119
120 __echo()
121 {
122- if [ "$DISTR" = "redhat" ]; then
123+ if [ "$DISTR" = "redhat" ] || [ "$DISTR" = "pld" ]; then
124 echo -n $"$1"
125 else
126 echo -n "$1"
127@@ -85,7 +101,7 @@
128 vzdaemon_start()
129 {
130 case $DISTR in
131- redhat)
132+ redhat|pld)
133 daemon $*
134 ;;
135 suse)
136@@ -102,7 +118,7 @@
137 vzdaemon_stop()
138 {
139 case $DISTR in
140- redhat|suse)
141+ redhat|suse|pld)
142 killproc $*
143 ;;
144 debian)
145@@ -119,7 +135,7 @@
146 shift
147
148 case $DISTR in
149- redhat|suse)
150+ redhat|suse|pld)
151 status $p
152 ;;
153 debian)
154diff -Nru vzctl-3.0.25.1.orig/etc/init.d/Makefile.am vzctl-3.0.25.1/etc/init.d/Makefile.am
155--- vzctl-3.0.25.1.orig/etc/init.d/Makefile.am 2010-12-24 12:45:34.000000000 +0100
156+++ vzctl-3.0.25.1/etc/init.d/Makefile.am 2011-01-03 10:46:14.000000000 +0100
157@@ -15,7 +15,7 @@
158 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
159 #
160
161-INITSCRIPTS = vz-redhat vz-gentoo vzeventd-redhat vzeventd-gentoo
162+INITSCRIPTS = vz-redhat vz-gentoo vz-pld vzeventd-pld vzeventd-redhat vzeventd-gentoo
163 vzlib_DATA = initd-functions
164
165 EXTRA_DIST = $(INITSCRIPTS:%=%.in) $(vzlib_DATA:%=%.in)
166@@ -29,6 +29,12 @@
167 $(INSTALL_SCRIPT) vz-redhat $(DESTDIR)$(initddir)/vz
168 $(INSTALL_SCRIPT) vzeventd-redhat $(DESTDIR)$(initddir)/vzeventd
169
170+install-pld: vz-pld vzeventd-pld
171+ $(mkinstalldirs) $(DESTDIR)$(initddir)
172+ $(INSTALL_SCRIPT) vz-pld $(DESTDIR)$(initddir)/vz
173+ $(INSTALL_SCRIPT) vzeventd-pld $(DESTDIR)$(initddir)/vzeventd
174+
175+
176 install-suse: install-redhat
177
178 install-debian: install-redhat
179diff -Nru vzctl-3.0.25.1.orig/etc/Makefile.am vzctl-3.0.25.1/etc/Makefile.am
180--- vzctl-3.0.25.1.orig/etc/Makefile.am 2010-12-24 12:45:34.000000000 +0100
181+++ vzctl-3.0.25.1/etc/Makefile.am 2011-01-03 10:44:51.000000000 +0100
182@@ -34,6 +34,11 @@
183 install-data-local:
184 $(mkinstalldirs) $(DESTDIR)$(namesdir)
185
186+install-pld-from-spec: install-pld
187+install-pld:
188+ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
189+ $(MAKE) $(AM_MAKEFLAGS) -C network-scripts $@
190+
191 install-redhat-from-spec: install-redhat
192 install-redhat:
193 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
194diff -Nru vzctl-3.0.25.1.orig/etc/network-scripts/Makefile.am vzctl-3.0.25.1/etc/network-scripts/Makefile.am
195--- vzctl-3.0.25.1.orig/etc/network-scripts/Makefile.am 2010-12-24 12:45:35.000000000 +0100
196+++ vzctl-3.0.25.1/etc/network-scripts/Makefile.am 2011-01-03 10:44:51.000000000 +0100
197@@ -38,3 +38,11 @@
198 for file in $(NETSDATA); do \
199 $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(netsdir)/$$file; \
200 done
201+install-pld: $(NETSSCRIPTS)
202+ $(mkinstalldirs) $(DESTDIR)$(netsdir)
203+ for file in $(NETSSCRIPTS); do \
204+ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(netsdir)/$$file; \
205+ done
206+ for file in $(NETSDATA); do \
207+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(netsdir)/$$file; \
208+ done
209diff -Nru vzctl-3.0.25.1.orig/Makefile.am vzctl-3.0.25.1/Makefile.am
210--- vzctl-3.0.25.1.orig/Makefile.am 2010-12-24 12:45:32.000000000 +0100
211+++ vzctl-3.0.25.1/Makefile.am 2011-01-03 10:44:51.000000000 +0100
212@@ -46,6 +46,7 @@
213 $(mkinstalldirs) $(DESTDIR)$(modulesdir)
214
215 DISTRO_TARGETS = \
216+ install-pld \
217 install-redhat \
218 install-gentoo \
219 install-suse \
220@@ -53,7 +54,8 @@
221
222 DISTRO_TARGETS_ALL = \
223 $(DISTRO_TARGETS) \
224- install-redhat-from-spec
225+ install-redhat-from-spec \
226+ install-pld-from-spec
227
228 $(DISTRO_TARGETS_ALL):
229 $(MAKE) $(AM_MAKEFLAGS) -C etc $@
OpenVZ containers control utility
This page took 0.273844 seconds and 4 git commands to generate.