Make fsck.xfs provide more assistance to the unwary user.

Merge of master-melb:xfs-cmds:25138a by kenmcd.

diff --git a/VERSION b/VERSION
index 106a1dca7e1fe82712e88726df7d8c20d36cb382..3aa365126fbe6347a6912085ca1db2fb9175116b 100644 (file)
--- 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 a38ddc9c56e563f9e77735cb64e19c6273316e16..3a4d5348bffcc5e60e8457c49906cbd11aced4ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.7.13-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathan Scott <nathans@debian.org>  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 feb568b82e9416b05b92e1af2c28e986a6fc4877..a56d6e1e62e4d68342d569aad9aadc8abaadf7c3 100644 (file)
--- 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 <mjancar@suse.cz> for this.
+
 xfsprogs-2.7.12 (31 January 2006)
        - Added initial Polish translation.
          Thanks to Jakub Bogusz <qboosh@pld-linux.org> for this.

diff --git a/fsck/Makefile b/fsck/Makefile
index 4fd3b341337133fffb54a01af949b9f40b2dfcbd..32291fd706054087b8a28eb8085526d0490efbea 100644 (file)
--- 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 (file)
index 9ab58e9..0000000
--- 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 (executable)
index 0000000..c9be5e3
--- /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