From owner-svn-src-all@freebsd.org Sat Mar 12 23:04:11 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 929ABACE891; Sat, 12 Mar 2016 23:04:11 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60044153D; Sat, 12 Mar 2016 23:04:11 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CN4AiY048434; Sat, 12 Mar 2016 23:04:10 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CN4A8e048433; Sat, 12 Mar 2016 23:04:10 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201603122304.u2CN4A8e048433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 12 Mar 2016 23:04:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296776 - head/usr.sbin/pc-sysinstall/backend X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 23:04:11 -0000 Author: mav Date: Sat Mar 12 23:04:10 2016 New Revision: 296776 URL: https://svnweb.freebsd.org/changeset/base/296776 Log: dd report short write as error, so don't halt on it. Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Sat Mar 12 23:02:53 2016 (r296775) +++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Sat Mar 12 23:04:10 2016 (r296776) @@ -619,9 +619,9 @@ wipe_metadata() local SIZE="`diskinfo ${1} | awk '{print int($3/(1024*1024)) }'`" if [ "$SIZE" -gt "5" ] ; then rc_halt "dd if=/dev/zero of=${1} bs=1m count=1" - rc_halt "dd if=/dev/zero of=${1} bs=1m oseek=$((SIZE-4))" + rc_nohalt "dd if=/dev/zero of=${1} bs=1m oseek=$((SIZE-4))" else - rc_halt "dd if=/dev/zero of=${1} bs=128k" + rc_nohalt "dd if=/dev/zero of=${1} bs=128k" fi } ;