Make restart_in_chroot_if_needed run against scripts that are symlinks

Make restart_in_chroot_if_needed run against scripts that are symlinks

This reverts the main change of
84e72fab23c1359785f93685df6a3a45e7612d6e

and undoes the breakage of scripts that are symlinks to
...chromeos/scripts..., but at the cost of re-breaking scripts under
scripts/bin.  The correct fix is a combination of removing all the
symlinks to ...chromeos/scripts... and a more robust way of finding
the chroot path of the executable.  But that will have to wait until
someone else does it next week or I return from vacation

TEST=Ran all of these outside chroot.  None seemed more broken than when run in the chroot.  /setup_board  --board=x86-generic, ./cros_workon list --all --board=x86-mario, ./start_devserver , ./build_image --help, ./build_packages --help, ./cros_upgrade_chroot --help, ./enter_chroot.sh , ./customize_rootfs --help, ./run_remote_tests.sh , ./verify_rootfs_chksum.sh , ./set_shared_user_password.sh
BUG=n0ne

Change-Id: Ic2b7484e53e6a977ed6ae675fe99e109b385020d

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=b4f6b3c

[anush, 2010-12-16 22:42:28]

restarting in chroot hasn't been an officially supported workflow
(though it works most of the time). We are trying to create a unified
way to do it so until then please understand certain scripts will
break. Just ensure it doesn't break the officially documented
workflow.

On Thu, Dec 16, 2010 at 2:24 PM,  <rochberg@chromium.org> wrote:
> Reviewers: Greg Spencer (Chromium),
>
> Description:
> Make restart_in_chroot_if_needed run against scripts that are symlinks
>
> This reverts the main change of
> 84e72fab23c1359785f93685df6a3a45e7612d6e
>
> and undoes the breakage of scripts that are symlinks to
> ...chromeos/scripts..., but at the cost of re-breaking scripts under
> scripts/bin.  The correct fix is a combination of removing all the
> symlinks to ...chromeos/scripts... and a more robust way of finding
> the chroot path of the executable.  But that will have to wait until
> someone else does it next week or I return from vacation
>
> TEST=Ran all of these outside chroot.  None seemed more broken than when run
> in
> the chroot.  /setup_board  --board=x86-generic, ./cros_workon list --all
> --board=x86-mario, ./start_devserver , ./build_image --help,
> ./build_packages
> --help, ./cros_upgrade_chroot --help, ./enter_chroot.sh , ./customize_rootfs
> --help, ./run_remote_tests.sh , ./verify_rootfs_chksum.sh ,
> ./set_shared_user_password.sh
> BUG=n0ne
>
> Change-Id: Ic2b7484e53e6a977ed6ae675fe99e109b385020d
>
> Please review this at http://codereview.chromium.org/5946003/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
>
> Affected files:
>  M common.sh
>
>
> Index: common.sh
> diff --git a/common.sh b/common.sh
> index
>
a11f2572899ed6885699745aa73f8d32e90e79bb..32cf4b39f74d8b261df668838208056b5786f420
> 100644
> --- a/common.sh
> +++ b/common.sh
> @@ -234,12 +234,9 @@ function restart_in_chroot_if_needed {
>   # NB:  Pass in ARGV:  restart_in_chroot_if_needed "$@"
>   if [ $INSIDE_CHROOT -ne 1 ]
>   then
> -    local abspath=$(readlink -f "$0")
> -    # strip everything up to (and including) /src/scripts/ from abspath
> -    local path_from_scripts="${abspath##*/src/scripts/}"
> +    # Equivalent to enter_chroot.sh -- <current command>
>     exec $SCRIPTS_DIR/enter_chroot.sh -- \
> -      "$CHROOT_TRUNK_DIR/src/scripts/$path_from_scripts" "$@"
> -    exit
> +      $CHROOT_TRUNK_DIR/src/scripts/$(basename $0) $*
>   fi
>  }
>
>
>
>

[diandersAtChromium, 2010-12-16 22:54:10]

See comment: seems like $* should still be "$@"

http://codereview.chromium.org/5946003/diff/1/common.sh
File common.sh (right):

http://codereview.chromium.org/5946003/diff/1/common.sh#newcode239
common.sh:239: $CHROOT_TRUNK_DIR/src/scripts/$(basename $0) $*
Should still be "$@", right?

[Greg Spencer (Chromium), 2010-12-17 00:19:24]

LGTM, after addressing the thing below.

http://codereview.chromium.org/5946003/diff/1/common.sh
File common.sh (right):

http://codereview.chromium.org/5946003/diff/1/common.sh#newcode239
common.sh:239: $CHROOT_TRUNK_DIR/src/scripts/$(basename $0) $*
On 2010/12/16 22:54:10, diandersAtChromium wrote:
> Should still be "$@", right?

I agree, it should be.

[Greg Spencer (Chromium), 2010-12-17 00:20:58]

> The correct fix is a combination of removing all the
> symlinks to ...chromeos/scripts... and a more robust way of finding
> the chroot path of the executable.  But that will have to wait until
> someone else does it next week or I return from vacation

I can maybe take a look at doing that.