From 97df39f63ac9d6bb17326ecba2c089d48133061b Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Thu, 24 Nov 2011 15:28:33 -0500 Subject: [PATCH] Uninstall GRUB 1.99 from chroot in favour of 1.97 See CL https://gerrit.chromium.org/gerrit/#change,11951 for the original CL. BUG=chromium-os:23407 TEST=Tested on chroot synced on 23/11/11 Change-Id: I039d6b6ee06617dfa9263eab4fe83e128f0773b4 Reviewed-on: https://gerrit.chromium.org/gerrit/12106 Reviewed-by: Peter Mayo Reviewed-by: Sean Paul Tested-by: Sean Paul Commit-Ready: Sean Paul --- chroot_version_hooks.d/18_noop | 6 ++++++ .../{18_grub_upgrade => 21_grub_downgrade} | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 chroot_version_hooks.d/18_noop rename chroot_version_hooks.d/{18_grub_upgrade => 21_grub_downgrade} (74%) diff --git a/chroot_version_hooks.d/18_noop b/chroot_version_hooks.d/18_noop new file mode 100644 index 0000000000..b523eca776 --- /dev/null +++ b/chroot_version_hooks.d/18_noop @@ -0,0 +1,6 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# No-op, this change is being reverted +exit 0 diff --git a/chroot_version_hooks.d/18_grub_upgrade b/chroot_version_hooks.d/21_grub_downgrade similarity index 74% rename from chroot_version_hooks.d/18_grub_upgrade rename to chroot_version_hooks.d/21_grub_downgrade index 27c7a0b823..bcf6117a7c 100644 --- a/chroot_version_hooks.d/18_grub_upgrade +++ b/chroot_version_hooks.d/21_grub_downgrade @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -CLEAN_DELAY=0 sudo emerge --unmerge =sys-boot/grub-1.97-r2 +CLEAN_DELAY=0 sudo emerge --unmerge =sys-boot/grub-1.99-r2 exit 0 +