|
 |
c4a5a08 |
From 1594d0bf9cf19b45fdb5574e141e0cae163546f5 Mon Sep 17 00:00:00 2001
|
|
|
c4a5a08 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
c4a5a08 |
Date: Sat, 30 Jun 2012 12:15:04 +0200
|
|
|
c4a5a08 |
Subject: [PATCH] fs-lib/fs-lib.sh: skip fsck for xfs and btrfs. remount is
|
|
|
c4a5a08 |
enough
|
|
|
c4a5a08 |
|
|
|
c4a5a08 |
---
|
|
|
c4a5a08 |
modules.d/99fs-lib/fs-lib.sh | 28 +++++++++++++++-------------
|
|
|
c4a5a08 |
1 file changed, 15 insertions(+), 13 deletions(-)
|
|
|
c4a5a08 |
|
|
|
c4a5a08 |
diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
|
|
|
c4a5a08 |
index d1b7a9d..b274935 100755
|
|
|
c4a5a08 |
--- a/modules.d/99fs-lib/fs-lib.sh
|
|
|
c4a5a08 |
+++ b/modules.d/99fs-lib/fs-lib.sh
|
|
|
c4a5a08 |
@@ -32,15 +32,17 @@ fsck_tail() {
|
|
|
c4a5a08 |
# note: this function sets _drv of the caller
|
|
|
c4a5a08 |
fsck_able() {
|
|
|
c4a5a08 |
case "$1" in
|
|
|
c4a5a08 |
- xfs) {
|
|
|
c4a5a08 |
- type xfs_db &&
|
|
|
c4a5a08 |
- type xfs_repair &&
|
|
|
c4a5a08 |
- type xfs_check &&
|
|
|
c4a5a08 |
- type mount &&
|
|
|
c4a5a08 |
- type umount
|
|
|
c4a5a08 |
- } >/dev/null 2>&1 &&
|
|
|
c4a5a08 |
- _drv="_drv=none fsck_drv_xfs" &&
|
|
|
c4a5a08 |
- return 0
|
|
|
c4a5a08 |
+ xfs)
|
|
|
c4a5a08 |
+ # {
|
|
|
c4a5a08 |
+ # type xfs_db &&
|
|
|
c4a5a08 |
+ # type xfs_repair &&
|
|
|
c4a5a08 |
+ # type xfs_check &&
|
|
|
c4a5a08 |
+ # type mount &&
|
|
|
c4a5a08 |
+ # type umount
|
|
|
c4a5a08 |
+ # } >/dev/null 2>&1 &&
|
|
|
c4a5a08 |
+ # _drv="_drv=none fsck_drv_xfs" &&
|
|
|
c4a5a08 |
+ # return 0
|
|
|
c4a5a08 |
+ return 1
|
|
|
c4a5a08 |
;;
|
|
|
c4a5a08 |
ext?)
|
|
|
c4a5a08 |
type e2fsck >/dev/null 2>&1 &&
|
|
|
c4a5a08 |
@@ -58,9 +60,10 @@ fsck_able() {
|
|
|
c4a5a08 |
return 0
|
|
|
c4a5a08 |
;;
|
|
|
c4a5a08 |
btrfs)
|
|
|
c4a5a08 |
- type btrfsck >/dev/null 2>&1 &&
|
|
|
c4a5a08 |
- _drv="_drv=none fsck_drv_btrfs" &&
|
|
|
c4a5a08 |
- return 0
|
|
|
c4a5a08 |
+ # type btrfsck >/dev/null 2>&1 &&
|
|
|
c4a5a08 |
+ # _drv="_drv=none fsck_drv_btrfs" &&
|
|
|
c4a5a08 |
+ # return 0
|
|
|
c4a5a08 |
+ return 1
|
|
|
c4a5a08 |
;;
|
|
|
c4a5a08 |
nfs*)
|
|
|
c4a5a08 |
# nfs can be a nop, returning success
|
|
|
c4a5a08 |
@@ -89,7 +92,6 @@ fsck_drv_btrfs() {
|
|
|
c4a5a08 |
return 0
|
|
|
c4a5a08 |
}
|
|
|
c4a5a08 |
|
|
|
c4a5a08 |
-
|
|
|
c4a5a08 |
# common code for checkers that follow usual subset of options and return codes
|
|
|
c4a5a08 |
fsck_drv_com() {
|
|
|
c4a5a08 |
local _ret
|