Skip to content

Commit

Permalink
Update grml2usb files to v0.18.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mika
mika committed Jun 24, 2020
1 parent aead9ac commit a286c4b
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 80 deletions.
91 changes: 43 additions & 48 deletions grml2usb/grml2iso.html
View file
Expand Up @@ -4,7 +4,7 @@
<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.10" />
<meta name="generator" content="AsciiDoc 9.0.0rc2" />
<title>grml2iso(8)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
Expand Down Expand Up @@ -436,7 +436,7 @@
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;
}
Expand Down Expand Up @@ -753,45 +753,50 @@ <h2 id="_synopsis">2. Synopsis</h2>
<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="_options">4. Options</h2>
<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">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>
</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>
</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">
Expand All @@ -815,96 +820,86 @@ <h2 id="_options">4. Options</h2>
</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>
</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>
</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><code># grml2iso -o /tmp/grml.iso grml_2009.05.iso grml64_2009.05.iso</code></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><code># grml2iso -b 'lang=de ssh=passwd' -c /tmp/grml-content -o /srv/grml.iso /srv/grml/grml_2009.10.iso</code></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><code># grml2iso -r quiet -r vga=791 -o /srv/grml.iso /srv/grml-small_2009.10.iso</code></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="literalblock">
<div class="content">
<pre><code># GRML2USB=/srv/git/grml2usb grml2iso -o /srv/grml.iso /srv/grml/grml_2009.05.iso /srv/grml/grml64-medium_2009.05.iso</code></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><code># WRKDIR=/mnt/test/grml-tmp grml2iso -o /mnt/test/grml.iso grml_2009.05.iso grml64_2009.05.iso</code></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><code># grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso</code></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_resources">6. Online Resources</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>
</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
2017-09-23 11:51:47 UTC
2020-06-24 08:10:54 UTC
</div>
</div>
</body>
Expand Down
Binary file modified grml2usb/grml2usb.tgz
View file
Binary file not shown.
28 changes: 14 additions & 14 deletions grml2usb/grml2usb.tgz.md5.asc
View file
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

fc09233b692217366dbd1093dbab103a grml2usb.tgz
24e4944e10195f5c6a6201c336420124 grml2usb.tgz
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEM8yxNkAa/shDo4djlqh4crfqNzcFAlwbtZYACgkQlqh4crfq
NzcAfQ//TmIGqCOpUH2fwUWxpvyvtkoiX77Kq0wZFW8mjMiVOg75yQyja7h1bdos
sGeruZH6EcyJlW1ZuEIWv90/BWgZ2mnSMW5ijxgfjHy4uNuucRe/IVUiTO6FGSwb
i4lshhd7mtngY53dnMiyZJ64c1LsS7Ixqzh6XowFBylSle18c4mQsffTfJr1oFJ/
kY6cqhoDPVy2czK7VtMfiXxkwOyo11Ec0G85T2vFHRRSHaCU5CUZ8443UiIIQTVH
ZxrmcflTtsHFo73pNcC1buJD9VsfHKK9z8Yd3f5ax5nKTlsrpoxonsDIoF+TuU4C
TeuaDop8nPC3FKsP2MaHVe7OwdQISyu+sRPFw0uiNRKNSajFu5wVT307S6EcRtgL
9hHMObNdCAE/DG85qI+hHK65ulxn8on8qqZNgpg6H8O2KeqMLEKsktmBezbgfVAy
OP9IVofQSEMS+tJLJRL2K+H5rffotlc1JSDhm1wZ7fsAJ5MbuMn7Cjslx0yIbzV5
HvifZeAx7h+oPuuwqWEIQy6lfedMnfxHYK3B8I7JG+6SYZyyUYGk97b2Qqxq7ofQ
1owGoq2+UG//0Xdy/ginK0CKJ4b//ok9bwg7j0x6A4qWJA4XbGJOL6jKrCaHiD0n
2VBdjesiGwrlrTVAokU0GncZ2tBvNXXOhCLWeavtvBtqYZv4oRk=
=yh4E
iQIzBAEBCAAdFiEEM8yxNkAa/shDo4djlqh4crfqNzcFAl7zITIACgkQlqh4crfq
NzfhKg/+Inu2byZlxI+XCklWrx1p4NijG3TcS/ZBaNreKtgE3swXQa7vTU6BxPI/
SsL40HaNmTCE5ghMiZwe7EEngxdVvN3yjLtkZtb9CV2xR5W5P0r0wVWuq+vd9k7j
CpqzdM7QJhFp2eLGFCxQkQUsM18kruoz8Es83knzvQar2jYUtxxcaL5tzybEs6rX
8QReL4qjbpN9yrUhHDxNCjQP1/cOOMVk4VBhCbYr/LdqIpP96igHHACq52XE9Z+p
xhHBOZ347ICExeeDAVeUhmH5DBBRQslXi6znSGK+LEQtyZVPi3IBsiQDHX8lpUYt
n1Txzs0psNEawcf4f/M1GsamhVKNXepZSa++WXqh+j3kPZ3/RB4rosSpRsyZfr8K
RkIUtBwB+wJC8Kws3GQaTjZkmWzCejJMtT8SYvd3tYMgpr2rL0/RvfwyKlIq4YQS
uIwB+pDCZcP76jv7ekvjj6mB+Q4GtNZwsKA79UX4niyGaLJ8kYRguKM6R0LQB8nu
AzzUxeB+u3XQi2M+ov+ArPYP8DiBm+yPrG84S0V8012o4EoXpyDbKtyOzQZ7F8lT
DiBaaEiR0CcSjmBdWqRoO5U/KwOsuzeZeCQIabeoGr6R5KTqSdEl0yGZJ6B+CtVs
RXk3jejBA+xNnSlWOTBJjgIIJ2IVPKs9GFVYEguKBCxhIbPR6YY=
=Lyu5
-----END PGP SIGNATURE-----
36 changes: 18 additions & 18 deletions grml2usb/index.html
View file
Expand Up @@ -4,7 +4,7 @@
<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.10" />
<meta name="generator" content="AsciiDoc 9.0.0rc2" />
<title>grml2usb(8)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
Expand Down Expand Up @@ -436,7 +436,7 @@
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;
}
Expand Down Expand Up @@ -785,7 +785,7 @@ <h2 id="introduction">3. Introduction</h2>
<h2 id="options">4. Options</h2>
<div class="sectionbody">
<div class="paragraph"><p>ISO[s] should be the path to one or multiple grml-ISOs and/or the path to
the currently running live-system (being /lib/live/mount/medium).</p></div>
the currently running live-system (being /run/live/medium).</p></div>
<div class="paragraph"><p>The device either might be a device name like /dev/sdX1 or a directory. When
specifying a device name the device is mounted automatically. When specifying a
directory grml2usb is assuming that you did set up a bootloader on your own (or
Expand Down Expand Up @@ -918,7 +918,7 @@ <h2 id="options">4. Options</h2>
</dt>
<dd>
<p>
Do not check for presence of bootflag on target device.
Do not check for presence of boot flag on target device.
</p>
</dd>
<dt class="hdlist1">
Expand Down Expand Up @@ -1109,15 +1109,15 @@ <h3 id="debugging">5.3. Developers Debugging Hints</h3>
<div class="literalblock">
<div class="content">
<pre><code># mkfs.vfat /dev/loop1
# grml2usb --bootloader-only /grml/isos/grml-small_2013.01.iso /dev/loop1</code></pre>
# grml2usb --bootloader-only /grml/isos/grml64-small_2018.12.iso /dev/loop1</code></pre>
</div></div>
</div>
<div class="sect2">
<h3 id="performance-tracing">5.4. Performance tracing</h3>
<div class="literalblock">
<div class="content">
<pre><code># blktrace -d /dev/sdX -o - | blkparse -i -
# grml2usb grml_2013.01.iso /dev/sdX1</code></pre>
# grml2usb grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
</div>
</div>
Expand Down Expand Up @@ -1329,7 +1329,7 @@ <h3 id="dd">7.2. Why can&#8217;t I just dd the ISO to a USB device?</h3>
system available) running:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>% dd if=grml_2013.01.iso of=/dev/sdX</code></pre>
<pre><code>% dd if=grml64-full_2018.12.iso of=/dev/sdX</code></pre>
</div></div>
<div class="paragraph"><p>where /dev/sdX is your USB device. Of course this doesn&#8217;t provide such a
flexible system like with grml2usb (no multi-ISO setup, no additional default
Expand Down Expand Up @@ -1476,53 +1476,53 @@ <h2 id="usage-examples">8. Usage examples</h2>
<div class="sectionbody">
<div class="literalblock">
<div class="content">
<pre><code># grml2usb /home/grml/grml_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb /home/grml/grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISO on device /dev/sdX1.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb /home/grml/grml_2013.01.iso /home/grml/grml_small_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb /home/grml/grml64-full_2018.12.iso /home/grml/grml32-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISOs on device /dev/sdX1 for multibooting ISOs.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb /lib/live/mount/medium /dev/sdX1</code></pre>
<pre><code># grml2usb /run/live/medium /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install currently running Grml live system on device /dev/sdX1.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb /lib/live/mount/medium /home/grml/grml_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb /run/live/medium /home/grml/grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install currently running Grml live system and the specified
ISO on device /dev/sdX1 for multibooting.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb --fat16 /home/grml/grml_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb --fat16 /home/grml/grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISO on device /dev/sdX1 and format partition /dev/sdX1 with
FAT16 filesystem.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb --grub --grub-mbr /home/grml/grml_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb --grub --grub-mbr /home/grml/grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISO on device /dev/sdX1 and use grub as bootloader (instead of
syslinux being the default) and install a master boot record (MBR) to the MBR of
/dev/sdX.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb --bootoptions="lang=de ssh=mysecret" grml_2013.01.iso /dev/sdX1
# grml2usb --bootoptions="lang=de" --bootoptions="ssh=mysecret" grml_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb --bootoptions="lang=de ssh=mysecret" grml64-full_2018.12.iso /dev/sdX1
# grml2usb --bootoptions="lang=de" --bootoptions="ssh=mysecret" grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISO on device /dev/sdX1 and use "lang=de ssh=mysecret" as
default bootoptions.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb --remove-bootoption="vga=791" --remove-bootoption="nomce" grml_2013.01.iso /dev/sdX1</code></pre>
<pre><code># grml2usb --remove-bootoption="vga=791" --remove-bootoption="nomce" grml64-full_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISO on device /dev/sdX1 remove vga=791 and nomce from existing bootoptions.</p></div>
<div class="literalblock">
<div class="content">
<pre><code># grml2usb --bootoptions="persistent-path=%flavour_name" grml64_2010.04.iso grml_2010.04.iso /dev/sdX1</code></pre>
<pre><code># grml2usb --bootoptions="persistent-path=%flavour_name" grml64-small_2018.12.iso grml32-small_2018.12.iso /dev/sdX1</code></pre>
</div></div>
<div class="paragraph"><p>Install specified ISOs on device /dev/sdx and add parameter persistent-path
to every menu entry. %flavour_name will be expanded to the flavour of the specific
Expand Down Expand Up @@ -1553,7 +1553,7 @@ <h2 id="author">11. Author</h2>
<div id="footer">
<div id="footer-text">
Last updated
2017-09-23 11:52:01 UTC
2020-06-03 13:04:51 UTC
</div>
</div>
</body>
Expand Down

0 comments on commit a286c4b

Please sign in to comment.