From 21f6386911e0bb0417896032f1416851dc504cc0 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 8 Feb 2006 02:50:01 +0000 Subject: [PATCH] Make fsck.xfs provide more assistance to the unwary user. Merge of master-melb:xfs-cmds:25138a by kenmcd. --- VERSION | 2 +- debian/changelog | 6 ++++++ doc/CHANGES | 5 +++++ fsck/Makefile | 9 +++------ fsck/xfs_fsck.c | 28 ---------------------------- fsck/xfs_fsck.sh | 19 +++++++++++++++++++ 6 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 fsck/xfs_fsck.c create mode 100755 fsck/xfs_fsck.sh diff --git a/VERSION b/VERSION index 106a1dca7..3aa365126 100644 --- a/VERSION +++ b/VERSION @@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=7 -PKG_REVISION=12 +PKG_REVISION=13 PKG_BUILD=1 diff --git a/debian/changelog b/debian/changelog index a38ddc9c5..3a4d5348b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfsprogs (2.7.13-1) unstable; urgency=low + + * New upstream release. + + -- Nathan Scott Wed, 08 Feb 2006 09:49:48 +1100 + xfsprogs (2.7.12-1) unstable; urgency=low * New upstream release. diff --git a/doc/CHANGES b/doc/CHANGES index feb568b82..a56d6e1e6 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,8 @@ +xfsprogs-2.7.13 (08 February 2006) + - Convert fsck into a shell script and make it provide a + hint to run repair/check (in non-auto fsck modes). + Thanks to Marian Jancar for this. + xfsprogs-2.7.12 (31 January 2006) - Added initial Polish translation. Thanks to Jakub Bogusz for this. diff --git a/fsck/Makefile b/fsck/Makefile index 4fd3b3413..32291fd70 100644 --- a/fsck/Makefile +++ b/fsck/Makefile @@ -1,14 +1,11 @@ # -# Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2006 Silicon Graphics, Inc. All Rights Reserved. # TOPDIR = .. include $(TOPDIR)/include/builddefs -LTCOMMAND = fsck.xfs -CFILES = xfs_fsck.c -LCFLAGS = -s -O3 -LLDFLAGS += -static +LSRCFILES = xfs_fsck.sh default: $(LTCOMMAND) @@ -16,5 +13,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + $(INSTALL) -m 755 xfs_fsck.sh $(PKG_SBIN_DIR)/fsck.xfs install-dev: diff --git a/fsck/xfs_fsck.c b/fsck/xfs_fsck.c deleted file mode 100644 index 9ab58e995..000000000 --- a/fsck/xfs_fsck.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc. - * All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* http://www.muppetlabs.com/~breadbox/software/tiny/teensy.html */ -/* Unfortunately, we need to be a little more portable. ;^) */ -/* This used to be a symlink to /bin/true but that gives a wierd */ -/* dependency problem in a certain package manager. */ - -int -main(int argc, char **argv) -{ - return 0; -} diff --git a/fsck/xfs_fsck.sh b/fsck/xfs_fsck.sh new file mode 100755 index 000000000..c9be5e394 --- /dev/null +++ b/fsck/xfs_fsck.sh @@ -0,0 +1,19 @@ +#!/bin/sh -f +# +# Copyright (c) 2006 Silicon Graphics, Inc. All Rights Reserved. +# + +AUTO=false +while getopts ":aA" c +do + case $c in + a|A) AUTO=true;; + esac +done +if $AUTO; then + echo "$0: XFS file system." +else + echo "If you wish to check the consistency of an XFS filesystem or" + echo "repair a damaged filesystem, see xfs_check(8) and xfs_repair(8)." +fi +exit 0 -- 2.39.2