mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

udev-cache: parametrize sysconf file paths

Browse Source 
The udev-cache facility uses files that represent system states, to
ensure that the cache tarball is valid to apply. These paths were
hardcoded in several places; collect them into SYSCONF_CACHED and
SYSCONF_TMP.

(From OE-Core rev: f4fcb237da0d1013005e9a0bb2381cfeb4c5316c)

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Tollerton
2014-08-22 16:30:54 -05:00
committed by Richard Purdie
parent 7c56a5e728
commit fd0aa6af62
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-core/udev/udev/init
View File

@@ -14,6 +14,8 @@ export TZ=/etc/localtime
[ -d /sys/class ] || exit 1 [ -d /sys/class ] || exit 1
[ -r /proc/mounts ] || exit 1 [ -r /proc/mounts ] || exit 1
[ -x @UDEVD@ ] || exit 1 [ -x @UDEVD@ ] || exit 1
SYSCONF_CACHED="/etc/udev/cache.data"
SYSCONF_TMP="/dev/shm/udev.cache"
[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
[ -f /etc/default/rcS ] && . /etc/default/rcS [ -f /etc/default/rcS ] && . /etc/default/rcS
@@ -66,13 +68,13 @@ case "$1" in
if [ -e $DEVCACHE ]; then if [ -e $DEVCACHE ]; then
readfiles $CMP_FILE_LIST readfiles $CMP_FILE_LIST
NEWDATA="$READDATA" NEWDATA="$READDATA"
readfiles /etc/udev/cache.data readfiles "$SYSCONF_CACHED"
OLDDATA="$READDATA" OLDDATA="$READDATA"
if [ "$OLDDATA" = "$NEWDATA" ]; then if [ "$OLDDATA" = "$NEWDATA" ]; then
tar xmf $DEVCACHE -C / -m tar xmf $DEVCACHE -C / -m
not_first_boot=1 not_first_boot=1
[ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE" [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE"
[ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache [ -e $SYSCONF_TMP ] && rm -f "$SYSCONF_TMP"
else else
# Output detailed reason why the cached /dev is not used # Output detailed reason why the cached /dev is not used
if [ "$VERBOSE" != "no" ]; then if [ "$VERBOSE" != "no" ]; then
@@ -81,14 +83,14 @@ case "$1" in
echo "udev: olddata: $OLDDATA" echo "udev: olddata: $OLDDATA"
echo "udev: newdata: $NEWDATA" echo "udev: newdata: $NEWDATA"
fi fi
echo "$NEWDATA" > /dev/shm/udev.cache echo "$NEWDATA" > "$SYSCONF_TMP"
fi fi
else else
if [ "$ROOTFS_READ_ONLY" != "yes" ]; then if [ "$ROOTFS_READ_ONLY" != "yes" ]; then
# If rootfs is not read-only, it's possible that a new udev cache would be generated; # If rootfs is not read-only, it's possible that a new udev cache would be generated;
# otherwise, we do not bother to read files. # otherwise, we do not bother to read files.
readfiles $CMP_FILE_LIST readfiles $CMP_FILE_LIST
echo "$READDATA" > /dev/shm/udev.cache echo "$READDATA" > "$SYSCONF_TMP"
fi fi
fi fi
fi fi

6
meta/recipes-core/udev/udev/udev-cache
View File

@@ -17,6 +17,8 @@ export TZ=/etc/localtime
[ -f /etc/default/rcS ] && . /etc/default/rcS [ -f /etc/default/rcS ] && . /etc/default/rcS
DEVCACHE_TMP="/dev/shm/udev-cache-tmp.tar" DEVCACHE_TMP="/dev/shm/udev-cache-tmp.tar"
SYSCONF_CACHED="/etc/udev/cache.data"
SYSCONF_TMP="/dev/shm/udev.cache"
[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
if [ "$ROOTFS_READ_ONLY" = "yes" ]; then if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
@@ -24,13 +26,13 @@ if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
exit 0 exit 0
fi fi
if [ "$DEVCACHE" != "" -a -e /dev/shm/udev.cache ]; then if [ "$DEVCACHE" != "" -a -e "$SYSCONF_TMP" ]; then
echo "Populating dev cache" echo "Populating dev cache"
find /dev -xdev \( -type b -o -type c -o -type l \) | cut -c 2- \ find /dev -xdev \( -type b -o -type c -o -type l \) | cut -c 2- \
| xargs tar cf "${DEVCACHE_TMP}" -T- | xargs tar cf "${DEVCACHE_TMP}" -T-
gzip < "${DEVCACHE_TMP}" > "$DEVCACHE" gzip < "${DEVCACHE_TMP}" > "$DEVCACHE"
rm -f "${DEVCACHE_TMP}" rm -f "${DEVCACHE_TMP}"
mv /dev/shm/udev.cache /etc/udev/cache.data mv "$SYSCONF_TMP" "$SYSCONF_CACHED"
fi fi
exit 0 exit 0