[systemimager-commits] r4409 - trunk/sbin

[<ar...@sy...>]

Author: arighi
Date: 2008-02-24 10:18:09 -0600 (Sun, 24 Feb 2008)
New Revision: 4409

Modified:
   trunk/sbin/si_prepareclient
Log:
- remove redundant boot parameters in systemconfig.conf


Modified: trunk/sbin/si_prepareclient
===================================================================
--- trunk/sbin/si_prepareclient	2008-02-24 14:56:33 UTC (rev 4408)
+++ trunk/sbin/si_prepareclient	2008-02-24 16:18:09 UTC (rev 4409)
@@ -716,6 +716,12 @@
         die("FATAL: couldn't open /proc/cmdline for reading (is /proc mounted?)\n");
     chomp(my $append_string = <IN>);
     close(IN);
+    # remove old root from append string (it'll be added later)
+    $append_string =~ s/root=\S+//;
+    # sort unique elements of append string
+    my %saw_params;
+    @saw_params{split(/\s/, $append_string)} = ();
+    $append_string = join(' ', sort keys %saw_params);
 
     # Get mounted devices.
     open(IN, 'mount |') or