|
 |
1070a0 |
--- ./koan/app.py 2011-08-24 11:54:37.985552147 +0200
|
|
|
1070a0 |
+++ ./koan/app.py 2011-08-24 11:55:39.448880750 +0200
|
|
|
1070a0 |
@@ -742,19 +742,19 @@ class Koan:
|
|
|
1070a0 |
|
|
|
1070a0 |
# Validate kernel argument length (limit depends on architecture --
|
|
|
1070a0 |
# see asm-*/setup.h). For example:
|
|
|
1070a0 |
- # asm-i386/setup.h:#define COMMAND_LINE_SIZE 256
|
|
|
1070a0 |
+ # asm-i386/setup.h:#define COMMAND_LINE_SIZE 2048
|
|
|
1070a0 |
# asm-ia64/setup.h:#define COMMAND_LINE_SIZE 512
|
|
|
1070a0 |
# asm-powerpc/setup.h:#define COMMAND_LINE_SIZE 512
|
|
|
1070a0 |
# asm-s390/setup.h:#define COMMAND_LINE_SIZE 896
|
|
|
1070a0 |
- # asm-x86_64/setup.h:#define COMMAND_LINE_SIZE 256
|
|
|
1070a0 |
+ # asm-x86_64/setup.h:#define COMMAND_LINE_SIZE 2048
|
|
|
1070a0 |
if arch.startswith("ppc") or arch.startswith("ia64"):
|
|
|
1070a0 |
if len(k_args) > 511:
|
|
|
1070a0 |
raise InfoException, "Kernel options are too long, 512 chars exceeded: %s" % k_args
|
|
|
1070a0 |
elif arch.startswith("s390"):
|
|
|
1070a0 |
if len(k_args) > 895:
|
|
|
1070a0 |
raise InfoException, "Kernel options are too long, 896 chars exceeded: %s" % k_args
|
|
|
1070a0 |
- elif len(k_args) > 255:
|
|
|
1070a0 |
- raise InfoException, "Kernel options are too long, 255 chars exceeded: %s" % k_args
|
|
|
1070a0 |
+ elif len(k_args) > 2047:
|
|
|
1070a0 |
+ raise InfoException, "Kernel options are too long, 2047 chars exceeded: %s" % k_args
|
|
|
1070a0 |
|
|
|
1070a0 |
utils.subprocess_call([
|
|
|
1070a0 |
'kexec',
|
|
|
1070a0 |
@@ -829,11 +829,11 @@ class Koan:
|
|
|
1070a0 |
|
|
|
1070a0 |
# Validate kernel argument length (limit depends on architecture --
|
|
|
1070a0 |
# see asm-*/setup.h). For example:
|
|
|
1070a0 |
- # asm-i386/setup.h:#define COMMAND_LINE_SIZE 256
|
|
|
1070a0 |
+ # asm-i386/setup.h:#define COMMAND_LINE_SIZE 2048
|
|
|
1070a0 |
# asm-ia64/setup.h:#define COMMAND_LINE_SIZE 512
|
|
|
1070a0 |
# asm-powerpc/setup.h:#define COMMAND_LINE_SIZE 512
|
|
|
1070a0 |
# asm-s390/setup.h:#define COMMAND_LINE_SIZE 896
|
|
|
1070a0 |
- # asm-x86_64/setup.h:#define COMMAND_LINE_SIZE 256
|
|
|
1070a0 |
+ # asm-x86_64/setup.h:#define COMMAND_LINE_SIZE 2048
|
|
|
1070a0 |
if not ANCIENT_PYTHON:
|
|
|
1070a0 |
if arch.startswith("ppc") or arch.startswith("ia64"):
|
|
|
1070a0 |
if len(k_args) > 511:
|
|
|
1070a0 |
@@ -841,8 +841,8 @@ class Koan:
|
|
|
1070a0 |
elif arch.startswith("s390"):
|
|
|
1070a0 |
if len(k_args) > 895:
|
|
|
1070a0 |
raise InfoException, "Kernel options are too long, 896 chars exceeded: %s" % k_args
|
|
|
1070a0 |
- elif len(k_args) > 255:
|
|
|
1070a0 |
- raise InfoException, "Kernel options are too long, 255 chars exceeded: %s" % k_args
|
|
|
1070a0 |
+ elif len(k_args) > 2047:
|
|
|
1070a0 |
+ raise InfoException, "Kernel options are too long, 2047 chars exceeded: %s" % k_args
|
|
|
1070a0 |
|
|
|
1070a0 |
cmd = [ "/sbin/grubby",
|
|
|
1070a0 |
"--add-kernel", self.safe_load(profile_data,'kernel_local'),
|