wok annotate vzctl/stuff/vzctl-3.0.23.u @ rev 19561

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