summaryrefslogtreecommitdiffstats
path: root/package/e2fsprogs
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-20 15:18:17 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-20 15:18:17 +0000
commitff95fcf4ccb224441336b66972114c46b7e12864 (patch)
treee3d77fa151e3911759ae4c7fa63e55d40ac7312e /package/e2fsprogs
parentcff1bc811e68d28f8487d4071df10356f4da824e (diff)
[package] e2fsprogs: fix status reaping with fsck piped to logger, based on patch by Lukasz Golec-Biernat <mojedokumenty+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31377 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r--package/e2fsprogs/Makefile2
-rw-r--r--package/e2fsprogs/files/e2fsck.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 9e0e9d9c9..79ab92c73 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 3b34239ce..22031edb6 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;;