sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: aa5d6bd006d3b4eede21d8987451876ed3385ab8)

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Seebach 2012-08-27 13:32:30 -05:00 committed by Richard Purdie
parent c0aa58f461
commit 92e40ec859
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
View File

@ -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..."

2
scripts/runqemu-export-rootfs
View File

@ -68,7 +68,7 @@ NFSPID=~/.runqemu-sdk/nfs$NFS_INSTANCE.pid
MOUNTPID=~/.runqemu-sdk/mount$NFS_INSTANCE.pid
PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"
PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo"
PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/../$(basename $NFS_EXPORT_DIR).pseudo_state"
export PSEUDO_LOCALSTATEDIR
if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then

15
scripts/runqemu-extract-sdk
View File

@ -73,15 +73,18 @@ if [ ! -d "$SDK_ROOTFS_DIR" ]; then
mkdir -p "$SDK_ROOTFS_DIR"
fi
if [ -e "$SDK_ROOTFS_DIR/var/pseudo" ]; then
echo "Error: $SDK_ROOTFS_DIR/var/pseudo already exists!"
echo "Please delete the entire rootfs tree manually if this is really what you want"
pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename "$SDK_ROOTFS_DIR").pseudo_state"
if [ -e "$pseudo_state_dir" ]; then
echo "Error: $pseudo_state_dir already exists!"
echo "Please delete the rootfs tree and pseudo directory manually"
echo "if this is really what you want."
exit 1
fi
mkdir -p "$SDK_ROOTFS_DIR/var/pseudo"
touch "$SDK_ROOTFS_DIR/var/pseudo/pseudo.pid"
PSEUDO_LOCALSTATEDIR="$SDK_ROOTFS_DIR/var/pseudo"
mkdir -p "$pseudo_state_dir"
touch "$pseudo_state_dir/pseudo.pid"
PSEUDO_LOCALSTATEDIR="$pseudo_state_dir"
export PSEUDO_LOCALSTATEDIR
echo "Extracting rootfs tarball using pseudo..."