Changeset 032be17 for postlfs/virtualization

Timestamp:

10/26/2014 01:39:58 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

krejzi/svn

Children:

b71b5c8

Parents:

8ddd9c79

Message:

Convert networking/connect, bridge-utils and qemu to systemd.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd-ng@14737 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

postlfs/virtualization

Files:

• qemu-systemd.xml (moved) (moved from postlfs/virtualization/qemu.xml ) (6 diffs)
• virtualization.xml (modified) (1 diff)

postlfs/virtualization/qemu-systemd.xml

@@ -126 +126 @@
     your system processor is required.</para>
 
-    <para>For networking, check that <xref linkend='bridgeutils'/> is installed
+    <para>For networking, check that <xref linkend="bridgeutils"/> is installed
     and the following options in the kernel configuration are enabled:</para>
 
-<screen><literal>Networking support  ---&gt;
-  Networking options  ---&gt;
-    802.1d Ethernet Bridging: Y or M
-Device Drivers  ---&gt;
+<screen><literal>Device Drivers  ---&gt;
   Network device support  ---&gt;
     Universal TUN/TAP device driver support: Y or M</literal></screen>
@@ -261 +258 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Set up bridging with <xref linkend='bridgeutils'/>.</para>
+        <para>Set up bridging using <xref linkend="network-bridge"/>.</para>
       </listitem>
 
@@ -270 +267 @@
 
         <para>To make this permanent, add the command to
-        <filename>/etc/syssysctl.conf:</filename></para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysctl.conf &lt;&lt; EOF
+        <filename>/etc/sysctl.d/60-net-forward.conf:</filename></para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/sysctl.d/60-net-forward.conf &lt;&lt; "EOF"
 net.ipv4.ip_forward=1
 EOF</userinput></screen>
@@ -282 +279 @@
         device, usually visible as tap0, to the host bridge.</para>
 
-<screen role="root"><userinput>cat &gt; /etc/qemu-ifup &lt;&lt; EOF
+<screen role="root"><userinput>cat &gt; /etc/qemu-ifup &lt;&lt; "EOF"
 #!/bin/bash
 
 switch=br0
 
-if [ -n "\$1" ]; then
+if [ -n "$1" ]; then
   # Add new tap0 interface to bridge
-  /sbin/ip link set \$1 up
-  sleep 0.5s
-  /usr/sbin/brctl addif \$switch \$1
+  /usr/sbin/brctl addif $switch $1
 else
   echo "Error: no interface specified"
@@ -302 +297 @@
 chmod +x /etc/qemu-ifup</userinput></screen>
 
-<screen role="root"><userinput>cat &gt; /etc/qemu-ifdown &lt;&lt; EOF
+<screen role="root"><userinput>cat &gt; /etc/qemu-ifdown &lt;&lt; "EOF"
 #!/bin/bash
 
 switch=br0
 
-if [ -n "\$1" ]; then
+if [ -n "$1" ]; then
   # Remove tap0 interface from bridge
-  /usr/sbin/brctl delif \$switch \$1
+  /usr/sbin/brctl delif $switch $1
 else
   echo "Error: no interface specified"
@@ -323 +318 @@
     </itemizedlist>
 
-      <note><para>The backslashes in the above script are for convenience
+      <!-- <note><para>The backslashes in the above script are for convenience
       for cut/paste operations.  The backslashes should <emphasis>not</emphasis>
-      appear in the final scripts.</para></note>
+      appear in the final scripts.</para></note> -->
 
     <itemizedlist spacing="compact">

postlfs/virtualization/virtualization.xml

@@ -22 +22 @@
   processor.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu-systemd.xml"/>
 
 </chapter>