X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml2usb%2Fgrml2iso.html;h=41c6023e8d1115514daf0ec7e32a97627d28ac85;hb=f889fe7bc06111c3007d41058d115dd049d0e7e0;hp=a48908f00b8167c582ad36dee723ff18dee1f762;hpb=4889a146240f5fb67fed024b80ba935789805cab;p=grml.org.git

diff --git a/grml2usb/grml2iso.html b/grml2usb/grml2iso.html
index a48908f..41c6023 100644
--- a/grml2usb/grml2iso.html
+++ b/grml2usb/grml2iso.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 9.0.0rc2" />
 <title>grml2iso(8)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +88,16 @@ ul, ol, li > p {
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
+pre {
+  white-space: pre-wrap;
+}
 
 #author {
   color: #527bbd;
@@ -219,7 +226,7 @@ div.exampleblock > div.content {
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
 a.image:visited { color: white; }
 
 dl {
@@ -349,7 +356,7 @@ div.colist td img {
   margin-bottom: 0.1em;
 }
 
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -407,18 +414,14 @@ span.underline { text-decoration: underline; }
 span.overline { text-decoration: overline; }
 span.line-through { text-decoration: line-through; }
 
+div.unbreakable { page-break-inside: avoid; }
+
 
 /*
  * xhtml11 specific
  *
  * */
 
-tt {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -433,7 +436,7 @@ thead, p.table.header {
 p.table {
   margin-top: 0;
 }
-/* Because the table frame attribute is overriden by CSS in most browsers. */
+/* Because the table frame attribute is overridden by CSS in most browsers. */
 div.tableblock > table[frame="void"] {
   border-style: none;
 }
@@ -452,12 +455,6 @@ div.tableblock > table[frame="vsides"] {
  *
  * */
 
-.monospaced {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -537,6 +534,8 @@ body.manpage div.sectionbody {
 @media print {
   body.manpage div#toc { display: none; }
 }
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -581,7 +580,7 @@ toc: function (toclevels) {
 
   function tocEntries(el, toclevels) {
     var result = new Array;
-    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
     // Function that scans the DOM tree for header elements (the DOM2
     // nodeIterator API would be a better technique but not supported by all
     // browsers).
@@ -610,7 +609,7 @@ toc: function (toclevels) {
   var i;
   for (i = 0; i < toc.childNodes.length; i++) {
     var entry = toc.childNodes[i];
-    if (entry.nodeName == 'div'
+    if (entry.nodeName.toLowerCase() == 'div'
      && entry.getAttribute("class")
      && entry.getAttribute("class").match(/^toclevel/))
       tocEntriesToRemove.push(entry);
@@ -656,7 +655,7 @@ footnotes: function () {
   var entriesToRemove = [];
   for (i = 0; i < noteholder.childNodes.length; i++) {
     var entry = noteholder.childNodes[i];
-    if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
       entriesToRemove.push(entry);
   }
   for (i = 0; i < entriesToRemove.length; i++) {
@@ -745,7 +744,7 @@ asciidoc.install(2);
 <div class="sect1">
 <h2 id="_name">1. Name</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>grml2iso - create a multiboot grml ISO using grml2usb</p></div>
+<div class="paragraph"><p>grml2iso - create a multiboot Grml ISO using grml2usb</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -754,49 +753,54 @@ asciidoc.install(2);
 <div class="paragraph"><p>grml2iso -o &lt;target.iso&gt; &lt;ISO[s]&gt;</p></div>
 <div class="sidebarblock">
 <div class="content">
-<div class="paragraph"><p>Important! The grml team does not take responsibility for loss of any data!</p></div>
+<div class="paragraph"><p>Important! The Grml team does not take responsibility for loss of any data!</p></div>
 </div></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_introduction">3. Introduction</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>grml2iso allows you to create a multiboot grml ISO. You can specify
-two or more grml ISOs and will get one single multiboot ISO as a result.
-grml2iso requires and uses grml2usb for this task and installs grub2
-as bootmanager on the multiboot ISO.</p></div>
+<div class="paragraph"><p>grml2iso allows you to create a multiboot Grml ISO.
+You can specify two or more Grml ISOs and will get one single multiboot ISO as a result.
+grml2iso requires and uses grml2usb for this task.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_important">4. Important</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>The order of the provided ISOs matters for two reasons:</p></div>
+<div class="paragraph"><p>1) order in boot menu entries: the first ISO specified is listed as first (default) option in the boot menu, further ISOs will be listed below as next options</p></div>
+<div class="paragraph"><p>2) EFI image to be used: the EFI image for booting via (U)EFI will be taken from the last provided ISO.
+Therefore to be able to boot on 64bit EFI systems, you need to provide a 64bit ISO (like grml64-small or grml64-full) as <em>last</em> ISO in the grml2iso command line.</p></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_options">4. Options</h2>
+<h2 id="_options">5. Options</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>grml2iso supports the environment variables GRML2USB and WRKDIR.
 GRML2USB specifies the path to the grml2usb script you&#8217;d like to use.
 WRKDIR specifies the work directory for creating the filesystem.
-The work directory needs at least as much free disk space as the sum
-of all specified ISOs.</p></div>
+The work directory needs at least as much free disk space as the sum of all specified ISOs.</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
-<strong>\-o &lt;target.iso&gt;</strong>
+<strong>-o &lt;target.iso&gt;</strong>
 </dt>
 <dd>
 <p>
-This option is mandatory and specifies where the resulting multiboot grml ISO
-should be placed. Note that (to avoid any possible data loss) grml2iso will exit
-if the specified target.iso exists already.
+This option is mandatory and specifies where the resulting multiboot Grml ISO should be placed.
+Note that (to avoid any possible data loss) grml2iso will exit if the specified target.iso exists already.
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>\-c &lt;directory&gt;</strong>
+<strong>-c &lt;directory&gt;</strong>
 </dt>
 <dd>
 <p>
-The content of the specified directory will be copied to the resulting
-multiboot grml ISO.
+The content of the specified directory will be copied to the resulting multiboot Grml ISO.
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>\-b &lt;boot params&gt;</strong>
+<strong>-b &lt;boot params&gt;</strong>
 </dt>
 <dd>
 <p>
@@ -804,101 +808,98 @@ Use specified default bootoptions as default.
 </p>
 </dd>
 <dt class="hdlist1">
-*\-f *
+<strong>-f</strong>
 </dt>
 <dd>
 <p>
-Force the program to run and overwrite an existing iso image.
+Force the program to run and overwrite an existing ISO image.
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>\-r &lt;boot param&gt;</strong>
+<strong>-r &lt;boot param&gt;</strong>
 </dt>
 <dd>
 <p>
-Remove specified boot parameter from existing command line. Could be specified multiple times.
+Remove specified boot parameter from existing command line.
+Can be specified multiple times.
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>\-p &lt;grml2usb param&gt;</strong>
+<strong>-p &lt;grml2usb param&gt;</strong>
 </dt>
 <dd>
 <p>
-Execute grml2usb with the specified parameters. For a list of valid parameters have a look at the <a href="http://grml.org/grml2usb/">grml2usb webpage</a> or the grml2usb manpage
+Execute grml2usb with the specified parameters.
+For a list of valid parameters have a look at the grml2usb(8) manual page.
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>\-s &lt;URI&gt;</strong>
+<strong>-s &lt;URI&gt;</strong>
 </dt>
 <dd>
 <p>
-Generate a small iso file which downloads the squashfs file from the specified URI. Due  to current limitations in busyboxs wget and DNS resolution, an URL can not contain a hostname but an IP only. This is useful if you want to boot systems which support booting iso image from your local system. Besides the iso image this command also copies the squashfs file to the output directory.
+Generate a small ISO file which downloads the squashfs file from the specified URI.
+Due to current limitations in busyboxs wget and DNS resolution, an URL can not contain a hostname but an IP only.
+This is useful if you want to boot systems which support booting ISO image from your local system.
+Besides the ISO image this command also copies the squashfs file to the output directory.
 </p>
 </dd>
 </dl></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_usage_examples">5. Usage examples</h2>
+<h2 id="_usage_examples">6. Usage examples</h2>
 <div class="sectionbody">
 <div class="literalblock">
 <div class="content">
-<pre><tt># grml2iso -o /tmp/grml.iso grml_2009.05.iso grml64_2009.05.iso</tt></pre>
+<pre><code># grml2iso -o /tmp/grml-multiboot.iso grml32-small_2020.06.iso grml64-small_2020.06.iso</code></pre>
 </div></div>
-<div class="paragraph"><p>Create multiboot ISO /tmp/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.</p></div>
+<div class="paragraph"><p>Create multiboot ISO /tmp/grml-multiboot.iso with grml32-small_2020.06.iso and grml64-small_2020.06.iso.</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt># grml2iso -b 'lang=de ssh=passwd' -c /tmp/grml-content -o /srv/grml.iso /srv/grml/grml_2009.10.iso</tt></pre>
+<pre><code># grml2iso -b 'lang=de ssh=passwd' -c /tmp/grml-content -o /srv/grml-multiboot.iso /srv/grml/grml32-small_2020.06.iso</code></pre>
 </div></div>
-<div class="paragraph"><p>Create a new iso with additional boot parameters and copy the content from /tmp/grml-content to the generated iso image.</p></div>
+<div class="paragraph"><p>Create a new ISO with additional boot parameters and copy the content from /tmp/grml-content to the generated ISO image.</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt># grml2iso -r quiet -r vga=791 -o /srv/grml.iso /srv/grml-small_2009.10.iso</tt></pre>
+<pre><code># grml2iso -r quiet -r vga=791 -o /srv/grml-multiboot.iso /srv/grml64-small_2020.06.iso</code></pre>
 </div></div>
-<div class="paragraph"><p>Create a new iso and remove existing boot parameters quiet and vga=791.</p></div>
+<div class="paragraph"><p>Create a new ISO and remove existing boot parameters quiet and vga=791.</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt># GRML2USB=/srv/git/grml2usb grml2iso -o /srv/grml.iso /srv/grml/grml_2009.05.iso /srv/grml/grml64-medium_2009.05.iso</tt></pre>
+<pre><code># GRML2USB=/srv/git/grml2usb/grml2usb grml2iso -o /srv/grml-multiboot.iso /srv/grml/grml32-small_2020.06.iso /srv/grml/grml64-medium_2020.06.iso</code></pre>
 </div></div>
-<div class="paragraph"><p>Create multiboot ISO /srv/grml.iso with grml_2009.05.iso and
-grml64-medium_2009.05.iso using /srv/git/grml2usb as grml2usb script.</p></div>
+<div class="paragraph"><p>Create multiboot ISO /srv/grml-multiboot.iso with grml32-small_2020.06.iso and grml64-medium_2020.06.iso using /srv/git/grml2usb/grml2usb as grml2usb script.</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt># WRKDIR=/mnt/test/grml-tmp grml2iso -o /mnt/test/grml.iso grml_2009.05.iso grml64_2009.05.iso</tt></pre>
+<pre><code># WRKDIR=/mnt/test/grml-tmp grml2iso -o /mnt/test/grml-multiboot.iso grml32-small_2020.06.iso grml64-small_2020.06.iso</code></pre>
 </div></div>
-<div class="paragraph"><p>Use /mnt/test/grml-tmp as working directory for creating the multiboot ISO
-/mnt/test/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.</p></div>
+<div class="paragraph"><p>Use /mnt/test/grml-tmp as working directory for creating the multiboot ISO /mnt/test/grml-multiboot.iso with grml32-small_2020.06.iso and grml64-small_2020.06.iso.</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt># grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso</tt></pre>
+<pre><code># grml2iso -p --skip-addons -o /srv/grml-multiboot.iso /srv/grml64-small_2020.06.iso /srv/grml64-small_2020.06.iso</code></pre>
 </div></div>
-<div class="paragraph"><p>Don&#8217;t copy the addons from the specified iso images</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_online_ressources">6. Online Ressources</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Check out the <a href="http://grml.org/grml2usb/">grml2usb webpage</a> and the
-<a href="http://git.grml.org/?p=grml2usb.git">grml2usb git repository</a>.</p></div>
+<div class="paragraph"><p>Don&#8217;t copy the addons from the specified ISO images</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_bugs">7. Bugs</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Please report feedback, bugreports and wishes <a href="#X7">to the author</a>.</p></div>
+<div class="paragraph"><p>Please report feedback, bug reports and wishes at <a href="https://github.com/grml/grml2usb/">https://github.com/grml/grml2usb/</a></p></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="X7">8. Authors</h2>
+<h2 id="X7">8. Author</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Michael Prokop &lt;<a href="mailto:mika@grml.org">mika@grml.org</a>&gt; and Thorsten Glaser &lt;<a href="mailto:tg@mirbsd.org">tg@mirbsd.org</a>&gt;</p></div>
+<div class="paragraph"><p>Michael Prokop &lt;<a href="mailto:mika@grml.org">mika@grml.org</a>&gt;</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-12-25 18:20:03 CET
+Last updated
+ 2020-06-24 08:10:54 UTC
 </div>
 </div>
 </body>
