From owner-svn-src-all@FreeBSD.ORG  Tue Feb 22 19:37:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 82FF51065670;
	Tue, 22 Feb 2011 19:37:12 +0000 (UTC)
	(envelope-from jpaetzel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 710BC8FC13;
	Tue, 22 Feb 2011 19:37:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MJbCon019330;
	Tue, 22 Feb 2011 19:37:12 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MJbChP019328;
	Tue, 22 Feb 2011 19:37:12 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201102221937.p1MJbChP019328@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Tue, 22 Feb 2011 19:37:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218960 - head/usr.sbin/pc-sysinstall/backend
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Feb 2011 19:37:12 -0000

Author: jpaetzel
Date: Tue Feb 22 19:37:12 2011
New Revision: 218960
URL: http://svn.freebsd.org/changeset/base/218960

Log:
  Added patch-functions-upgrade which should fix some kernel panics
  doing upgrades and uninstalling linux compat ports.
  
  Submitted by:	Joerg-Christian Boehme <joerg@chaosdorf.de>
  Approved by:	kib (mentor, implicit)

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh	Tue Feb 22 19:18:56 2011	(r218959)
+++ head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh	Tue Feb 22 19:37:12 2011	(r218960)
@@ -58,7 +58,7 @@ mount_target_slice()
   zfs mount -a
 
   # Mount all the fstab goodies on disk
-  chroot ${FSMNT} /sbin/mount -a >>${LOGOUT} 2>>${LOGOUT}
+  chroot ${FSMNT} /sbin/mount -a -t nolinprocfs >>${LOGOUT} 2>>${LOGOUT
   chroot ${FSMNT} umount /proc >/dev/null 2>/dev/null 
   chroot ${FSMNT} umount /compat/linux/proc  >/dev/null 2>/dev/null
 
@@ -79,7 +79,7 @@ mount_target_slice()
   if [ "$INSTALLTYPE" != "FreeBSD" ]
   then
     echo_log "Removing old packages, this may take a while... Please wait..."
-    echo '#/bin/sh
+    echo '#!/bin/sh
 for i in `pkg_info -E \*`
 do
   echo "Uninstalling package: ${i}"