Changeset 53ea84b


Ignore:
Timestamp:
01/24/2013 09:45:18 PM (11 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
49f236b
Parents:
dd5d867
Message:

Remove bashisms from init-functions file in the boot scripts.
Upgrade to e2fsprogs-1.42.7.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10103 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • bootscripts/ChangeLog

    rdd5d867 r53ea84b  
     12013-01-24 Bruce Dubbs <bdubbs@linuxfromscratch.org>
     2   * Remove local attribue of some variables for Bourne
     3     shell compatability
     4   * Specify /bin/echo in commands with -e switch for
     5     Bourne shell compatability
     6
    172012-10-13 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    28   * Remove unneeded sleep in killproc

  • bootscripts/lfs/lib/services/init-functions

    rdd5d867 r53ea84b  
    523523
    524524   if [ -n "${pidlist}" ]; then
    525       echo -e "${INFO}${base} is running with Process" \
     525      /bin/echo -e "${INFO}${base} is running with Process" \
    526526         "ID(s) ${pidlist}.${NORMAL}"
    527527   else
    528528      if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
    529          echo -e "${WARNING}${1} is not running but" \
     529         /bin/echo -e "${WARNING}${1} is not running but" \
    530530            "/var/run/${base}.pid exists.${NORMAL}"
    531531      else
    532532         if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
    533             echo -e "${WARNING}${1} is not running" \
     533            /bin/echo -e "${WARNING}${1} is not running" \
    534534               "but ${pidfile} exists.${NORMAL}"
    535535         else
    536             echo -e "${INFO}${1} is not running.${NORMAL}"
     536            /bin/echo -e "${INFO}${1} is not running.${NORMAL}"
    537537         fi
    538538      fi
    … …  
    567567log_success_msg()
    568568{
    569     echo -n -e "${BMPREFIX}${@}"
    570     echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
     569    /bin/echo -n -e "${BMPREFIX}${@}"
     570    /bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
    571571
    572572    # Strip non-printable characters from log file
    573     local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
     573    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    574574
    575575    timespec
    576     echo -e "${STAMP} ${logmessage} OK" >> ${BOOTLOG}
     576    /bin/echo -e "${STAMP} ${logmessage} OK" >> ${BOOTLOG}
    577577   
    578578    return 0
    … …  
    581581log_success_msg2()
    582582{
    583     echo -n -e "${BMPREFIX}${@}"
    584     echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
     583    /bin/echo -n -e "${BMPREFIX}${@}"
     584    /bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
    585585
    586586    echo " OK" >> ${BOOTLOG}
    … …  
    602602log_failure_msg()
    603603{
    604     echo -n -e "${BMPREFIX}${@}"
    605     echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
     604    /bin/echo -n -e "${BMPREFIX}${@}"
     605    /bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
    606606
    607607    # Strip non-printable characters from log file
    608608
    609609    timespec
    610     local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    611     echo -e "${STAMP} ${logmessage} FAIL" >> ${BOOTLOG}
     610    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
     611    /bin/echo -e "${STAMP} ${logmessage} FAIL" >> ${BOOTLOG}
    612612   
    613613    return 0
    … …  
    616616log_failure_msg2()
    617617{
    618     echo -n -e "${BMPREFIX}${@}"
    619     echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
     618    /bin/echo -n -e "${BMPREFIX}${@}"
     619    /bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
    620620
    621621    echo "FAIL" >> ${BOOTLOG}
    … …  
    635635log_warning_msg()
    636636{
    637     echo -n -e "${BMPREFIX}${@}"
    638     echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
     637    /bin/echo -n -e "${BMPREFIX}${@}"
     638    /bin/echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
    639639
    640640    # Strip non-printable characters from log file
    641     local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
     641    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    642642    timespec
    643     echo -e "${STAMP} ${logmessage} WARN" >> ${BOOTLOG}
     643    /bin/echo -e "${STAMP} ${logmessage} WARN" >> ${BOOTLOG}
    644644   
    645645    return 0
    … …  
    657657log_info_msg()
    658658{
    659     echo -n -e "${BMPREFIX}${@}"
     659    /bin/echo -n -e "${BMPREFIX}${@}"
    660660
    661661    # Strip non-printable characters from log file
    662     local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
     662    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    663663    timespec
    664     echo -n -e "${STAMP} ${logmessage}" >> ${BOOTLOG}
     664    /bin/echo -n -e "${STAMP} ${logmessage}" >> ${BOOTLOG}
    665665   
    666666    return 0
    … …  
    669669log_info_msg2()
    670670{
    671     echo -n -e "${@}"
     671    /bin/echo -n -e "${@}"
    672672
    673673    # Strip non-printable characters from log file
    674     local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    675     echo -n -e "${logmessage}" >> ${BOOTLOG}
     674    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
     675    /bin/echo -n -e "${logmessage}" >> ${BOOTLOG}
    676676   
    677677    return 0

  • chapter01/changelog.xml

    rdd5d867 r53ea84b  
    3737-->
    3838    <listitem>
     39      <para>2013-01-24</para>
     40      <itemizedlist>
     41        <listitem>
     42          <para>[bdubbs] - Remove bashisms from init-functions
     43          file in the boot scripts. </para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
     49      <para>2013-01-24</para>
     50      <itemizedlist>
     51        <listitem>
     52          <para>[bdubbs] - Upgrade to e2fsprogs-1.42.7.  Fixes
     53          <ulink url="&lfs-ticket-root;3274">#3274</ulink>.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
     58    <listitem>
    3959      <para>2013-01-22</para>
    4060      <itemizedlist>

  • general.ent

    rdd5d867 r53ea84b  
    1 <!ENTITY version "SVN-20130122">
    2 <!ENTITY releasedate "January 22, 2013">
     1<!ENTITY version "SVN-20130124">
     2<!ENTITY releasedate "January 24, 2013">
    33<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
    44<!ENTITY milestone "7.3">

  • packages.ent

    rdd5d867 r53ea84b  
    108108     of acceptable features that can be shown by debugfs in
    109109     chapter02/creatingfilesystem.xml -->
    110 <!ENTITY e2fsprogs-version "1.42.6">
    111 <!ENTITY e2fsprogs-size "5,781 KB">
     110<!ENTITY e2fsprogs-version "1.42.7">
     111<!ENTITY e2fsprogs-size "5,856 KB">
    112112<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
    113 <!ENTITY e2fsprogs-md5 "9e444c240c1001b3292d108fbad0f49c">
     113<!ENTITY e2fsprogs-md5 "a1ec22ef003688dae9f76c74881b22b9">
    114114<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
    115115<!ENTITY e2fsprogs-ch6-du "64 MB">
    … …  
    303303<!ENTITY less-ch6-sbu "less than 0.1 SBU">
    304304
    305 <!ENTITY lfs-bootscripts-version "20121013">                 <!-- Scripts depend on this format -->
     305<!ENTITY lfs-bootscripts-version "20130123">                 <!-- Scripts depend on this format -->
    306306<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
    307307<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
Note: See TracChangeset for help on using the changeset viewer.