draklive2: update description and help text.

1 files changed, 29 insertions, 50 deletions

diff --git a/draklive2 b/draklive2
index 8ffea11..5ecb511 100755
--- a/draklive2
+++ b/draklive2
@@ -3,6 +3,7 @@
 # Copyright (C) 2005 Mandriva
 #                    Olivier Blin <oblin@mandriva.com>
 # Copyright (C) 2017 Mageia
+#                    Martin Whitaker <mageia@martin-whitaker.me.uk>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -925,11 +926,11 @@ __END__
 
 =head1 NAME
 
-draklive - A live distribution mastering tool
+draklive2 - A live distribution mastering tool
 
 =head1 SYNOPSIS
 
-draklive [options]
+draklive2 [options]
 
  Options:
    --help            long help message
@@ -943,19 +944,20 @@ draklive [options]
 
    --clean           clean installation chroot and work directory
 
+   --post-install    run post install only
    --initrd          build initrd only
-   --post-install    run post install only (rpms and patches installation)
 
    --config-root <dir>
-                     root directory containing config files and additionnal files
-                     defaults to current directory if it contains a configuration file
-                     else, "/etc/draklive" is used
+                     root directory containing config and additional files
+                     defaults to current directory if it contains a
+                     configuration file, otherwise to "/etc/draklive"
 
    --config <file>   use this configuration file as live description
                      defaults to "config/live.cfg"
 
    --settings <file> use this file as live settings (key=value format)
                      defaults to "config/settings.cfg"
+
    --define key=value
                      set setting "key" to "value"
                      takes precedence over values from a settings file
@@ -964,11 +966,11 @@ draklive [options]
 
 Examples:
 
- draklive --clean
+ draklive2 --clean
 
- draklive --all
+ draklive2 --all
 
- draklive --config config/live.cfg --install
+ draklive2 --config config/live.cfg --install
 
 =head1 OPTIONS
 
@@ -977,47 +979,24 @@ Examples:
 =item B<--config>
 
 Makes draklive use the next argument as a configuration file.
-This file should contain an hash describing the live distribution,
-meaning the system (chroot and boot), media (usb, cdrom, nfs),
-and mount type (simple R/W union, union with squash files).
-
-Here's a configuration sample:
-
-  {
-    settings {
-        repository => '/mnt/ken/2006.0',
-        root => '/chroot/live-move',
-    },
-    system => {
-        kernel => '2.6.12-12mdk-i586-up-1GB',
-        auto_install => 'config/auto_inst.cfg.pl',
-        patch_install => 'config/patch-2006-live.pl',
-        rpmsrate => 'config/rpmsrate',
-        rpms => [
-             'rpms/unionfs-kernel-2.6.12-12mdk-i586-up-1GB-1.1.1.1.20051124.1mdk-1mdk.i586.rpm'
-        ],
-        patches => [
-             'patches/halt.loopfs.patch',
-        ],
-        vga_mode => 788,
-        no_initrd => 0,
-    },
-    media => {
-        storage => 'iso',
-    },
-    mount => $predefined{mounts}{squash_union}
-  };
+This file should contain a hash describing the live distribution.
+See the "draklive2" page on the Mageia Wiki for details.
 
 =item B<--settings>
 
-Makes draklive load the next argument as a file in key=value format
-into the $live->{settings} hash ($live being the global live configuration hash).
+Makes draklive load the next argument as a file in key=value format into
+the $live->{settings} hash ($live being the global live configuration hash).
 
 Built-in keys:
-  arch: build architecture
-  builddir: directory hosting build files (initrd, loopbacks, images)
-  chroot: directory hosting chrooted installations
-  region: use the matching set of langs from the regions configuration hash
+
+  arch:       build architecture
+
+  builddir:   directory hosting build files (initrd, loopbacks, images)
+
+  chroot:     directory hosting chrooted installations
+
+  region:     use the matching set of langs from the regions configuration hash
+
   repository: path to the Mandriva distribution repository (ftp/http/local)
 
 Example keys:
@@ -1029,14 +1008,14 @@ Example keys:
 
 =head1 DESCRIPTION
 
-B<draklive> builds a live distribution according to a
-configuration file, creates a master image,
-and optionally installs it on a device.
+B<draklive2> builds a live distribution according to a configuration file,
+creates a master image, and optionally installs it on a device.
 
-See L<http://qa.mandriva.com/twiki/bin/view/Main/DrakLive>
+See L<https://wiki.mageia.org/en/Draklive2>
 
-=head1 AUTHOR
+=head1 AUTHORS
 
 Olivier Blin <oblin@mandriva.com>
+Martin Whitaker <mageia@martin-whitaker.me.uk>
 
 =cut