From 46ad17b8897ab5cf132e348406f2bac7e97acbfc Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 20 Nov 2008 14:46:40 +0100 Subject: [PATCH 1/1] Update docs and changelog --- debian/changelog | 5 ++++- grml-debootstrap.8.txt | 13 ++++++++++--- zsh-completion | 3 +-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 529a455..5c62f61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,11 @@ grml-debootstrap (0.23) unstable; urgency=low * Edit /etc/network/interfaces as well if the file exists already, we definitely need at least a loopback interface. * Adjust hostname in /etc/postfix/main.cf. + * Unify the --bootappend option, it's not --boot_append (thanks for + the hint, Tong Sun). + * Support execution of further scripts via --scripts and --chroot-scripts. - -- Michael Prokop Wed, 12 Nov 2008 18:19:01 +0100 + -- Michael Prokop Thu, 20 Nov 2008 14:45:19 +0100 grml-debootstrap (0.22) unstable; urgency=low diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index a542304..dbdc209 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -31,7 +31,7 @@ CAUTION: The grml team does not take responsibility for loss of any data! Options and environment variables --------------------------------- -*--boot_append* <_appendline for the kernel_>:: +*--bootappend* <_appendline for the kernel_>:: Specify appendline for the kernel. E.g. "_pci=nomsi_" @@ -45,6 +45,9 @@ Options and environment variables Use specified file for preseeding Debian packages instead of using the default /debconf-selections. +*--debopt* <_params_>:: + Extra parameters passed to the debootstrap. + *--groot* <_device_>:: Specify root device for usage in grub (corresponds with $TARGET). Again, use grub syntax for specifying. @@ -75,13 +78,17 @@ Options and environment variables specifying the mirror also sets the chrootmirror to the given value. Corresponding with configuration variables MIRROR and CHROOTMIRROR. +*--nodebootstrap*:: + Skip debootstrap, only do configuration to the target. + *-p*, *--mntpoint* <_/mntpoint_>:: Specify mountpoint that should be used for mounting the target system. Corresponding with configuration variable MNTPOINT. -*--packages* <_file_>:: +*--packages* [<_file_>]:: Use specified file as list for packages that should be installed instead of - the default package list file /packages. + the default package list file /packages. If no file parameter is given + it activates the default package list file /packages. *--password* <_password_>:: Use specified password as password for user root. Use with caution, as your diff --git a/zsh-completion b/zsh-completion index 0f6f366..7988af4 100644 --- a/zsh-completion +++ b/zsh-completion @@ -5,7 +5,6 @@ # Authors: grml-team (grml.org), (c) Frank Terbeck , (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Apr 23 13:03:08 CEST 2007 [mika] ################################################################################ _arguments -s \ @@ -18,7 +17,7 @@ _arguments -s '--grub[installation device for grub]:grub syntax' \ '--groot[root device for usage in grub]:grub syntax' \ '--password[specify password for root user]' \ - '--boot_append[appendline for kernel]' + '--bootappend[appendline for kernel]' ## END OF FILE ################################################################# # vim:ft=zsh -- 2.1.4