summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/installer/adt-installer
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2012-08-27 13:32:30 -0500
committerSaul Wold <sgw@linux.intel.com>2012-08-28 08:03:41 -0700
commitaa5d6bd006d3b4eede21d8987451876ed3385ab8 (patch)
treed2bf085eff2552d3cb305dcbc620e67781f183cb /meta/recipes-devtools/installer/adt-installer
parent812ec5434be01154c225b672a0ad4dcfb9d927ae (diff)
downloadopenembedded-core-aa5d6bd006d3b4eede21d8987451876ed3385ab8.tar.gz
openembedded-core-aa5d6bd006d3b4eede21d8987451876ed3385ab8.tar.bz2
openembedded-core-aa5d6bd006d3b4eede21d8987451876ed3385ab8.zip
runqemu-export-rootfs and friends: don't put pseudo db in target fs
In a few places, we have scripts which use <rootfs>/var/pseudo for the pseudo state directory controlling a given filesystem. This seems possibly risky because it means that stuff running under qemu or whatnot could wipe out the data being used to handle that rootfs. Move this to: <rootfs>/../$(basename_rootfs).pseudo_state to avoid problems. This also solves at least one case (not directly hit by yocto's tree) wherein you could end up trying to remove a rootfs while pseudo was using a database inside that rootfs, and thus the remove would fail. Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
index 62dc170c8a..d1a595b268 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
@@ -28,7 +28,6 @@ extract_rootfs()
native_sysroot=$3
target_sysroot=$2
PSEUDO_COMMAND="$native_sysroot/usr/bin/pseudo"
- PSEUDO_OPTS="-P $natvie_sysroot/usr"
TAR_OPTS="-xjf"
PSEUDO_OPTS="-P $native_sysroot/usr"
@@ -46,9 +45,10 @@ extract_rootfs()
mkdir -p "$target_sysroot"
fi
- mkdir -p "$target_sysroot/var/pseudo"
- touch "$target_sysroot/var/pseudo/pseudo.pid"
- PSEUDO_LOCALSTATEDIR="$target_sysroot/var/pseudo"
+ pseudo_state_dir="$target_sysroot/../$(basename "$target_sysroot").pseudo_state"
+ mkdir -p "$pseudo_state_dir"
+ touch "$pseudo_state_dir/pseudo.pid"
+ PSEUDO_LOCALSTATEDIR="$pseudo_state_dir"
export PSEUDO_LOCALSTATEDIR
echo_info "Extracting rootfs: $1, using pseudo..."