[27502] in Source-Commits
scripts commit: Change how we pick distro-specific options
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Oct 1 13:02:41 2013
Date: Tue, 1 Oct 2013 13:02:33 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201310011702.r91H2Xeh027824@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/scripts/commit/2a6c7d12152d8fcb603e52d7471cf8f68d52627b
commit 2a6c7d12152d8fcb603e52d7471cf8f68d52627b
Author: Jonathan Reed <jdreed@mit.edu>
Date: Wed Sep 25 14:32:49 2013 -0400
Change how we pick distro-specific options
If the distro contains a '-', use the first part of it
to pick distro-specific options. This allows us to do
something like 'precise-testing' and still have it pick
the correct kernel arguments. This may not DTRT for
raspbian-wheezy
installer/pxe/stage1/debathena/installer.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/installer/pxe/stage1/debathena/installer.sh b/installer/pxe/stage1/debathena/installer.sh
index ea051a9..b39023f 100644
--- a/installer/pxe/stage1/debathena/installer.sh
+++ b/installer/pxe/stage1/debathena/installer.sh
@@ -366,7 +366,8 @@ fi
dkargs="DEBCONF_DEBUG=5"
nodhcp="netcfg/disable_dhcp=true"
-case "$distro" in
+distrobase=$(echo "$distro" | sed -e 's/-.*//')
+case "$distrobase" in
oneiric|precise|quantal|raring)
kbdcode="keyboard-configuration/layoutcode=us"
# "Yay"
