diff options
-rwxr-xr-x | bootscripts/lfs/sbin/ifdown | 3 | ||||
-rw-r--r-- | chapter01/changelog.xml | 11 | ||||
-rw-r--r-- | chapter06/gcc.xml | 4 | ||||
-rw-r--r-- | 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 @@ -37,6 +37,17 @@ --> <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> <listitem> 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 – --> <!ENTITY milestone "7.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |