Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init-ifupdown: use [[:blank:]] posix expression instead of '\s' shorthand 

According to 'grep' manual '\s' is a synonym for [[:space:]] which
matches spaces, TABs, but also newlines, etc. We want to only match
spaces and TABs, so use [[:blank:]] instead.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2016-08-09 19:32:00 +02:00
parent b31c09e59f
commit 7727b4402e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
View File

@ -50,34 +50,34 @@ do_install_append() {
sed -i -e 's,##CELLULAR_INTERFACE##,${CELLULAR_INTERFACE},g' ${D}${sysconfdir}/network/interfaces
if [ -n "${CELLULAR_APN}" ]; then
sed -i -e 's/^\(\s*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces
sed -i -e 's/^\([[:blank:]]*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces
else
sed -i -e '/^\s*apn/d' ${D}${sysconfdir}/network/interfaces
sed -i -e '/^[[:blank:]]*apn/d' ${D}${sysconfdir}/network/interfaces
fi
if [ -n "${CELLULAR_PIN}" ]; then
sed -i -e 's/^\(\s*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces
sed -i -e 's/^\([[:blank:]]*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces
else
sed -i -e '/^\s*pin/d' ${D}${sysconfdir}/network/interfaces
sed -i -e '/^[[:blank:]]*pin/d' ${D}${sysconfdir}/network/interfaces
fi
if [ -n "${CELLULAR_PORT}" ]; then
sed -i -e 's/^\(\s*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces
sed -i -e 's/^\([[:blank:]]*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces
sed -i -e 's,dhcp,manual,g' ${D}${sysconfdir}/network/interfaces
else
sed -i -e '/^\s*port/d' ${D}${sysconfdir}/network/interfaces
sed -i -e '/^[[:blank:]]*port/d' ${D}${sysconfdir}/network/interfaces
fi
if [ -n "${CELLULAR_USER}" ]; then
sed -i -e 's/^\(\s*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces
sed -i -e 's/^\([[:blank:]]*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces
else
sed -i -e '/^\s*user/d' ${D}${sysconfdir}/network/interfaces
sed -i -e '/^[[:blank:]]*user/d' ${D}${sysconfdir}/network/interfaces
fi
if [ -n "${CELLULAR_PASSWORD}" ]; then
sed -i -e 's/^\(\s*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces
sed -i -e 's/^\([[:blank:]]*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces
else
sed -i -e '/^\s*password/d' ${D}${sysconfdir}/network/interfaces
sed -i -e '/^[[:blank:]]*password/d' ${D}${sysconfdir}/network/interfaces
fi
fi