wok-undigest annotate vzctl/stuff/vzctl-3.0.25.1-Makefile.u @ rev 201

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