diff -u vzctl-3.0.22/etc/vz.conf vzctl-3.0.22/etc/vz.conf --- vzctl-3.0.22/etc/vz.conf +++ vzctl-3.0.22/etc/vz.conf @@ -28,7 +28,7 @@ VE_ROOT=/var/lib/vz/root/$VEID VE_PRIVATE=/var/lib/vz/private/$VEID CONFIGFILE="vps.basic" -DEF_OSTEMPLATE="fedora-core-4" +DEF_OSTEMPLATE="ubuntu" ## Load vzwdog module VZWDOG="no" diff -u vzctl-3.0.22/debian/control vzctl-3.0.22/debian/control --- vzctl-3.0.22/debian/control +++ vzctl-3.0.22/debian/control @@ -1,7 +1,8 @@ Source: vzctl Section: admin Priority: optional -Maintainer: Ola Lundqvist +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ola Lundqvist Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.7.2 diff -u vzctl-3.0.22/debian/changelog vzctl-3.0.22/debian/changelog --- vzctl-3.0.22/debian/changelog +++ vzctl-3.0.22/debian/changelog @@ -1,3 +1,17 @@ +vzctl (3.0.22-5ubuntu1) hardy; urgency=low + + * Fix bashisms reported in Debian bug 472901, patch from Raphael + Geissert. Patched inline: + - bin/vzmigrate.in + - bin/vznetcfg.in + - bin/vzpid.in + * etc/vz.conf: + Use DEF_OSTEMPLATE="ubuntu" (LP: #218411) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Daniel Hahler Thu, 17 Apr 2008 00:37:08 +0200 + vzctl (3.0.22-5) unstable; urgency=low * Updated README.Debian to use /etc/sysctl.conf instead of depricated only in patch2: unchanged: --- vzctl-3.0.22.orig/bin/vzpid.in +++ vzctl-3.0.22/bin/vzpid.in @@ -30,7 +30,7 @@ getveid() { - local pid="$1" + local pid; pid="$1" [ -f "/proc/$pid/status" ] || return awk -v "pid=$pid" ' only in patch2: unchanged: --- vzctl-3.0.22.orig/bin/vznetcfg.in +++ vzctl-3.0.22/bin/vznetcfg.in @@ -26,7 +26,7 @@ init_veth() { - local dev="$1" + local dev; dev="$1" ip link set "$dev" up } only in patch2: unchanged: --- vzctl-3.0.22.orig/bin/vzmigrate.in +++ vzctl-3.0.22/bin/vzmigrate.in @@ -124,13 +124,13 @@ log () { if [ $1 -eq 0 ]; then shift - echo -e "Error: " $@ >&2 + printf "Error: " $@"\n" >&2 elif [ $1 -eq 1 ]; then shift - echo -e $@ + printf $@"\n" elif [ $verbose -eq 1 ]; then shift - echo -e " " $@ + printf " " $@"\n" fi }