Update grml2usb files

diff --git a/grml2usb/grml2iso.html b/grml2usb/grml2iso.html
index 3adc497..8029886 100644 (file)
--- a/grml2usb/grml2iso.html
+++ b/grml2usb/grml2iso.html
@@ -743,7 +743,7 @@ asciidoc.install(2);
 <div class="sect1">\r
 <h2 id="_name">1. Name</h2>\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>grml2iso - create a multiboot grml ISO using grml2usb</p></div>\r
+<div class="paragraph"><p>grml2iso - create a multiboot Grml ISO using grml2usb</p></div>\r
 </div>\r
 </div>\r
 <div class="sect1">\r
@@ -759,8 +759,8 @@ asciidoc.install(2);
 <div class="sect1">\r
 <h2 id="_introduction">3. Introduction</h2>\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>grml2iso allows you to create a multiboot grml ISO. You can specify\r
-two or more grml ISOs and will get one single multiboot ISO as a result.\r
+<div class="paragraph"><p>grml2iso allows you to create a multiboot Grml ISO. You can specify\r
+two or more Grml ISOs and will get one single multiboot ISO as a result.\r
 grml2iso requires and uses grml2usb for this task and installs grub2\r
 as bootmanager on the multiboot ISO.</p></div>\r
 </div>\r
@@ -779,7 +779,7 @@ of all specified ISOs.</p></div>
 </dt>\r
 <dd>\r
 <p>\r
-This option is mandatory and specifies where the resulting multiboot grml ISO\r
+This option is mandatory and specifies where the resulting multiboot Grml ISO\r
 should be placed. Note that (to avoid any possible data loss) grml2iso will exit\r
 if the specified target.iso exists already.\r
 </p>\r
@@ -790,7 +790,7 @@ if the specified target.iso exists already.
 <dd>\r
 <p>\r
 The content of the specified directory will be copied to the resulting\r
-multiboot grml ISO.\r
+multiboot Grml ISO.\r
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
@@ -806,7 +806,7 @@ Use specified default bootoptions as default.
 </dt>\r
 <dd>\r
 <p>\r
-Force the program to run and overwrite an existing iso image.\r
+Force the program to run and overwrite an existing ISO image.\r
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
@@ -830,7 +830,12 @@ Execute grml2usb with the specified parameters. For a list of valid parameters h
 </dt>\r
 <dd>\r
 <p>\r
-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.\r
+Generate a small ISO file which downloads the squashfs file from the\r
+specified URI. Due  to current limitations in busyboxs wget and DNS\r
+resolution, an URL can not contain a hostname but an IP only. This is\r
+useful if you want to boot systems which support booting ISO image from\r
+your local system. Besides the iso image this command also copies the\r
+squashfs file to the output directory.\r
 </p>\r
 </dd>\r
 </dl></div>\r
@@ -848,12 +853,13 @@ Generate a small iso file which downloads the squashfs file from the specified U
 <div class="content">\r
 <pre><code># grml2iso -b 'lang=de ssh=passwd' -c /tmp/grml-content -o /srv/grml.iso /srv/grml/grml_2009.10.iso</code></pre>\r
 </div></div>\r
-<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>\r
+<div class="paragraph"><p>Create a new ISO with additional boot parameters and copy the content\r
+from /tmp/grml-content to the generated ISO image.</p></div>\r
 <div class="literalblock">\r
 <div class="content">\r
 <pre><code># grml2iso -r quiet -r vga=791 -o /srv/grml.iso /srv/grml-small_2009.10.iso</code></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Create a new iso and remove existing boot parameters quiet and vga=791.</p></div>\r
+<div class="paragraph"><p>Create a new ISO and remove existing boot parameters quiet and vga=791.</p></div>\r
 <div class="literalblock">\r
 <div class="content">\r
 <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>\r
@@ -870,7 +876,7 @@ grml64-medium_2009.05.iso using /srv/git/grml2usb as grml2usb script.</p></div>
 <div class="content">\r
 <pre><code># grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso</code></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Don&#8217;t copy the addons from the specified iso images</p></div>\r
+<div class="paragraph"><p>Don&#8217;t copy the addons from the specified ISO images</p></div>\r
 </div>\r
 </div>\r
 <div class="sect1">\r
@@ -896,7 +902,8 @@ grml64-medium_2009.05.iso using /srv/git/grml2usb as grml2usb script.</p></div>
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2012-04-25 17:00:16 CEST\r
+Last updated\r
+ 2014-09-05 01:15:27 CEST\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/grml2usb/grml2usb.tgz b/grml2usb/grml2usb.tgz
index 391ea1f..66cb18f 100644 (file)
Binary files a/grml2usb/grml2usb.tgz and b/grml2usb/grml2usb.tgz differ

diff --git a/grml2usb/grml2usb.tgz.md5.asc b/grml2usb/grml2usb.tgz.md5.asc
index 958ade4..2769324 100644 (file)
--- a/grml2usb/grml2usb.tgz.md5.asc
+++ b/grml2usb/grml2usb.tgz.md5.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-e8f196d3f169bcf10e9175210ca3c131  grml2usb.tgz
+e946f80169f24c43e5a803cd8646a5ff  grml2usb.tgz
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
-iEYEARECAAYFAlLUAx0ACgkQ2N9T+zficuifcwCfaahYgNjGSFS6lnQS6FZQZZea
-sNAAn2CMlHFF+KkpNMsuOzuNBrMhbNBH
-=0dlk
+iEYEARECAAYFAlQ2QAQACgkQ2N9T+zficujoCQCfcxx1Kj5/YW0QQRigOrZ2Iil9
+RmYAn1uxXMiBptLhnD1m24d2OFmGJnSC
+=27mY
 -----END PGP SIGNATURE-----

diff --git a/grml2usb/index.html b/grml2usb/index.html
index 1a638f9..232e939 100644 (file)
--- a/grml2usb/index.html
+++ b/grml2usb/index.html
@@ -743,7 +743,7 @@ asciidoc.install(2);
 <div class="sect1">\r
 <h2 id="_name">1. Name</h2>\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>grml2usb - install grml ISO(s) on usb device for booting</p></div>\r
+<div class="paragraph"><p>grml2usb - install Grml ISO(s) on usb device for booting</p></div>\r
 </div>\r
 </div>\r
 <div class="sect1">\r
@@ -752,19 +752,20 @@ asciidoc.install(2);
 <div class="paragraph"><p>grml2usb [ options ] &lt;ISO[s]&gt; &lt;device&gt;</p></div>\r
 <div class="sidebarblock">\r
 <div class="content">\r
-<div class="paragraph"><p>Important! The grml team does not take responsibility for loss of any data!</p></div>\r
+<div class="paragraph"><p>Important! The Grml team does not take responsibility for loss of any data!</p></div>\r
 </div></div>\r
 </div>\r
 </div>\r
 <div class="sect1">\r
 <h2 id="introduction">3. Introduction</h2>\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>grml2usb installs grml on a given partition of your usb device and makes it\r
-bootable. It provides multi-iso support, meaning you can specify several grml\r
-ISOs on the command line at once and select the grml flavour you would like to\r
-boot on the bootprompt then. Note that the <strong>first</strong> ISO specified on the grml2usb\r
-command line will become the default one (that&#8217;s the one that will boot when\r
-just pressing enter on the bootprompt or wait until the boot timeout matches).</p></div>\r
+<div class="paragraph"><p>grml2usb installs Grml on a given partition of your usb device and makes\r
+it bootable. It provides multiboot ISO support, meaning you can specify\r
+several Grml ISOs on the command line at once and select the Grml\r
+flavour you would like to boot on the bootprompt then. Note that the\r
+<strong>first</strong> ISO specified on the grml2usb command line will become the\r
+default one (that&#8217;s the one that will boot when just pressing enter on\r
+the bootprompt or wait until the boot timeout matches).</p></div>\r
 <div class="admonitionblock">\r
 <table><tr>\r
 <td class="icon">\r
@@ -782,7 +783,7 @@ default MBR consider using <em>--syslinux-mbr</em> instead.</td>
 <div class="sect1">\r
 <h2 id="options">4. Options</h2>\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>The ISO[s] should be the path to one or multiple grml-ISOs and/or the path to\r
+<div class="paragraph"><p>ISO[s] should be the path to one or multiple grml-ISOs and/or the path to\r
 the currently running live-system (being /lib/live/mount/medium).</p></div>\r
 <div class="paragraph"><p>The device either might be a device name like /dev/sdX1 or a directory. When\r
 specifying a device name the device is mounted automatically. When specifying a\r
@@ -825,7 +826,7 @@ Copy files only but do <strong>not</strong> install a bootloader.
 <p>\r
 Avoid executing commands, instead show what would be executed.\r
 Warning: please notice that the ISO has to be mounted anyway, otherwise\r
-identifying the grml flavour would not be possible.\r
+identifying the Grml flavour would not be possible.\r
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
@@ -912,6 +913,14 @@ multiple entries for removing different bootoptions at once.
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
+<strong>--skip-bootflag</strong>\r
+</dt>\r
+<dd>\r
+<p>\r
+Do not check for presence of bootflag on target device.\r
+</p>\r
+</dd>\r
+<dt class="hdlist1">\r
 <strong>--skip-grub-config</strong>\r
 </dt>\r
 <dd>\r
@@ -1030,7 +1039,7 @@ Enable verbose mode.
 <div class="content">\r
 <pre><code>grml/\r
   |-- grml2usb.txt         [not yet implemented]\r
-  |-- grml-cheatcodes.txt  [list of bootoptions for grml]\r
+  |-- grml-cheatcodes.txt  [list of bootoptions for Grml]\r
   |-- grml-version.txt     [file containing information about grml-version]\r
   |-- LICENSE.txt          [license information]\r
   |-- md5sums              [md5sums of original ISO]\r
@@ -1294,7 +1303,7 @@ grml2usb.tgz.</td>
 </div>\r
 <div class="sect2">\r
 <h3 id="dd">7.2. Why can&#8217;t I just dd the ISO to a USB device?</h3>\r
-<div class="paragraph"><p>Well, you can. :) Starting with grml 2009.10 the ISOs are dd-able straight out-of-the-box.</p></div>\r
+<div class="paragraph"><p>Well, you can. :) Starting with Grml 2009.10 the ISOs are dd-able straight out-of-the-box.</p></div>\r
 <div class="admonitionblock">\r
 <table><tr>\r
 <td class="icon">\r
@@ -1504,7 +1513,7 @@ default bootoptions.</p></div>
 <div class="content">\r
 <pre><code># grml2usb --bootoptions="persistent-path=%flavour_name" grml64_2010.04.iso grml_2010.04.iso /dev/sdX1</code></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Install specified Isos on device /dev/sdx and add parameter persisten-path\r
+<div class="paragraph"><p>Install specified ISOs on device /dev/sdx and add parameter persistent-path\r
 to every menu entry. %flavour_name will be expanded to the flavour of the specific\r
 iso, e.g. grml64 and grml.</p></div>\r
 </div>\r
@@ -1532,7 +1541,8 @@ iso, e.g. grml64 and grml.</p></div>
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2013-01-10 13:55:49 CET\r
+Last updated\r
+ 2014-10-09 09:57:14 CEST\r
 </div>\r
 </div>\r
 </body>\r