From 6e61eb7d3cc3016ea1d36a9b9f8b2e2fb1df4314 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 17 May 2009 18:12:42 +0200 Subject: [PATCH] entropy.client.interfaces.trigger: fix regression in grub.conf kernel string generation --- libraries/entropy/client/interfaces/trigger.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/entropy/client/interfaces/trigger.py b/libraries/entropy/client/interfaces/trigger.py index 9a95e284a..1d4f28251 100644 --- a/libraries/entropy/client/interfaces/trigger.py +++ b/libraries/entropy/client/interfaces/trigger.py @@ -1398,9 +1398,15 @@ class Trigger: # having a running system without a bootloader, at least, grub. grub.write("default=0\ntimeout=10\n") + cmdline = '' + if os.access("/proc/cmdline", os.R_OK): + cmdline_f = open("/proc/cmdline","r") + cmdline = " "+cmdline_f.readline().strip() + cmdline_f.close() + grub.write(self.__get_entropy_kernel_grub_line(kernel)) grub.write("\troot "+boot_dev+"\n") - grub.write("\tkernel "+kernel+"\n") + grub.write("\tkernel "+kernel+cmdline+"\n") if initramfs: grub.write("\tinitrd "+initramfs+"\n") grub.write("\tsavedefault\n")