From 3710570619cf6575e1ee119408e0bec3553864fe Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 5 Apr 2012 04:08:33 +0000
Subject: [PATCH] Change the location for the python gdb module generated by
 gcc to the correct location.

Fix a logic error in the ifdown script.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9805 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 bootscripts/lfs/sbin/ifdown |  3 ++-
 chapter01/changelog.xml     | 11 +++++++++++
 chapter06/gcc.xml           |  4 ++--
 general.ent                 |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bootscripts/lfs/sbin/ifdown b/bootscripts/lfs/sbin/ifdown
index 9d556ebc8..15519c37a 100755
--- a/bootscripts/lfs/sbin/ifdown
+++ b/bootscripts/lfs/sbin/ifdown
@@ -93,7 +93,8 @@ link_status=`ip link show ${IFACE} 2>/dev/null`
 
 if [ -n "${link_status}" ]; then
    if [ "$(echo "${link_status}" | grep UP)" != "" ]; then
-      if [ "$(ip addr show ${IFACE} | grep 'inet ')" != ""  ]; then
+      # Set the interface down only if all IP addresses have been removed.
+      if [ "$(ip addr show ${IFACE} | grep 'inet ')" == ""  ]; then
          log_info_msg "Bringing down the ${IFACE} interface..."
          ip link set ${IFACE} down
          evaluate_retval
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index de20d2464..134b69517 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-05-05</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Change the location for the python gdb module 
+           generated by gcc to the correct location. Fixes (again)
+           <ulink url="&lfs-ticket-root;3048">#3048</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-04-03</para>
       <itemizedlist>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index de0520a8c..9d9fac292 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -292,8 +292,8 @@ SEARCH_DIR("/usr/lib");</computeroutput></screen>
     <para>Finally, move a misplced file:</para>
 
 <screen><userinput remap="install">case `uname -m` in
-  i?86) GDBDIR=/usr/share/gdb/auto-load/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/     ;;
-  *)    GDBDIR=/usr/share/gdb/auto-load/usr/lib64/gcc/x86_64-pc-linux-gnu/&gcc-version;/ ;;
+  i?86) GDBDIR=/usr/share/gdb/auto-load/usr/lib/     ;;
+  *)    GDBDIR=/usr/share/gdb/auto-load/usr/lib64/ ;;
 esac
 
 mkdir -pv $GDBDIR
diff --git a/general.ent b/general.ent
index ed00794b6..845cd9419 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120403">
-<!ENTITY releasedate "Apr 03, 2012">
+<!ENTITY version "SVN-20120405">
+<!ENTITY releasedate "Apr 05, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->