diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-06-18 12:48:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-25 17:44:56 +0100 |
commit | 9d68aa5e3590c8eefb221f62b0390a05061a756a (patch) | |
tree | db832bfb11d472c76a8304c3af49a0248b93f6b3 /meta/recipes-core | |
parent | 763ebb62cd154d6435dc1f5eaf6534b3911c9ebc (diff) | |
download | ast2050-yocto-poky-9d68aa5e3590c8eefb221f62b0390a05061a756a.zip ast2050-yocto-poky-9d68aa5e3590c8eefb221f62b0390a05061a756a.tar.gz |
udev-cache: fix to use udev-cache correctly
Previouly, the udev-cache has no real effect even if it's installed
into the system. The key problem here is that at first boot, the
/etc/dev.tar is not present, thus resulting /dev/shm/udev.cache not
created on first boot even if udev-cache is enabled.
This patch fixes this problem. The /dev/shm/udev.cache will be created
if necessary, that is, on first boot or when some part of the system is
changed. In the latter case, the udev cache may not be valid.
[YOCTO #4738]
(From OE-Core rev: 84e0ec2e677fb0236a38478372cdd75797cf5a2e)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd/init | 6 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev/init | 6 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev/udev-cache | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd/init b/meta/recipes-core/systemd/systemd/init index 41c4136..47a1428 100644 --- a/meta/recipes-core/systemd/systemd/init +++ b/meta/recipes-core/systemd/systemd/init @@ -59,8 +59,12 @@ case "$1" in if [ "$READDATA" = "$VERSION$CMDLINE$DEVICES$ATAGS" ]; then (cd /; tar xf $DEVCACHE > /dev/null 2>&1) not_first_boot=1 + [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE" + [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache + else + echo "$VERSION$CMDLINE$DEVICES$ATAGS" > /dev/shm/udev.cache fi - + else echo "$VERSION$CMDLINE$DEVICES$ATAGS" > /dev/shm/udev.cache fi fi diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init index 95f9c03..9b81700 100644 --- a/meta/recipes-core/udev/udev/init +++ b/meta/recipes-core/udev/udev/init @@ -68,8 +68,12 @@ case "$1" in if [ "$READDATA" = "$VERSION$CMDLINE$DEVICES$ATAGS" ]; then (cd /; tar xf $DEVCACHE > /dev/null 2>&1) not_first_boot=1 + [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE" + [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache + else + echo "$VERSION$CMDLINE$DEVICES$ATAGS" > /dev/shm/udev.cache fi - + else echo "$VERSION$CMDLINE$DEVICES$ATAGS" > /dev/shm/udev.cache fi fi diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache index 01fec6e..8a84fa9 100644 --- a/meta/recipes-core/udev/udev/udev-cache +++ b/meta/recipes-core/udev/udev/udev-cache @@ -17,12 +17,10 @@ export TZ=/etc/localtime [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache -if [ "$DEVCACHE" != "" ]; then +if [ "$DEVCACHE" != "" -a -e /dev/shm/udev.cache ]; then echo "Populating dev cache" (cd /; tar cf "$DEVCACHE" dev) mv /dev/shm/udev.cache /etc/udev/cache.data -else - rm -f /dev/shm/udev.cache fi exit 0 |