[27069] in Source-Commits
/svn/athena r25928 - trunk/debathena/scripts/installer/pxe/stage1/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Apr 18 12:35:57 2013
Date: Thu, 18 Apr 2013 12:35:50 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304181635.r3IGZoQc000936@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-18 12:35:50 -0400 (Thu, 18 Apr 2013)
New Revision: 25928
Modified:
trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
Log:
- Move the extra_kargs clause before the reboot notice
- Add the extra kernel args before the end-of-arguments delimiter
Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2013-04-18 16:24:42 UTC (rev 25927)
+++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2013-04-18 16:35:50 UTC (rev 25928)
@@ -328,6 +328,13 @@
netconfig
fi
+extra_kargs=""
+if [ "$installertype" = "beta" ]; then
+ echo "Any extra kernel arguments to pass to kexec?"
+ echo "(I hope you know what you're doing. Press Enter for none.)"
+ read extra_kargs
+fi
+
if [ "$pxetype" = "cluster" ] && [ "$partitioning" = "auto" ]; then
cat << EOF
************************************************************
@@ -404,17 +411,8 @@
kargs="$knetinfo $kbdcode $acpi locale=en_US interface=auto \
url=http://18.9.60.73/installer/$distro/debathena.preseed \
da/pxe=$pxetype da/i=$installertype da/m=$mirrorsite \
-da/part=$partitioning --"
+da/part=$partitioning $extra_kargs --"
-extra_kargs=""
-if [ "$installertype" = "beta" ]; then
- echo "Any extra kernel arguments to pass to kexec?"
- echo "(I hope you know what you're doing. Press Enter for none.)"
- read extra_kargs
-fi
-
-kargs="$kargs $extra_kargs"
-
echo "Continuing in five seconds..."
if [ "$test" = "test" ]; then
echo "Would run kexec with these args:"
