From: Alexander Wirt Date: Sun, 22 Apr 2007 10:44:33 +0000 (+0200) Subject: Update TODO X-Git-Tag: 0.9~17 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=b3015dae12151f5eb85e60002a5c20d1678a1059;hp=36a9c6208444054ebc2f9efad8ad65f1db5c87f1 Update TODO --- diff --git a/TODO b/TODO index 1cafaf5..e03604a 100644 --- a/TODO +++ b/TODO @@ -12,5 +12,4 @@ TODO list for grml-debootstrap * provide zsh-completion for grml-debootstrap's cmdline variables * support installation on usb-pen (like grml2usb for Debian) -> http://blog.256bit.org/archives/172-Debian-in-der-Hosentasche.html#extended -* install all packages within /etc/debootstrap/packages.d/ to system * support installation of grml-kernel diff --git a/chroot-script b/chroot-script index 7ee50a9..a75f34b 100644 --- a/chroot-script +++ b/chroot-script @@ -96,7 +96,20 @@ packages() { } # }}} -# sarge specific stuff: mkinitrd {{{ +# install extra packages {{{ +extrapackages() { + if [ "$EXTRAPACKAGES" = 'yes' ] ; then + PACKAGELIST=$(find /etc/debootstrap/extrapackages -type f -name '*.deb') + if [ -n "$PACKAGELIST" ]; then + dpkg -i $PACKAGELIST + # run apt again to resolve any deps + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL + fi + fi +} +# }}} + +# sarge specific stuff: mkinitrd {{{ mkinitrd() { if [ "$RELEASE" = 'sarge' ] ; then sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf @@ -370,6 +383,7 @@ finalize() { stage kernelimg_conf && kernelimg_conf && stage kernelimg_conf done stage makedev && makedev && stage makedev done stage packages && packages && stage packages done + stage extrapackages && extrapackages && stage extrapackages done stage mkinitrd && mkinitrd && stage mkinitrd done stage kernel && kernel && stage kernel done stage reconfigure && reconfigure && stage reconfigure done diff --git a/config b/config index 9467498..979f574 100644 --- a/config +++ b/config @@ -98,6 +98,9 @@ DEBIAN_FRONTEND='noninteractive' # install packages defined in /etc/debootstrap/packages? PACKAGES='yes' +# install extra packages in /etc/debootstrap/ +EXTRAPACKAGES='yes' + # place of config files for debootstrap CONFFILES='/etc/debootstrap/' diff --git a/debian/changelog b/debian/changelog index a2ac987..29e3318 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grml-debootstrap (0.9) unstable; urgency=low + + * Add support for EXTRAPACKAGES that can be dropped in + /etc/debootstrap/extrapackages + * Add boot_append option to manpage + * Manpage reformatted + + -- Alexander Wirt Sun, 22 Apr 2007 12:35:32 +0200 + grml-debootstrap (0.8) unstable; urgency=low * Add BOOT_APPEND option for kernel appendline diff --git a/debian/control b/debian/control index d7d446c..6c5b1a5 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: grml-debootstrap Section: grml Priority: optional Maintainer: Michael Prokop +Uploaders: Alexander Wirt Build-Depends: debhelper (>= 5), asciidoc, xsltproc, docbook-xsl Standards-Version: 3.7.2 XS-Vcs-hg: http://hg.grml.org/grml-debootstrap diff --git a/debian/rules b/debian/rules index 61191f9..b07d6fc 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs etc/debootstrap usr/sbin # etc/zsh/completion.d + dh_installdirs etc/debootstrap usr/sbin etc/debootstrap/extrapackages # etc/zsh/completion.d # Add here commands to install the package into debian/grml-debootstrap. install -m 644 config debian/grml-debootstrap/etc/debootstrap/ diff --git a/grml-debootstrap b/grml-debootstrap index d4451cb..7244fbb 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -309,6 +309,8 @@ preparechroot() { cp /etc/debootstrap/packages $MNTPOINT/etc/debootstrap/packages cp /etc/debootstrap/variables $MNTPOINT/etc/debootstrap/variables + cp -a /etc/debootstrap/extrapackages/ $MNTPOINT/etc/debootstrap/ + # make sure we can access network [relevant for cdebootstrap] [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index e04624e..0644643 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -7,7 +7,7 @@ grml-debootstrap - wrapper around debootstrap for installing plain Debian via gr Synopsis -------- -grml-debootstrap [ options ] +grml-debootstrap [ _options_ ] image:images/screenshot.png[Screenshot] @@ -31,51 +31,46 @@ CAUTION: The grml team does not take responsibility for loss of any data! Options and environment variables --------------------------------- - -h, --help +*-h*, *--help*:: + Show summary of options and exit. -Show summary of options and exit. +*-v*, *--version*:: + Show version of program and exit. - -v, --version +*--grub* <_device_>:: + 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. -Show version of program and exit. +*--groot* <_device_>:: + Specify root device for usage in grub (corresponds with $TARGET). + Again, use grub syntax for specifying. + Corresponding with configuration variable GROOT. - --grub +*--boot_append* <_appendline for the kernel_>:: + Specifiy appendline for the kernel. + E.g. "_pci=nomsi_" -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. - - --groot - -Specify root device for usage in grub (corresponds with $TARGET). -Again, use grub syntax for specifying. -Corresponding with configuration variable GROOT. - - -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. +*-m*, *--mirror* <_URL_>:: + 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. - -p, --mntpoint +*-p*, *--mntpoint* <_/mntpoint_>:: + Specify mountpoint that should be used for mounting the target system. + Corresponding with configuration variable MNTPOINT. -Specify mountpoint that should be used for mounting the target system. -Corresponding with configuration variable MNTPOINT. +*--password* <_password_>:: + Use specified password as password for user root. Use with caution, as your + commandline might be visible in the process list and the shell history. + It's meant for automatic installation only. - --password +*-r*, *--release* <_releasename_>:: + Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid. + Corresponding with configuration variable RELEASE. -Use specified password as password for user root. Use with caution, as your -commandline might be visible in the process list and the shell history. -It's meant for automatic installation only. - - -r, --release - -Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid. -Corresponding with configuration variable RELEASE. - - -t, --target - -Target partition (/dev/...) or directory (anything else without /dev at the -beginning). +*-t*, *--target* <_target_>:: + Target partition (/dev/...) or directory (anything else without /dev at the + beginning). WARNING: the commandline parsing of grml-debootstrap does not validate the provided arguments for the commandline options. Please be careful and check docs and @@ -127,6 +122,11 @@ Defines the default locales used for generating locales via locale-gen. Defines the software packages which should be installed in the new Debian system by default. + /etc/debootstrap/extrapackages + +Debian Packages dropped here will be installed into the new Debian system by +default (Controlvariable: EXTRAPACKAGES) + /etc/debootstrap/stages/ The default directory for storing information about executed stages. Every @@ -148,7 +148,9 @@ 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. +system then. If you want to install additional packages that are not available +via the grml or debian mirror drop them into /etc/debootstrap/extrapackages and +take sure that EXTRAPACKAGES is set to "yes". Automatic installation ----------------------