wok-6.x annotate vzctl/stuff/vzctl-3.0.25.1-Makefile.u @ rev 14593

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