Don't add empty modules line
authorJamie Cameron <jcameron@webmin.com>
Wed, 21 May 2008 20:09:10 +0000 (20:09 +0000)
committerJamie Cameron <jcameron@webmin.com>
Wed, 21 May 2008 20:09:10 +0000 (20:09 +0000)
grub/edit_title.cgi
grub/save_title.cgi

index 39ff5f0..cecab4e 100755 (executable)
@@ -62,7 +62,7 @@ if ($boot == 2) {
 # Booting a kernel
 @opts = ( );
 push(@opts, [ 2, $text{'title_kernel'},
-             &ui_table_start(undef, undef, 2).
+             &ui_table_start(undef, undef, 2, [ undef, "nowrap" ]).
              &ui_table_row($text{'title_kfile'},
                &ui_textbox("kernel", $kernel, 50)." ".
                &file_chooser_button("kernel", 0)).
index 0906fc5..513d2e2 100755 (executable)
@@ -48,7 +48,10 @@ else {
                $title->{'kernel'} = $in{'kernel'};
                $title->{'kernel'} .= " $in{'args'}" if ($in{'args'});
                $title->{'initrd'} = $in{'initrd'} if (!$in{'initrd_def'});
-               $title->{'module'} = join("\0", split(/\r?\n/, $in{'module'}));
+               if ($in{'module'} =~ /\S/) {
+                       $title->{'module'} =
+                               join("\0", split(/\r?\n/, $in{'module'}));
+                       }
                }
        elsif ($in{'boot_mode'} == 1) {
                $title->{'chainloader'} = $in{'chain_def'} ? '+1'