From owner-svn-src-head@freebsd.org Sun Apr 24 10:53:01 2016 Return-Path: Delivered-To: svn-src-head@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 210B4B19ED5; Sun, 24 Apr 2016 10:53:01 +0000 (UTC) (envelope-from schweikh@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 E69A71ADE; Sun, 24 Apr 2016 10:53:00 +0000 (UTC) (envelope-from schweikh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OAr0qe072181; Sun, 24 Apr 2016 10:53:00 GMT (envelope-from schweikh@FreeBSD.org) Received: (from schweikh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OAr0bn072180; Sun, 24 Apr 2016 10:53:00 GMT (envelope-from schweikh@FreeBSD.org) Message-Id: <201604241053.u3OAr0bn072180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: schweikh set sender to schweikh@FreeBSD.org using -f From: Jens Schweikhardt Date: Sun, 24 Apr 2016 10:53:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298537 - head/etc/rc.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 10:53:01 -0000 Author: schweikh Date: Sun Apr 24 10:52:59 2016 New Revision: 298537 URL: https://svnweb.freebsd.org/changeset/base/298537 Log: Cosmetics: - no need to escape the newline after '|' - parenthesize the "case" string for symmetry and improved search for matching paren (e.g. with vi's %) Modified: head/etc/rc.d/zvol Modified: head/etc/rc.d/zvol ============================================================================== --- head/etc/rc.d/zvol Sun Apr 24 09:05:29 2016 (r298536) +++ head/etc/rc.d/zvol Sun Apr 24 10:52:59 2016 (r298537) @@ -19,10 +19,10 @@ required_modules="zfs" zvol_start() { # Enable swap on ZVOLs with property org.freebsd:swap=on. - zfs list -H -o org.freebsd:swap,name -t volume | \ + zfs list -H -o org.freebsd:swap,name -t volume | while read state name; do case "${state}" in - [oO][nN]) + ([oO][nN]) swapon /dev/zvol/${name} ;; esac @@ -32,10 +32,10 @@ zvol_start() zvol_stop() { # Disable swap on ZVOLs with property org.freebsd:swap=on. - zfs list -H -o org.freebsd:swap,name -t volume | \ + zfs list -H -o org.freebsd:swap,name -t volume | while read state name; do case "${state}" in - [oO][nN]) + ([oO][nN]) swapoff /dev/zvol/${name} ;; esac