Changeset 350ab24 for BOOK/boot/sparc

Timestamp:

Apr 28, 2014, 8:56:46 PM (12 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

Location:

BOOK/boot/sparc

Files:

• fstab.xml (modified) (2 diffs)
• silo-build.xml (modified) (1 diff)
• silo.xml (modified) (2 diffs)

BOOK/boot/sparc/fstab.xml

@@ -13 +13 @@
   <indexterm zone="ch-boot-fstab">
     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
+    <secondary>boot</secondary>
   </indexterm>
 
@@ -27 +28 @@
 /dev/<replaceable>[xxx]</replaceable>        /            <replaceable>[fff]</replaceable>       defaults         1     1
 /dev/<replaceable>[yyy]</replaceable>        swap         swap        pri=1            0     0
-proc           /proc           proc        defaults         0     0
-sysfs          /sys            sysfs       defaults         0     0
 devpts         /dev/pts        devpts      gid=&gid-tty;,mode=620   0     0
 shm            /dev/shm        tmpfs       defaults         0     0
-tmpfs          /run            tmpfs       defaults         0     0
-devtmpfs       /dev            devtmpfs    mode=0755,nosuid 0     0
 none           /proc/openprom  openpromfs  defaults         0     0
 # End /etc/fstab</literal>

BOOK/boot/sparc/silo-build.xml

@@ -44 +44 @@
         <term><parameter>CC=cc</parameter></term>
         <listitem>
-          <para>Overwrites the default value of <command>gcc -m32</command> which will fail 
+          <para>Overwrites the default value of <command>gcc -m32</command> which will fail
 to compile on 64 bit targets. This is not to be confused with <command>CC=${CC}</command> below.</para>
         </listitem>

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>