diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2010-08-20 15:59:09 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-08-20 15:59:09 -0700 |
| commit | 4bbc0df43bc27e51aa5f4410693389003aec9ae1 (patch) | |
| tree | cc70fd041711162cfc162db20a93f5d73a5bb044 /recipes/udev/udev-154 | |
| parent | f554f67dfddb4093b9084c75f7910430d2f19b36 (diff) | |
| download | openembedded-4bbc0df43bc27e51aa5f4410693389003aec9ae1.tar.gz | |
udev 141/151/154: Move rm'ing /tmp/uname, etc, to udev-cache
Otherwise we'll remove these files before udev-cache is run.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/udev/udev-154')
| -rw-r--r-- | recipes/udev/udev-154/cache | 20 | ||||
| -rw-r--r-- | recipes/udev/udev-154/init | 5 |
2 files changed, 12 insertions, 13 deletions
diff --git a/recipes/udev/udev-154/cache b/recipes/udev/udev-154/cache index 4db1466817..c0d400b448 100644 --- a/recipes/udev/udev-154/cache +++ b/recipes/udev/udev-154/cache @@ -6,13 +6,17 @@ export TZ=/etc/localtime echo "Caching udev devnodes" - if [ "$DEVCACHE" != "" ]; then - echo -n "Populating dev cache" - (cd /; tar cf $DEVCACHE dev) - mv /tmp/uname /etc/udev/saved.uname - mv /tmp/cmdline /etc/udev/saved.cmdline - mv /tmp/atags /etc/udev/saved.atags - echo - fi +if [ "$DEVCACHE" != "" ]; then + echo -n "Populating dev cache" + (cd /; tar cf $DEVCACHE dev) + mv /tmp/uname /etc/udev/saved.uname + mv /tmp/cmdline /etc/udev/saved.cmdline + mv /tmp/atags /etc/udev/saved.atags + echo +else + rm -f /tmp/uname + rm -f /tmp/cmdline + rm -f /tmp/atags +fi exit 0 diff --git a/recipes/udev/udev-154/init b/recipes/udev/udev-154/init index fea2ca66ee..e9ecf970b3 100644 --- a/recipes/udev/udev-154/init +++ b/recipes/udev/udev-154/init @@ -65,11 +65,6 @@ kill_udevd > "/dev/null" 2>&1 if [ "$not_first_boot" != "" ];then /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)& - if [ "$DEVCACHE" != "" ]; then - rm -f /tmp/uname - rm -f /tmp/cmdline - rm -f /tmp/atags - fi else /sbin/udevadm trigger /sbin/udevadm settle |