From 58cb1681bd92b96efbf251e847214c2447533cce Mon Sep 17 00:00:00 2001 From: Ethan Benson Date: Sat, 8 May 2004 06:38:44 +0000 Subject: [PATCH] Fix several ofpath error messages going to stdout rather then stderr * ybin/ofpath: Fix several error messages mistakenly written to stdout rather then stderr. (Thanks to Colin Watson for noticing) git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-70 --- 0arch-timestamps0 | 48 +++++++++++++++++++++++------------------------ ChangeLog | 14 ++++++++++++++ ybin/ofpath | 8 ++++---- 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/0arch-timestamps0 b/0arch-timestamps0 index 3c70bdd..19e7228 100644 --- a/0arch-timestamps0 +++ b/0arch-timestamps0 @@ -1,7 +1,7 @@ -./0arch-timestamps0 1082938563 1082939264 +./0arch-timestamps0 1082939268 1083998321 ./BUGS 1082938563 1000991730 ./COPYING 1082938564 1000991730 -./ChangeLog 1082939152 1082939261 +./ChangeLog 1083998225 1083998312 ./Config 1082938563 1002101497 ./INSTALL 1082938564 1000991730 ./Makefile 1082938564 1082247755 @@ -22,18 +22,18 @@ ./doc/examples/simpleboot.chrp 1082938564 1068017750 ./doc/examples/yaboot.conf.multi-boot 1082938564 1006348765 ./doc/examples/yaboot.conf.rs6000 1082938564 1006348765 -./doc/examples 1082939264 1068017750 +./doc/examples 1083998321 1068017750 ./doc/yaboot-howto.de.sgml 1082938567 1077455488 ./doc/yaboot-howto.sgml 1082938567 1077455511 -./doc 1082939264 1081830064 +./doc 1083998321 1081830064 ./etc/yaboot.conf 1082938564 1006348765 -./etc 1082939264 1007269243 -./first/ofboot 1082938564 1065311880 -./first 1082939264 1071492158 +./etc 1083998321 1007269243 +./first/ofboot 1083998120 1065311880 +./first 1083998321 1071492158 ./include/asm/elf.h 1082938564 1000991730 ./include/asm/ppc_asm.tmpl 1082938564 1000991730 ./include/asm/processor.h 1082938564 1000991730 -./include/asm 1082939264 1007269243 +./include/asm 1083998321 1007269243 ./include/bootinfo.h 1082938564 1007200690 ./include/byteorder.h 1082938564 1000991730 ./include/cfg.h 1082938564 1007200690 @@ -42,12 +42,12 @@ ./include/debug.h 1082938566 1007200690 ./include/errors.h 1082938563 1007200690 ./include/et/com_err.h 1082938564 1000991731 -./include/et 1082939264 1007269243 +./include/et 1083998321 1007269243 ./include/ext2fs/bitops.h 1082938564 1003927524 ./include/ext2fs/ext2_err.h 1082938564 1003927524 ./include/ext2fs/ext2_io.h 1082938564 1003927524 ./include/ext2fs/ext2fs.h 1082938564 1003927524 -./include/ext2fs 1082939264 1007269243 +./include/ext2fs 1083998321 1007269243 ./include/fdisk-part.h 1082938564 1007200690 ./include/file.h 1082938564 1007200690 ./include/fs.h 1082938564 1007200690 @@ -56,13 +56,13 @@ ./include/linux/iso_fs.h 1082938564 1000991731 ./include/linux/stat.h 1082938564 1000991731 ./include/linux/types.h 1082938564 1000991731 -./include/linux 1082939264 1007269243 +./include/linux 1083998321 1007269243 ./include/mac-part.h 1082938564 1007200690 ./include/md5.h 1082938564 1000991730 ./include/partition.h 1082938564 1007200690 ./include/prom.h 1082938564 1007200690 ./include/reiserfs/reiserfs.h 1082938564 1025684115 -./include/reiserfs 1082939264 1025684115 +./include/reiserfs 1083998321 1025684115 ./include/setjm2.h 1082938564 1000991730 ./include/setjmp.h 1082938564 1000991730 ./include/stdlib.h 1082938564 1000991730 @@ -70,9 +70,9 @@ ./include/swab.h 1082938564 1000991730 ./include/types.h 1082938564 1000991730 ./include/xfs/xfs.h 1082938563 1002101334 -./include/xfs 1082939264 1007269244 +./include/xfs 1083998321 1007269244 ./include/yaboot.h 1082938564 1007200690 -./include 1082939264 1007269244 +./include 1083998321 1007269244 ./lib/ctype.c 1082938564 1000991731 ./lib/libext2fs.a 1082938566 1003927524 ./lib/malloc.c 1082938566 1007200690 @@ -81,7 +81,7 @@ ./lib/strstr.c 1082938566 1000991731 ./lib/strtol.c 1082938566 1000991731 ./lib/vsprintf.c 1082938566 1000991731 -./lib 1082939264 1069320301 +./lib 1083998321 1069320301 ./man/bootstrap.8 1082938566 1000991731 ./man/mkofboot.8 1082938566 1006348765 ./man/ofpath.8 1082938566 1000991731 @@ -89,7 +89,7 @@ ./man/yaboot.conf.5 1082938566 1004256691 ./man/yabootconfig.8 1082938566 1027929577 ./man/ybin.8 1082938566 1006348765 -./man 1082939264 1027929577 +./man 1083998321 1027929577 ./man.patch 1082938566 1006348761 ./second/cache.S 1082938566 1007200690 ./second/cfg.c 1082938566 1007200690 @@ -108,13 +108,13 @@ ./second/prom.c 1082938566 1067937197 ./second/setjmp.S 1082938566 1000991732 ./second/yaboot.c 1082938566 1032059504 -./second 1082939264 1069320301 +./second 1083998321 1069320301 ./util/addnote.c 1082938566 1007200691 ./util/elfextract.c 1082938566 1007303237 -./util 1082939264 1069320301 -./ybin/mkofboot 1082939264 1073219938 -./ybin/ofpath 1082938566 1082247720 -./ybin/yabootconfig 1082932760 1082931877 -./ybin/ybin 1082938566 1082247741 -./ybin 1082939264 1082931877 -. 1082939264 1082939261 +./util 1083998321 1069320301 +./ybin/mkofboot 1083998321 1073219938 +./ybin/ofpath 1083998169 1083997485 +./ybin/yabootconfig 1083996990 1082931877 +./ybin/ybin 1083996990 1082247741 +./ybin 1083998321 1083997485 +. 1083998321 1083998312 diff --git a/ChangeLog b/ChangeLog index d192da5..4b349ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,20 @@ # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3 # +2004-05-08 06:38:44 GMT Ethan Benson patch-70 + + Summary: + Fix several ofpath error messages going to stdout rather then stderr + Revision: + yaboot--devel--1.3--patch-70 + + * ybin/ofpath: Fix several error messages mistakenly written to stdout + rather then stderr. (Thanks to Colin Watson for noticing) + + modified files: + 0arch-timestamps0 ChangeLog ybin/ofpath + + 2004-04-26 00:27:48 GMT Ethan Benson patch-69 Summary: diff --git a/ybin/ofpath b/ybin/ofpath index e45ec87..d596b8b 100755 --- a/ybin/ofpath +++ b/ybin/ofpath @@ -314,7 +314,7 @@ scsi_ofpath() ide_ofpath() { if [ ! -L "/proc/ide/$DEVNODE" ] ; then - echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured" + echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured" return 1 fi @@ -326,7 +326,7 @@ ide_ofpath() case "$(uname -r)" in 2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*) - echo "$PRG: Linux kernel `uname -r` is not supported" + echo 1>&2 "$PRG: Linux kernel `uname -r` is not supported" return 1 ;; 2.6.*|2.7.*) @@ -336,7 +336,7 @@ ide_ofpath() fi local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)" if [ -z "$SYS" -o ! -d "$SYS" ] ; then - echo 2>&1 "$PRG: Unable to determine sysfs mountpoint" + echo 1>&2 "$PRG: Unable to determine sysfs mountpoint" return 1 fi local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec" @@ -397,7 +397,7 @@ ide_ofpath() local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))" ;; *) - echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\"" + echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\"" return 1 ;; esac -- 2.39.2