mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-03-05 22:04:48 +00:00
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
This commit is contained in:
Bruce Dubbs
parent
dd5d8670cf
commit
53ea84b7e5
@ -1,3 +1,9 @@
|
||||
2013-01-24 Bruce Dubbs <bdubbs@linuxfromscratch.org>
|
||||
* Remove local attribue of some variables for Bourne
|
||||
shell compatability
|
||||
* Specify /bin/echo in commands with -e switch for
|
||||
Bourne shell compatability
|
||||
|
||||
2012-10-13 Bruce Dubbs <bdubbs@linuxfromscratch.org>
|
||||
* Remove unneeded sleep in killproc
|
||||
* Add option for verbose fsck
|
||||
|
||||
@ -522,18 +522,18 @@ statusproc()
|
||||
base="${1##*/}"
|
||||
|
||||
if [ -n "${pidlist}" ]; then
|
||||
echo -e "${INFO}${base} is running with Process" \
|
||||
/bin/echo -e "${INFO}${base} is running with Process" \
|
||||
"ID(s) ${pidlist}.${NORMAL}"
|
||||
else
|
||||
if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
|
||||
echo -e "${WARNING}${1} is not running but" \
|
||||
/bin/echo -e "${WARNING}${1} is not running but" \
|
||||
"/var/run/${base}.pid exists.${NORMAL}"
|
||||
else
|
||||
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
|
||||
echo -e "${WARNING}${1} is not running" \
|
||||
/bin/echo -e "${WARNING}${1} is not running" \
|
||||
"but ${pidfile} exists.${NORMAL}"
|
||||
else
|
||||
echo -e "${INFO}${1} is not running.${NORMAL}"
|
||||
/bin/echo -e "${INFO}${1} is not running.${NORMAL}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -566,22 +566,22 @@ timespec()
|
||||
################################################################################
|
||||
log_success_msg()
|
||||
{
|
||||
echo -n -e "${BMPREFIX}${@}"
|
||||
echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
|
||||
/bin/echo -n -e "${BMPREFIX}${@}"
|
||||
/bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
|
||||
|
||||
# Strip non-printable characters from log file
|
||||
local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
|
||||
timespec
|
||||
echo -e "${STAMP} ${logmessage} OK" >> ${BOOTLOG}
|
||||
/bin/echo -e "${STAMP} ${logmessage} OK" >> ${BOOTLOG}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
log_success_msg2()
|
||||
{
|
||||
echo -n -e "${BMPREFIX}${@}"
|
||||
echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
|
||||
/bin/echo -n -e "${BMPREFIX}${@}"
|
||||
/bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
|
||||
|
||||
echo " OK" >> ${BOOTLOG}
|
||||
|
||||
@ -601,22 +601,22 @@ log_success_msg2()
|
||||
################################################################################
|
||||
log_failure_msg()
|
||||
{
|
||||
echo -n -e "${BMPREFIX}${@}"
|
||||
echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
|
||||
/bin/echo -n -e "${BMPREFIX}${@}"
|
||||
/bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
|
||||
|
||||
# Strip non-printable characters from log file
|
||||
|
||||
timespec
|
||||
local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
echo -e "${STAMP} ${logmessage} FAIL" >> ${BOOTLOG}
|
||||
logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
/bin/echo -e "${STAMP} ${logmessage} FAIL" >> ${BOOTLOG}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
log_failure_msg2()
|
||||
{
|
||||
echo -n -e "${BMPREFIX}${@}"
|
||||
echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
|
||||
/bin/echo -n -e "${BMPREFIX}${@}"
|
||||
/bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
|
||||
|
||||
echo "FAIL" >> ${BOOTLOG}
|
||||
|
||||
@ -634,13 +634,13 @@ log_failure_msg2()
|
||||
################################################################################
|
||||
log_warning_msg()
|
||||
{
|
||||
echo -n -e "${BMPREFIX}${@}"
|
||||
echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
|
||||
/bin/echo -n -e "${BMPREFIX}${@}"
|
||||
/bin/echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
|
||||
|
||||
# Strip non-printable characters from log file
|
||||
local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
timespec
|
||||
echo -e "${STAMP} ${logmessage} WARN" >> ${BOOTLOG}
|
||||
/bin/echo -e "${STAMP} ${logmessage} WARN" >> ${BOOTLOG}
|
||||
|
||||
return 0
|
||||
}
|
||||
@ -656,23 +656,23 @@ log_warning_msg()
|
||||
################################################################################
|
||||
log_info_msg()
|
||||
{
|
||||
echo -n -e "${BMPREFIX}${@}"
|
||||
/bin/echo -n -e "${BMPREFIX}${@}"
|
||||
|
||||
# Strip non-printable characters from log file
|
||||
local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
timespec
|
||||
echo -n -e "${STAMP} ${logmessage}" >> ${BOOTLOG}
|
||||
/bin/echo -n -e "${STAMP} ${logmessage}" >> ${BOOTLOG}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
log_info_msg2()
|
||||
{
|
||||
echo -n -e "${@}"
|
||||
/bin/echo -n -e "${@}"
|
||||
|
||||
# Strip non-printable characters from log file
|
||||
local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
echo -n -e "${logmessage}" >> ${BOOTLOG}
|
||||
logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
|
||||
/bin/echo -n -e "${logmessage}" >> ${BOOTLOG}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
@ -35,6 +35,26 @@
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
-->
|
||||
<listitem>
|
||||
<para>2013-01-24</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>[bdubbs] - Remove bashisms from init-functions
|
||||
file in the boot scripts. </para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>2013-01-24</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>[bdubbs] - Upgrade to e2fsprogs-1.42.7. Fixes
|
||||
<ulink url="&lfs-ticket-root;3274">#3274</ulink>.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>2013-01-22</para>
|
||||
<itemizedlist>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!ENTITY version "SVN-20130122">
|
||||
<!ENTITY releasedate "January 22, 2013">
|
||||
<!ENTITY version "SVN-20130124">
|
||||
<!ENTITY releasedate "January 24, 2013">
|
||||
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not – -->
|
||||
<!ENTITY milestone "7.3">
|
||||
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
|
||||
|
||||
@ -107,10 +107,10 @@
|
||||
<!-- NOTE: When updating e2fsprogs, remember to check the list
|
||||
of acceptable features that can be shown by debugfs in
|
||||
chapter02/creatingfilesystem.xml -->
|
||||
<!ENTITY e2fsprogs-version "1.42.6">
|
||||
<!ENTITY e2fsprogs-size "5,781 KB">
|
||||
<!ENTITY e2fsprogs-version "1.42.7">
|
||||
<!ENTITY e2fsprogs-size "5,856 KB">
|
||||
<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
|
||||
<!ENTITY e2fsprogs-md5 "9e444c240c1001b3292d108fbad0f49c">
|
||||
<!ENTITY e2fsprogs-md5 "a1ec22ef003688dae9f76c74881b22b9">
|
||||
<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
|
||||
<!ENTITY e2fsprogs-ch6-du "64 MB">
|
||||
<!ENTITY e2fsprogs-ch6-sbu "1.7 SBU">
|
||||
@ -302,7 +302,7 @@
|
||||
<!ENTITY less-ch6-du "3.8 MB">
|
||||
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
|
||||
|
||||
<!ENTITY lfs-bootscripts-version "20121013"> <!-- Scripts depend on this format -->
|
||||
<!ENTITY lfs-bootscripts-version "20130123"> <!-- Scripts depend on this format -->
|
||||
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
|
||||
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
|
||||
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user