wok diff vzctl/stuff/vzctl-3.0.25.1-Makefile.u @ rev 16858
xorg-base-fonts: temporary fix libxaw-apps crash.(Xterm ctrl click menu)
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Sun Jul 13 08:59:11 2014 +0300 (2014-07-13) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/vzctl/stuff/vzctl-3.0.25.1-Makefile.u Sun Jul 13 08:59:11 2014 +0300 1.3 @@ -0,0 +1,133 @@ 1.4 +--- vzctl-3.0.25.1-ori/Makefile.am Fri Dec 24 12:45:32 2010 1.5 ++++ vzctl-3.0.25.1/Makefile.am Fri Dec 31 09:27:42 2010 1.6 +@@ -49,7 +49,8 @@ 1.7 + install-redhat \ 1.8 + install-gentoo \ 1.9 + install-suse \ 1.10 +- install-debian 1.11 ++ install-debian\ 1.12 ++ install-slitaz 1.13 + 1.14 + DISTRO_TARGETS_ALL = \ 1.15 + $(DISTRO_TARGETS) \ 1.16 +--- vzctl-3.0.25.1-ori/Makefile.in Fri Dec 24 12:45:44 2010 1.17 ++++ vzctl-3.0.25.1/Makefile.in Fri Dec 31 09:27:42 2010 1.18 +@@ -266,7 +266,8 @@ 1.19 + install-redhat \ 1.20 + install-gentoo \ 1.21 + install-suse \ 1.22 +- install-debian 1.23 ++ install-debian \ 1.24 ++ install-slitaz 1.25 + 1.26 + DISTRO_TARGETS_ALL = \ 1.27 + $(DISTRO_TARGETS) \ 1.28 +--- vzctl-3.0.25.1-ori/bin/Makefile.am Fri Dec 24 12:45:38 2010 1.29 ++++ vzctl-3.0.25.1/bin/Makefile.am Fri Dec 31 09:35:38 2010 1.30 +@@ -57,6 +57,8 @@ 1.31 + 1.32 + install-debian: 1.33 + 1.34 ++install-slitaz: 1.35 ++ 1.36 + install-gentoo: 1.37 + @echo 1.38 + @echo "***************************************************" 1.39 +--- vzctl-3.0.25.1-ori/bin/Makefile.in Fri Dec 24 12:45:43 2010 1.40 ++++ vzctl-3.0.25.1/bin/Makefile.in Fri Dec 31 09:35:39 2010 1.41 +@@ -530,6 +530,8 @@ 1.42 + 1.43 + install-debian: 1.44 + 1.45 ++install-slitaz: 1.46 ++ 1.47 + install-gentoo: 1.48 + @echo 1.49 + @echo "***************************************************" 1.50 +--- vzctl-3.0.25.1-ori/etc/Makefile.am Fri Dec 24 12:45:34 2010 1.51 ++++ vzctl-3.0.25.1/etc/Makefile.am Fri Dec 31 09:27:42 2010 1.52 +@@ -50,3 +50,6 @@ 1.53 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.54 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d 1.55 + $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz 1.56 ++ 1.57 ++install-slitaz: 1.58 ++ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.59 +--- vzctl-3.0.25.1-ori/etc/Makefile.in Fri Dec 24 12:45:43 2010 1.60 ++++ vzctl-3.0.25.1/etc/Makefile.in Fri Dec 31 09:27:42 2010 1.61 +@@ -683,6 +683,10 @@ 1.62 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d 1.63 + $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz 1.64 + 1.65 ++install-slitaz: 1.66 ++ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 1.67 ++ 1.68 ++ 1.69 + # Tell versions [3.59,3.63) of GNU make to not export all variables. 1.70 + # Otherwise a system limit (for SysV at least) may be exceeded. 1.71 + .NOEXPORT: 1.72 +--- vzctl-3.0.25.1-ori/etc/init.d/Makefile.am Fri Dec 24 12:45:34 2010 1.73 ++++ vzctl-3.0.25.1/etc/init.d/Makefile.am Fri Dec 31 09:27:42 2010 1.74 +@@ -33,6 +33,8 @@ 1.75 + 1.76 + install-debian: install-redhat 1.77 + 1.78 ++install-slitaz: install-redhat 1.79 ++ 1.80 + install-gentoo: vz-gentoo vzeventd-gentoo 1.81 + $(mkinstalldirs) $(DESTDIR)$(initddir) 1.82 + $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 1.83 +--- vzctl-3.0.25.1-ori/etc/init.d/Makefile.in Fri Dec 24 12:45:43 2010 1.84 ++++ vzctl-3.0.25.1/etc/init.d/Makefile.in Fri Dec 31 09:27:40 2010 1.85 +@@ -492,6 +492,8 @@ 1.86 + 1.87 + install-debian: install-redhat 1.88 + 1.89 ++install-slitaz: install-redhat 1.90 ++ 1.91 + install-gentoo: vz-gentoo vzeventd-gentoo 1.92 + $(mkinstalldirs) $(DESTDIR)$(initddir) 1.93 + $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 1.94 +--- vzctl-3.0.25.1-ori/etc/init.d/initd-functions.in Fri Dec 24 12:45:35 2010 1.95 ++++ vzctl-3.0.25.1/etc/init.d/initd-functions.in Sun Jan 2 14:29:21 2011 1.96 +@@ -28,6 +28,9 @@ 1.97 + elif [ -r /etc/debian_version ]; then 1.98 + DISTR=debian 1.99 + VARLOCK=/var/lock 1.100 ++elif [ -r /etc/slitaz-release ]; then 1.101 ++ DISTR=slitaz 1.102 ++ VARLOCK=/var/lock 1.103 + fi 1.104 + 1.105 + print_success() 1.106 +--- vzctl-3.0.25.1-ori/etc/init.d/vz-redhat.in Fri Dec 24 12:45:35 2010 1.107 ++++ vzctl-3.0.25.1/etc/init.d/vz-redhat.in Fri Dec 31 14:50:22 2010 1.108 +@@ -189,7 +189,7 @@ 1.109 + if [ "${IPV6}" = "yes" ]; then 1.110 + ip -6 addr add fe80::1/128 dev $VZDEV 1.111 + fi 1.112 +- sysctl -q -w net.ipv4.conf.$VZDEV.send_redirects=0 1.113 ++ sysctl -w net.ipv4.conf.$VZDEV.send_redirects=0 1.114 + if [ "$(sysctl -n -e net.ipv4.ip_forward)" != "1" ]; then 1.115 + print_warning "IP forwarding is not enabled" 1.116 + fi 1.117 +@@ -242,7 +242,7 @@ 1.118 + need_restart="" 1.119 + velist=$(vzlist -aH -octid,onboot -s-bootorder | 1.120 + awk '$2 == "yes" {print $1}') 1.121 +- sysctl -q -w net.ipv4.route.src_check=0 1.122 ++ sysctl -w net.ipv4.route.src_check=0 1.123 + for veid in $velist; do 1.124 + [ "${veid}" = "0" ] && continue 1.125 + __echo "Starting CT ${veid}: " 1.126 +--- vzctl-3.0.25.1-ori/scripts/vps-create.in Fri Dec 24 12:45:37 2010 1.127 ++++ vzctl-3.0.25.1/scripts/vps-create.in Fri Dec 31 14:53:35 2010 1.128 +@@ -38,7 +38,7 @@ 1.129 + vzerror "Tarball does not exist: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT} 1.130 + HEADER="$(od -A n -N 2 -t x1 -- "$PRIVATE_TEMPLATE")" || 1.131 + vzerror "Invalid tarball: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT} 1.132 +- TMP="$(df -P "$VE_PRVT")" || 1.133 ++ TMP="$(df "$VE_PRVT")" || 1.134 + vzerror "Failed to calculate available disk space on $VE_PRVT" ${VZ_FS_NEW_VE_PRVT} 1.135 + AVAIL="$(echo "$TMP" | awk 'END{print $4}')" 1.136 + if [ "$HEADER" = ' 1f 8b' ]; then