initiscripts: Fix populate-volatiles.sh whitespace
(From OE-Core rev: d69935fbef2b5a8b187e58ac5ade0ffb9f95f803) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
56bc2bb95a
commit
2180cc32b9
|
@ -38,7 +38,6 @@ mk_dir() {
|
|||
chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
|
||||
|
||||
test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
|
||||
|
||||
[ -e "$1" ] && {
|
||||
[ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
|
||||
} || {
|
||||
|
@ -59,7 +58,6 @@ link_file() {
|
|||
}
|
||||
|
||||
check_requirements() {
|
||||
|
||||
cleanup() {
|
||||
rm "${TMP_INTERMED}"
|
||||
rm "${TMP_DEFINED}"
|
||||
|
@ -67,18 +65,15 @@ check_requirements() {
|
|||
}
|
||||
|
||||
CFGFILE="$1"
|
||||
|
||||
[ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0
|
||||
|
||||
TMP_INTERMED="${TMPROOT}/tmp.$$"
|
||||
TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
|
||||
TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
|
||||
|
||||
|
||||
cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
|
||||
cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
|
||||
cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
|
||||
|
||||
NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
|
||||
NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
|
||||
|
||||
|
@ -111,7 +106,6 @@ check_requirements() {
|
|||
}
|
||||
|
||||
apply_cfgfile() {
|
||||
|
||||
CFGFILE="$1"
|
||||
|
||||
check_requirements "${CFGFILE}" || {
|
||||
|
@ -121,12 +115,9 @@ apply_cfgfile() {
|
|||
|
||||
cat ${CFGFILE} | grep -v "^#" | \
|
||||
while read LINE; do
|
||||
|
||||
eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
|
||||
|
||||
[ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
|
||||
|
||||
|
||||
[ "${TTYPE}" = "l" ] && {
|
||||
TSOURCE="$TLTARGET"
|
||||
[ -L "${TNAME}" ] || {
|
||||
|
@ -160,12 +151,8 @@ apply_cfgfile() {
|
|||
continue
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
done
|
||||
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
clearcache=0
|
||||
|
|
Loading…
Reference in New Issue