[OE-core] [PATCH 1/1] initscripts: improve the way initscripts handle volatile storage
Qi.Chen at windriver.com
Qi.Chen at windriver.com
Mon Nov 12 11:33:34 UTC 2012
From: Chen Qi <Qi.Chen at windriver.com>
Change the way how populate_volatile.sh handles link-type config
items. Previously, if a link-type config item is encountered, the
script does not handle it correctly. If the target exists as a link,
the config item is skipped no matter where the target actually points.
If the target exists as a file or a directory, it does nothing.
This behavious is sometimes confusing; for example, if /run has been
created by other recipes, it will not be updated to a symlink as the
config file states.
This patch makes populate_volatile.sh do things as the config file
tells it. As for link-type config items, it creates them properly
with an effort to avoid data loss.
Besides, it's not appropriate to divide volatile storage handling
into two files. Operations for /tmp directory in bootmisc.sh should
also be done by populate_volatile.sh.
[YOCTO #3404]
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
.../initscripts/initscripts-1.0/bootmisc.sh | 7 -----
.../initscripts-1.0/populate-volatile.sh | 28 +++++++++-----------
.../initscripts/initscripts-1.0/volatiles | 1 +
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 4f76cb4..80f7ead 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -54,13 +54,6 @@ fi
#
# This is as good a place as any for a sanity check
-# /tmp should be a symlink to /var/tmp to cut down on the number
-# of mounted ramdisks.
-if test ! -L /tmp && test -d /var/tmp
-then
- rm -rf /tmp
- ln -sf /var/tmp /tmp
-fi
# Set the system clock from hardware clock
# If the timestamp is more recent than the current time,
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index d2175d7..baee2ef 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -47,15 +47,16 @@ mk_dir() {
}
link_file() {
- EXEC="test -e \"$2\" -o -L $2 || ln -s \"$1\" \"$2\" >/dev/tty0 2>&1"
-
- test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache.build
-
- [ -e "$2" ] && {
- echo "Cannot create link over existing -${TNAME}-." >&2
- } || {
- eval $EXEC &
- }
+ EXEC="
+ if [ -L \"$2\" ]; then
+ rm -f \"$2\";
+ elif [ -d \"$2\" ]; then
+ cp -rf \"$2/*\" \"$1\";
+ rm -rf \"$2\";
+ fi;
+ ln -sf \"$1\" \"$2\" "
+ test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.
+ eval $EXEC &
}
check_requirements() {
@@ -119,20 +120,17 @@ apply_cfgfile() {
return 1
}
- cat ${CFGFILE} | grep -v "^#" | \
+ cat ${CFGFILE} | grep -v "^#" | sed -e '/^$/ d' | \
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}" ] || {
- [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
- link_file "${TSOURCE}" "${TNAME}" &
- }
+ [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+ link_file "${TSOURCE}" "${TNAME}" &
continue
}
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index e0741aa..f7e2ef7 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -31,6 +31,7 @@ l root root 1777 /var/lock /var/volatile/lock
l root root 0755 /var/log /var/volatile/log
l root root 0755 /var/run /var/volatile/run
l root root 1777 /var/tmp /var/volatile/tmp
+l root root 1777 /tmp /var/tmp
d root root 0755 /var/lock/subsys none
f root root 0664 /var/log/wtmp none
f root root 0664 /var/run/utmp none
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index d25838b..251dd06 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r137"
+PR = "r138"
INHIBIT_DEFAULT_DEPS = "1"
--
1.7.9.5
More information about the Openembedded-core
mailing list