Changeset 350ab24 for BOOK/boot/sparc/silo.xml

Timestamp:

Apr 28, 2014, 8:56:46 PM (11 years ago)

Author:

Chris Staub <chris@…>

Parents:

5c8e74d (diff), 31cfd067 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged latest systemd branch changes

File:

• BOOK/boot/sparc/silo.xml (modified) (2 diffs)

BOOK/boot/sparc/silo.xml

@@ -17 +17 @@
 
   <para os="a">This is for the configuration of <command>silo</command>, similar
-  to what is in bootscripts.</para>
+  to what is in boot-scripts.</para>
 
 <screen><userinput>cat &gt; ${CLFS}/etc/silo.conf &lt;&lt; "EOF"
@@ -25 +25 @@
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/clfskernel-&linux-version;
+image = /tools/boot/vmlinuz-clfs-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>