From 8cfdd3d266a14a6adac88357d1caba8219c7eabe Mon Sep 17 00:00:00 2001
From: Zdenek Behan <zbehan@chromium.org>
Date: Thu, 12 May 2011 22:25:47 +0200
Subject: [PATCH] upgrade_chroot: integrate upgrade hooks into chroot updater

BUG=chromium-os:6151
TEST=run update_chroot

Change-Id: Ieb9afafa7961bd43f9b53ead14e698adc9d5179e
Reviewed-on: http://gerrit.chromium.org/gerrit/886
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>
---
 update_chroot | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/update_chroot b/update_chroot
index a16de44b36..19bcd8cec6 100755
--- a/update_chroot
+++ b/update_chroot
@@ -14,6 +14,9 @@
 # Script must run inside the chroot
 assert_inside_chroot "$@"
 
+# Do not run as root
+assert_not_root_user
+
 # Flags
 DEFINE_boolean usepkg $FLAGS_TRUE \
   "Use binary packages to bootstrap."
@@ -29,6 +32,9 @@ eval set -- "${FLAGS_ARGV}"
 # so will die prematurely if 'set -e' is specified before now.
 set -e
 
+# Run version hooks as pre-update
+${SCRIPTS_DIR}/run_chroot_version_hooks
+
 info "Updating chroot"
 
 EMERGE_FLAGS="-uDNv --with-bdeps=y"