Subversion Repositories svn LFS-FR

Compare Revisions

Ignore whitespace Rev 1567 → Rev 1568

/trunk/lfs/chapter01/changelog.xml
41,6 → 41,10
<para>22-01-2012</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Mise à jour des scripts de démarrage réseaux
pour le support des périphériques bridgés dans BLFS.</para>
</listitem>
<listitem>
<para>[matthew] - Passage à Linux-3.2.1. Corrige
<ulink url="&lfs-ticket-root;2999">#2999</ulink>.</para>
</listitem>
/trunk/lfs/chapter06/pkg-config.xml
File deleted
/trunk/lfs/chapter06/glib.xml
File deleted
/trunk/lfs/chapter06/coreutils.xml
66,8 → 66,9
 
<para>Maintenant, préparez la compilation de Coreutils&nbsp;:</para>
 
<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
--enable-no-install-program=kill,uptime</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--libexecdir=/usr/lib \
--enable-no-install-program=kill,uptime</userinput></screen>
 
<variablelist>
<title>Voici la signification des options de configuration.</title>
/trunk/lfs/packages.ent
304,7 → 304,7
<!ENTITY less-ch6-du "3.5 Mio">
<!ENTITY less-ch6-sbu "moins de 0.1 SBU">
 
<!ENTITY lfs-bootscripts-version "20120122"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-version "20120127"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE Kio"> <!-- 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 -->
/trunk/lfs/bootscripts/lfs/lib/services/ipv4-static
42,8 → 42,13
 
case "${2}" in
up)
if [ "$(ip addr show ${1} | grep ${IP})" == "" ]; then
log_info_msg2 "\n" # Terminate the previous message
if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" == "" ]; then
# Cosmetic output not needed for multiple services
if ! $(echo ${SERVICE} | grep -q " "); then
log_info_msg2 "\n" # Terminate the previous message
fi
log_info_msg "Adding IPv4 address ${IP} to the ${1} interface..."
ip addr add ${args} dev ${1}
evaluate_retval
64,7 → 69,7
;;
 
down)
if [ "$(ip addr show ${1} | grep ${IP})" != "" ]; then
if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" != "" ]; then
log_info_msg "Removing IPv4 address ${IP} from the ${1} interface..."
ip addr del ${args} dev ${1}
evaluate_retval
72,7 → 77,7
 
if [ -n "${GATEWAY}" ]; then
# Only remove the gateway if ther are no remaining ipv4 addresses
if [ "$(ip addr show ${1} | grep 'inet ')" != "" ]; then
if [ "$(ip addr show ${1} 2>/dev/null | grep 'inet ')" != "" ]; then
log_info_msg "Removing default gateway..."
ip route del default
evaluate_retval
/trunk/lfs/bootscripts/lfs/lib/services/init-functions
67,6 → 67,10
FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
WARNING_PREFIX="${WARNING} *** ${NORMAL}"
 
SUCCESS_SUFFIX="${BRACKET}[${SUCCESS} OK ${BRACKET}]${NORMAL}"
FAILURE_SUFFIX="${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
WARNING_SUFFIX="${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
 
BOOTLOG=/run/var/bootlog
KILLDELAY=3
 
567,7 → 571,7
log_success_msg()
{
echo -n -e "${BMPREFIX}${@}"
echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${BRACKET}[${SUCCESS} OK ${BRACKET}]${NORMAL}"
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'`
581,7 → 585,7
log_success_msg2()
{
echo -n -e "${BMPREFIX}${@}"
echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${BRACKET}[${SUCCESS} OK ${BRACKET}]${NORMAL}"
echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
 
echo " OK" >> ${BOOTLOG}
602,7 → 606,7
log_failure_msg()
{
echo -n -e "${BMPREFIX}${@}"
echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
 
# Strip non-printable characters from log file
 
616,7 → 620,7
log_failure_msg2()
{
echo -n -e "${BMPREFIX}${@}"
echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
 
echo "FAIL" >> ${BOOTLOG}
635,7 → 639,7
log_warning_msg()
{
echo -n -e "${BMPREFIX}${@}"
echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
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'`
/trunk/lfs/bootscripts/lfs/sbin/ifup
55,7 → 55,7
 
. /lib/lsb/init-functions
 
log_info_msg "Bringing up the ${1} interface: "
log_info_msg "Bringing up the ${1} interface... "
 
if [ ! -r "${file}" ]; then
log_warning_msg "\n${file} is missing or cannot be accessed."
76,35 → 76,39
exit 0
fi
 
if [ -n "${SERVICE}" -a -x "/lib/services/${SERVICE}" ]; then
if [ -z "${CHECK_LINK}" -o \
"${CHECK_LINK}" = "y" -o \
"${CHECK_LINK}" = "yes" -o \
"${CHECK_LINK}" = "1" ]; then
for S in ${SERVICES}; do
if [ ! -n "${S}" -o ! -x "/lib/services/${S}" ]; then
MSG="\nUnable to process ${file}. Either "
MSG="${MSG}the SERVICE variable was not set "
MSG="${MSG}or the specified service cannot be executed."
log_failure_msg "$MSG"
exit 1
fi
done
 
# Bring up the interface
if ip link show ${IFACE} > /dev/null 2>&1; then
link_status=`ip link show ${IFACE}`
if [ -z "${CHECK_LINK}" -o \
"${CHECK_LINK}" = "y" -o \
"${CHECK_LINK}" = "yes" -o \
"${CHECK_LINK}" = "1" ]; then
 
if [ -n "${link_status}" ]; then
if ! echo "${link_status}" | grep -q UP; then
ip link set ${IFACE} up
fi
# Bring up the interface
if ip link show ${IFACE} > /dev/null 2>&1; then
link_status=`ip link show ${IFACE}`
 
if [ -n "${link_status}" ]; then
if ! echo "${link_status}" | grep -q UP; then
ip link set ${IFACE} up
fi
fi
 
else
log_warning_msg "\nInterface ${IFACE} doesn't exist."
fi
else
log_warning_msg "\nInterface ${IFACE} doesn't exist."
exit 0
fi
fi
 
IFCONFIG=${file} /lib/services/${SERVICE} ${IFACE} up
for S in ${SERVICE}; do
IFCONFIG=${file} /lib/services/${S} ${IFACE} up
done
 
else
MSG="\nUnable to process ${file}. Either "
MSG="${MSG}the SERVICE variable was not set "
MSG="${MSG}or the specified service cannot be executed."
log_failure_msg "$MSG"
exit 1
fi
 
# End /sbin/ifup
/trunk/lfs/bootscripts/lfs/sbin/ifdown
67,20 → 67,26
exit 1
fi
 
# This will run the service script, if SERVICE is set
if [ -n "${SERVICE}" -a -x "/lib/services/${SERVICE}" ]; then
if ip link show ${IFACE} > /dev/null 2>&1; then
IFCONFIG=${file} /lib/services/${SERVICE} ${IFACE} down
else
log_warning_msg "Interface ${1} doesn't exist."
echo_warning
fi
# Reverse the order
SERVICES=
for S in ${SERVICE}; do SERVICES="${SERVICES} ${S}"; done
 
# This will run the service scripts
if ip link show ${IFACE} > /dev/null 2>&1; then
for S in ${SERVICES}; do
 
if [ -n "${S}" -a -x "/lib/services/${S}" ]; then
IFCONFIG=${file} /lib/services/${S} ${IFACE} down
else
MSG="Unable to process ${file}. Either "
MSG="${MSG}the SERVICE variable was not set "
MSG="${MSG}or the specified service cannot be executed."
log_failure_msg "$MSG"
exit 1
fi
done
else
MSG="Unable to process ${file}. Either "
MSG="${MSG}the SERVICE variable was not set"
MSG="${MSG}or the specified service cannot be executed."
log_failure_msg "$MSG"
exit 1
log_warning_msg "Interface ${1} doesn't exist."
fi
 
link_status=`ip link show ${IFACE} 2>/dev/null`