[PATCH f17-branch 4/4] disable warnings about boot options needing 'inst.XXX'

[Will Woods <wwoods redhat com>]

We're not quite ready for the switch yet, so suppress these messages.
---
 anaconda                         |    8 +++++---
 dracut/parse-anaconda-options.sh |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/anaconda b/anaconda
index ae23d4f..273d2a0 100755
--- a/anaconda
+++ b/anaconda
@@ -621,9 +621,11 @@ if __name__ == "__main__":
 
     log.info("%s %s" % (sys.argv[0], getAnacondaVersion()))
 
-    for arg in depr:
-        stdoutLog.warn("Boot argument '%s' is deprecated. "
-                       "In the future, use 'inst.%s'.", arg, arg)
+    # TODO: uncomment this when we're sure that we're doing the right thing
+    # with flags.cmdline *everywhere* it appears...
+    #for arg in depr:
+    #    stdoutLog.warn("Boot argument '%s' is deprecated. "
+    #                   "In the future, use 'inst.%s'.", arg, arg)
 
     # pull this in to get product name and versioning
     from pyanaconda import product
diff --git a/dracut/parse-anaconda-options.sh b/dracut/parse-anaconda-options.sh
index cd041f4..10ebebd 100755
--- a/dracut/parse-anaconda-options.sh
+++ b/dracut/parse-anaconda-options.sh
@@ -47,6 +47,8 @@ warn_renamed_arg() {
     arg="$(getarg $1)" && warn "'$1=$arg'" && warn "$1 has been renamed to $2"
 }
 
+warn_renamed_arg() { :; } # XXX REMOVE WHEN WE'RE READY FOR THE NEW NAMES.
+
 # check for deprecated arg, warn user, and write new arg to /etc/cmdline
 check_depr_arg() {
     local arg="" quiet="" newval=""
@@ -80,11 +82,11 @@ getarg asknetwork && warn "'asknetwork' is deprecated and has been removed." &&\
                      warn "Use an appropriate 'ip=' argument instead."
 
 # lang & keymap
-check_depr_arg "lang=" "locale.LANG=%s"
-check_depr_arg "keymap=" "vconsole.keymap=%s"
+warn_renamed_arg "lang" "inst.lang"
+warn_renamed_arg "keymap" "inst.keymap"
 
 # repo
-check_depr_arg "method=" "inst.repo=%s"
+check_depr_arg "method=" "repo=%s"
 warn_renamed_arg "repo" "inst.repo"
 
 # kickstart
-- 
1.7.7.6