From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 21 Oct 2013 08:44:59 +0000 (+0200)
Subject: Simplify pulsar config name
X-Git-Tag: 20140513~89
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/novaboot.git/commitdiff_plain/ad5a93d61d26cd13183d5c1c8888dbeaad99260d

Simplify pulsar config name
---

diff --git a/README.md b/README.md
index a19ec18..5df6cc2 100644
--- a/README.md
+++ b/README.md
@@ -218,9 +218,9 @@ scripts. Finally, binaries can be generated in this phases by running
 
 - \-p, --pulsar\[=mac\]
 
-    Generates pulsar bootloader configuration file whose name is based on
-    the MAC address specified either on the command line or taken from
-    _.novaboot_ configuration file.
+    Generates pulsar bootloader configuration file named `config-_mac_`
+    The _mac_ string is typically a MAC address and defaults to
+    _novaboot_.
 
 ## Target connection check
 
diff --git a/novaboot b/novaboot
index 748f3ef..8ddff65 100755
--- a/novaboot
+++ b/novaboot
@@ -501,11 +501,10 @@ foreach my $script (@scripts) {
     generate_configs('', $generated, $filename);
 
 ### Generate bootloader configuration files
-    my $pulsar_config;
     my @bootloader_configs;
     push @bootloader_configs, generate_grub_config($grub_config, $config_name, $prefix, $modules, $grub_preamble) if (defined $grub_config);
     push @bootloader_configs, generate_grub2_config($grub2_config, $config_name, $prefix, $modules, $grub_preamble, $grub2_prolog) if (defined $grub2_config);
-    push @bootloader_configs, generate_pulsar_config($pulsar_config = "config-$pulsar", $modules) if (defined $pulsar);
+    push @bootloader_configs, generate_pulsar_config('config-'.($pulsar||'novaboot'), $modules) if (defined $pulsar);
 
 ### Run scons
     if (defined $scons) {
@@ -930,9 +929,9 @@ files generated via "<<WORD" syntax.
 
 =item -p, --pulsar[=mac]
 
-Generates pulsar bootloader configuration file whose name is based on
-the MAC address specified either on the command line or taken from
-I<.novaboot> configuration file.
+Generates pulsar bootloader configuration file named F<config-I<mac>>
+The I<mac> string is typically a MAC address and defaults to
+I<novaboot>.
 
 =back