[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] 537390: reIPL is calculating the boot drive incorrectly



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Functionally this looks fine.  Cosmetic exceptions:

1) Please follow our format for git commit messages.  We give a one line
description and reference the bug number as (#BUGNUMBER) at the end of that
one description.  The one line description should not be longer than 80
characters, though 50 to 60 is even nicer.

2) In the commit message body, explain what's going on in the patch.  Note
what was fixed and why.  During the patch review process, you may have
committed several sets of changes to the original patch.  You still want to
publish a single patch as well as expand the log entry (if necessary).  An
interactive git rebase helps with that:

    http://blog.madism.org/index.php/2007/09/09/138-git-awsome-ness-git-rebase-interactive

With that, you can squash all of your changes during the review in to a single
patch ready for 'git am' on the main repository.  This is most useful if you
create a local working branch of master, to keep your work separated from the
main tracking branch.

3) Please use 4 spaces for indentation.

I went ahead and made these changes and pushed the resulting patch since you
said you were going on vacation starting Nov 18th.

Thanks,


On Tue, 17 Nov 2009, Mark Hamzy wrote:


This time with fixes from Chris.  Note that the linuxrc fix is just
informative at the end of an install and before a reboot occurs...

---
iutil.py            |    5 ++++-
loader/linuxrc.s390 |   10 ++++++++++
2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/iutil.py b/iutil.py
index 0b15bd8..0c43684 100644
--- a/iutil.py
+++ b/iutil.py
@@ -980,7 +980,10 @@ def reIPL(anaconda, loader_pid):

    reipl_path = "/sys/firmware/reipl"

-    ipldev = anaconda.id.bootloader.device
+    try:
+     ipldev = anaconda.platform.bootDevice().disk.name
+    except:
+     ipldev = None

    if ipldev is None:
        message = _("Error determining mount point type")
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index d50dcbd..71e4d0e 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -95,6 +95,16 @@ function doshutdown()

function doreboot()
{
+    if [ -e "/sys/firmware/reipl" ]; then
+     read REIPL_TYPE < /sys/firmware/reipl/reipl_type
+     echo "reipl_type=$REIPL_TYPE"
+     pushd /sys/firmware/reipl/$REIPL_TYPE >/dev/null 2>&1
+     for i in *; do
+         echo "$i=`cat $i`"
+     done
+     popd >/dev/null 2>&1
+    fi
+
    echo $"about to exec shutdown -r"
    exec /sbin/shutdown -r
    exit 0
--
1.6.4

--
Mark

You must be the change you wish to see in the world. -- Mahatma Gandhi
Worrying is praying for that you do not wish to happen.

- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAksDQNsACgkQ5hsjjIy1VknSWgCfUvZlKtMOL9ONAW68UQ02kt1k
gTUAoJW4DTdXeg/UdrU/lvS1sWCIpBMJ
=PaPq
-----END PGP SIGNATURE-----


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]