From 4e418b10079a2d9aff66858ed15536b5edf40019 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 18 Aug 2005 03:49:54 +0000 Subject: [PATCH] Converted IRIX ln -s failure output to be the same as Linux's. Merge of master-melb:xfs-cmds:23524a by kenmcd. Converted IRIX ln -s failure output to be the same as Linux's. --- 103 | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/103 b/103 index ec99ab8e..e02fe5b2 100755 --- a/103 +++ b/103 @@ -4,35 +4,24 @@ # Exercise the XFS nosymlinks inode flag # #----------------------------------------------------------------------- -# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-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; either version 2 of the License, or +# (at your option) any later version. # -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# This program is distributed in the hope that it will 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. # -# 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. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA # -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -# Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# -# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ +# Contact information: Silicon Graphics, Inc., 1500 Crittenden Lane, +# Mountain View, CA 94043, USA, or: http://www.sgi.com #----------------------------------------------------------------------- # # creator @@ -73,6 +62,11 @@ _filter_scratch() sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" } +_filter_ln() +{ + sed -e "s,SCRATCH_MNT/nosymlink/target - Operation not permitted,ln: creating symbolic link \`SCRATCH_MNT/nosymlink/target\' to \`SCRATCH_MNT/nosymlink/source\': Operation not permitted,g" +} + _filter_noymlinks_flag() { _test_inode_flag nosymlinks $SCRATCH_MNT/nosymlink @@ -84,6 +78,7 @@ _filter_noymlinks_flag() } # real QA test starts here +_supported_os Linux IRIX _supported_fs xfs _require_command /usr/sbin/xfs_io _require_scratch @@ -99,7 +94,7 @@ _filter_noymlinks_flag touch $SCRATCH_MNT/nosymlink/source ln -s $SCRATCH_MNT/nosymlink/source $SCRATCH_MNT/nosymlink/target 2>&1 \ - | _filter_scratch + | _filter_scratch | _filter_ln ln $SCRATCH_MNT/nosymlink/source $SCRATCH_MNT/nosymlink/hardlinksareok echo "*** 1st listing..." -- 2.39.5