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

diff --git a/ChangeLog b/ChangeLog
index a4d17cbbcee26289d09ff25ff00e7f4273d01481..8e925fbb659b7c66320093665ee09b519e232f59 100644 (file)
--- 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 <rocket@gentoo.org>
+  targets/stage4/stage4-controller.sh:
+  Fix stage4 so it doesnt run the bootloader stuff
 
   24 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh:

diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index d927b4ec21d493b1c1b2323ccea1f058fc951c29..82608f79c85fc1080048f5291c44a8335f1d80c0 100755 (executable)
--- 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)