From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 20 Apr 2012 15:18:17 +0000 (+0000)
Subject: e2fsprogs: fix status reaping with fsck piped to logger, based on patch by Lukasz... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2d19ca6925f229e7e1dc8398baf3a702a05ed56f;p=openwrt%2Fstaging%2Fnbd.git

e2fsprogs: fix status reaping with fsck piped to logger, based on patch by Lukasz Golec-Biernat <mojedokumenty+openwrt@gmail.com>

SVN-Revision: 31377
---

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 9e0e9d9c9a..79ab92c737 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=e2fsprogs
 PKG_VERSION:=1.42
 PKG_MD5SUM:=a3c4ffd7352310ab5e9412965d575610
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs
diff --git a/package/e2fsprogs/files/e2fsck.sh b/package/e2fsprogs/files/e2fsck.sh
index 3b34239ce7..22031edb67 100644
--- a/package/e2fsprogs/files/e2fsck.sh
+++ b/package/e2fsprogs/files/e2fsck.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 # Copyright 2010 Vertical Communications
+# Copyright 2012 OpenWrt.org
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 fsck_e2fsck() {
+	set -o pipefail
 	e2fsck -p "$device" 2>&1 | logger -t "fstab: e2fsck ($device)"
 	local status="$?"
+	set +o pipefail
 	case "$status" in
 		0|1) ;; #success
 		2) reboot;;