[pve-devel] r5828 - in pve-manager/trunk: . bin debian lib/PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-04-20 06:46:03 +0200 (Wed, 20 Apr 2011)
New Revision: 5828

Removed:
   pve-manager/trunk/bin/pvebash
Modified:
   pve-manager/trunk/ChangeLog
   pve-manager/trunk/bin/Makefile.am
   pve-manager/trunk/configure.in
   pve-manager/trunk/debian/changelog.Debian
   pve-manager/trunk/lib/PVE/ConfigServer.pm
Log:


Modified: pve-manager/trunk/ChangeLog
===================================================================
--- pve-manager/trunk/ChangeLog	2011-04-19 10:10:24 UTC (rev 5827)
+++ pve-manager/trunk/ChangeLog	2011-04-20 04:46:03 UTC (rev 5828)
@@ -1,3 +1,8 @@
+2011-04-20  Proxmox Support Team  <support at proxmox.com>
+
+	* lib/PVE/ConfigServer.pm (create_vnc_console): disable chrooted
+	environment (pvebash)
+
 2011-03-25  Proxmox Support Team  <support at proxmox.com>
 
 	* www/root/qemu/index.htm: add anti CSRF token for destroy link.

Modified: pve-manager/trunk/bin/Makefile.am
===================================================================
--- pve-manager/trunk/bin/Makefile.am	2011-04-19 10:10:24 UTC (rev 5827)
+++ pve-manager/trunk/bin/Makefile.am	2011-04-20 04:46:03 UTC (rev 5828)
@@ -8,7 +8,6 @@
 	pvecert			\
 	pvebanner		\
 	pvectl			\
-	pvebash			\
 	pvedaemon		\
 	pvetunnel		\
 	pvemirror		\

Deleted: pve-manager/trunk/bin/pvebash
===================================================================
--- pve-manager/trunk/bin/pvebash	2011-04-19 10:10:24 UTC (rev 5827)
+++ pve-manager/trunk/bin/pvebash	2011-04-20 04:46:03 UTC (rev 5828)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-export PS1="VM$1 $2:\\w\\\$ ";
-umask 022
-
-exec /usr/sbin/chroot /var/lib/vz/$2/$1 /bin/bash --norc
-exec /usr/sbin/chroot /var/lib/vz/$2/$1 /bin/sh --norc
-

Modified: pve-manager/trunk/configure.in
===================================================================
--- pve-manager/trunk/configure.in	2011-04-19 10:10:24 UTC (rev 5827)
+++ pve-manager/trunk/configure.in	2011-04-20 04:46:03 UTC (rev 5828)
@@ -4,7 +4,7 @@
 
 prefix=/usr
 
-PACKAGERELEASE=15
+PACKAGERELEASE=16
 AC_SUBST(PACKAGERELEASE)
 
 REPOID=`svnversion .`

Modified: pve-manager/trunk/debian/changelog.Debian
===================================================================
--- pve-manager/trunk/debian/changelog.Debian	2011-04-19 10:10:24 UTC (rev 5827)
+++ pve-manager/trunk/debian/changelog.Debian	2011-04-20 04:46:03 UTC (rev 5828)
@@ -1,3 +1,10 @@
+pve-manager (1.8-16) unstable; urgency=low
+
+  * disable chrooted environment (remove pvebash). That feature is not
+    really used and is considered dangerous.
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 20 Apr 2011 06:44:46 +0200
+
 pve-manager (1.8-15) unstable; urgency=low
 
   * further CSRF fixes

Modified: pve-manager/trunk/lib/PVE/ConfigServer.pm
===================================================================
--- pve-manager/trunk/lib/PVE/ConfigServer.pm	2011-04-19 10:10:24 UTC (rev 5827)
+++ pve-manager/trunk/lib/PVE/ConfigServer.pm	2011-04-20 04:46:03 UTC (rev 5828)
@@ -1099,13 +1099,7 @@
 	my $vzcmd;
 
 	if ($type eq 'openvz') {
-	    if ($status eq 'running') {
-		$vzcmd = [ '/usr/sbin/vzctl', 'enter', $veid ];
-	    } elsif ($status eq 'mounted') {
-		$vzcmd = [ "/usr/bin/pvebash", $veid, 'root'];
-	    } else {
-		$vzcmd = [ "/usr/bin/pvebash", $veid, 'private'];
-	    }
+	    $vzcmd = [ '/usr/sbin/vzctl', 'enter', $veid ];
 	} elsif ($type eq 'qemu') {
 	    $vzcmd = [ "/usr/sbin/qm", 'monitor', $veid ];
 	} else {