From 5d267f91d771c46166d4bee97c27e5688bbca043 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Mon, 27 Jun 2005 16:14:49 +0000 Subject: [PATCH] Fix stage4 so it doesnt run the bootloader stuff git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@716 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/stage4/stage4-controller.sh | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4d17cbb..8e925fbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.279 2005/06/24 22:09:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.280 2005/06/27 16:14:49 rocket Exp $ + + 27 Jun 2005; Eric Edgar + targets/stage4/stage4-controller.sh: + Fix stage4 so it doesnt run the bootloader stuff 24 Jun 2005; Chris Gianelloni targets/support/bootloader-setup.sh: diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh index d927b4ec..82608f79 100755 --- a/targets/stage4/stage4-controller.sh +++ b/targets/stage4/stage4-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/stage4-controller.sh,v 1.5 2005/05/25 19:15:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/stage4-controller.sh,v 1.6 2005/06/27 16:14:49 rocket Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -50,11 +50,7 @@ case $1 in ;; bootloader) - shift - # Here is where we poke in our identifier - touch $1/livecd - - ${clst_sharedir}/targets/support/bootloader-setup.sh $1 + exit 0 ;; target_image_setup) -- 2.26.2