From 1476a0ba1159e01aaffaf9c8a8d0fe2a6418d493 Mon Sep 17 00:00:00 2001 From: Ethan Benson Date: Mon, 4 Jul 2005 03:42:18 +0000 Subject: [PATCH 1/1] Remove check for BootX broken device-trees * ybin/ofpath: Remove check for broken-by-BootX device-tree, it no longer works under current 2.6 kernels and nobody attempts to use BootX anymore. git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-82 --- 0arch-timestamps0 | 12 ++++++------ ChangeLog | 15 +++++++++++++++ ybin/ofpath | 8 -------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/0arch-timestamps0 b/0arch-timestamps0 index e9277c8..26a1a54 100644 --- a/0arch-timestamps0 +++ b/0arch-timestamps0 @@ -1,7 +1,7 @@ -./0arch-timestamps0 1116558602 1120448033 +./0arch-timestamps0 1120448039 1120448533 ./BUGS 1109049412 1000991730 ./COPYING 1109049412 1000991730 -./ChangeLog 1120447960 1120448030 +./ChangeLog 1120448453 1120448530 ./Config 1109049412 1002101497 ./INSTALL 1109049412 1000991730 ./Makefile 1109049412 1089576723 @@ -114,8 +114,8 @@ ./util/addnote.c 1109049413 1107321884 ./util 1120447953 1107321884 ./ybin/mkofboot 1120447944 1073219938 -./ybin/ofpath 1117166139 1089576762 +./ybin/ofpath 1120448416 1120448442 ./ybin/yabootconfig 1117166139 1089576743 -./ybin/ybin 1120447928 1120447943 -./ybin 1120447944 1120447943 -. 1120448032 1120448030 +./ybin/ybin 1120448039 1120447943 +./ybin 1120448533 1120448442 +. 1120448533 1120448529 diff --git a/ChangeLog b/ChangeLog index 40cfc3e..6e1e722 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3 # +2005-07-04 03:42:18 GMT Ethan Benson patch-82 + + Summary: + Remove check for BootX broken device-trees + Revision: + yaboot--devel--1.3--patch-82 + + * ybin/ofpath: Remove check for broken-by-BootX device-tree, it no + longer works under current 2.6 kernels and nobody attempts to use + BootX anymore. + + modified files: + 0arch-timestamps0 ChangeLog ybin/ofpath + + 2005-07-04 03:34:00 GMT Ethan Benson patch-81 Summary: diff --git a/ybin/ofpath b/ybin/ofpath index 1a69a48..5cc33f2 100755 --- a/ybin/ofpath +++ b/ybin/ofpath @@ -425,14 +425,6 @@ newworld() { case "$DEVNODE" in sd*) - if ls -l /proc/device-tree | grep -q ^lr ; then - true - else - echo 1>&2 "$PRG: /proc/device-tree is broken. Do not use BootX to boot, use yaboot." - echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc" - return 1 - fi - ## use common scsiinfo function to get info we need. scsiinfo || return 1 -- 2.39.2