From a8fd9efa83f4963b552c3ddc90864677d90dfb05 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 16 Apr 2007 14:15:08 +0200 Subject: [PATCH 1/1] Support mountpoint as option, update manpage --- TODO | 1 - debian/changelog | 1 + debian/grml-debootstrap.8 | 67 +++++++++++++++++++++++++++++++++++++++-------- grml-debootstrap | 10 ++++++- 4 files changed, 66 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index 59b4fe7..42317b9 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,6 @@ TODO list for grml-debootstrap ------------------------------ -* support overriding of configuration variables via commandline * support tarballs for customization * support automatic installation of grml packages: * grml-etc-core diff --git a/debian/changelog b/debian/changelog index a859aec..9c51b48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ grml-debootstrap (0.7) unstable; urgency=low + * Support setting some variables via cmdline. * Change logic of function execution. * Improved error handling in several functions. * Use aptitude instead of apt-get in chroot-script, but diff --git a/debian/grml-debootstrap.8 b/debian/grml-debootstrap.8 index 1782f14..2884cc8 100644 --- a/debian/grml-debootstrap.8 +++ b/debian/grml-debootstrap.8 @@ -13,9 +13,9 @@ command. (and cdebootstrap if you want) for installing a plain Debian system via grml very fast and easy. -All you have to do is adjust a few variables in configuration -file /etc/debootstrap/config and invoke grml-debootstrap without -any further options then. +All you have to do is adjust a few variables in configuration file +/etc/debootstrap/config (or specify some variables via commandline) and invoke +grml-debootstrap without any further options then. A plain and base Debian system will be installed on the given device (or directory) then. Customization of this process is @@ -24,10 +24,54 @@ possible as well. grml-debootstrap supports the following options: .TP .B \-h, \-\-help -Show summary of options. +Show summary of options and exit. .TP .B \-v, \-\-version -Show version of program. +Show version of program and exit. +.TP +.B \-\-grub +Where do you want to install grub to? Use grub syntax for specifying. +Do not forget to set groot as well. Leave empty to avoid installation of grub. +.TP +.B \-\-groot +Specify root device for usage in grub (corresponds with $TARGET). +Again, use grub syntax for specifying. +Corresponding with configuration variable GROOT. +.TP +.B \-m, \-\-mirror +Specify mirror which should be used for apt-get/aptitude. Notice that +specifying the mirror also sets the chrootmirror to the given value. +Corresponding with configuration variables MIRROR and CHROOTMIRROR. +.TP +.B \-p, \-\-mntpoint +Specify mountpoint that should be used for mounting the target system. +Corresponding with configuration variable MNTPOINT. +.TP +.B \-r, \-\-release +Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid. +Corresponding with configuration variable RELEASE. +.TP +.B \-t, \-\-target +Target partition (/dev/...) or directory (anything else without /dev at the +beginning). +.SH USAGE EXAMPLES +.TP +.B grml-debootstrap --target /dev/hda1 --grub hd0 --groot hd0,0 +Install default Debian release (stable/etch) on /dev/hda1 and install bootmanager +Grub in MBR (master boot record) of /dev/hda and use /dev/hda1 as system partition. +.TP +.B grml-debootstrap --target /dev/hda6 --grub hd0 --groot hd0,5 --release sid +Install Debian unstable/sid on /dev/hda6, install bootmanager +Grub in MBR (master boot record) of /dev/hda and use /dev/hda6 as system partition. +.TP +.B grml-debootstrap --target /data/chroot +Install default Debian release (stable/etch) in directory /data/chroot (without +any bootloader). +.TP +.B grml-debootstrap --target /dev/sda3 --grub hd0 --groot hd0,2 --mirror ftp://ftp.tugraz.at/mirror/debian +Install default Debian release (stable/etch) on /dev/sda3 and install bootmanager +Grub in MBR (master boot record) of /dev/sda and use /dev/sda3 as system partition. +Use specifed mirror instead of the default (ftp://ftp.debian.de/debian) one. .SH FILES .TP .B /etc/debootstrap/config @@ -57,12 +101,13 @@ grml-debootstrap (which might delete present data). .SH CUSTOMIZATION You can control execution of grml-debootstrap via adjusting -/etc/debootstrap/config for some main stuff. The packages which should be -installed in the new Debian system can be defined via the file -/etc/debootstrap/packages. If you want to put existing files to the new -Debian system you can place them into the (by default non-existing) -directories boot, etc, share, usr and var in /etc/debootstrap/. Every -existing directory will be copied to the new Debian system then. +/etc/debootstrap/config for some main stuff or via setting some selected +variables via commandline. The packages which should be installed in the new +Debian system can be defined via the file /etc/debootstrap/packages. If you +want to put existing files to the new Debian system you can place them into the +(by default non-existing) directories boot, etc, share, usr and var in +/etc/debootstrap/. Every existing directory will be copied to the new Debian +system then. .SH SUPPORTED RELEASES .TP diff --git a/grml-debootstrap b/grml-debootstrap index 1473a05..7ca8a70 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Apr 16 13:53:27 CEST 2007 [mika] +# Latest change: Mon Apr 16 14:14:54 CEST 2007 [mika] ################################################################################ # http://www.debian.org/releases/stable/i386/index.html.en @@ -57,6 +57,14 @@ while [ "$#" -gt "0" ] ; do shift GROOT=$1 ;; + --release) + shift + RELEASE=$1 + ;; + -p|--mntpoint) + shift + MNTPOINT=$1 + ;; -m|--mirror) shift MIRROR=$1 -- 2.1.4