From: Michael Prokop Date: Mon, 31 Dec 2012 22:53:38 +0000 (+0100) Subject: Merge branch 'mika/wheezy_release' X-Git-Tag: v0.55~3 X-Git-Url: http://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=488643ab1a3e97a77bdb01f1070c8e83c6b346f9;hp=a9697fb1f06fdf687045eef8381e7b01620ce45a Merge branch 'mika/wheezy_release' --- diff --git a/config b/config index dba827f..f1798fe 100644 --- a/config +++ b/config @@ -63,10 +63,9 @@ # GRMLPACKAGES='grml-etc-core' # Debian release that should be installed. -# Supported values: lenny (old-stable), squeeze (stable), -# wheezy (testing), sid (unstable) -# Default: 'squeeze' -# RELEASE='squeeze' +# Supported values: lenny, squeeze, wheezy, sid +# Default: 'wheezy' +# RELEASE='wheezy' # Define components that should be used within sources.list. # Default: 'main contrib non-free' diff --git a/debian/changelog b/debian/changelog index 2a550f7..6b30d23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +grml-debootstrap (0.54) unstable; urgency=low + + The "happy new year, Verena" release. + + [ Evgeni Golov ] + * [5ee8148] add BOOT_APPEND to GRUB_CMDLINE_LINUX_DEFAULT + + [ Michael Prokop ] + * [62cec4e] Do not hardcode squeeze as Debian/stable + * [6589216] Set wheezy as the new default release [Closes: #688234] + * [ae9070d] docs: fix outdated default mirror reference + * [e5a6244] docs: clarify AUTOINSTALL is currently supported on Grml + live systems only. Thanks to Evgeni Golov for review + + improving + * [4280921] docs: mention VM image and dialog based frontend support. + Thanks to Evgeni Golov for review and improving + + -- Michael Prokop Mon, 31 Dec 2012 23:52:42 +0100 + grml-debootstrap (0.53) unstable; urgency=low * [4d08103] Add acpi-support-base to default package selection diff --git a/grml-debootstrap b/grml-debootstrap index 8667738..6b5fa17 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -31,7 +31,7 @@ MKFS='mkfs.ext3' PACKAGES='yes' PRE_SCRIPTS='yes' RECONFIGURE='console-data' -RELEASE='squeeze' +RELEASE='wheezy' RM_APTCACHE='yes' SCRIPTS='yes' SECURE='yes' @@ -60,7 +60,7 @@ Bootstrap options: -m, --mirror Mirror which should be used for apt-get/aptitude. -i, --iso Mountpoint where a Debian ISO is mounted to, for use instead of fetching packages from a mirror. - -r, --release Release of new Debian system (default: squeeze). + -r, --release Release of new Debian system (default: wheezy). -t, --target Target partition (/dev/...) or directory where the system should be installed to. -p, --mntpoint Mountpoint used for mounting the target system, @@ -494,13 +494,13 @@ prompt_for_bootmanager() # ask for Debian release {{{ prompt_for_release() { - [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='squeeze' + [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='wheezy' RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \ "Please enter the Debian release you would like to use for installation:" \ 0 50 4 \ - lenny Debian/old-stable \ - squeeze Debian/stable \ - wheezy Debian/testing \ + lenny Debian/5.0 \ + squeeze Debian/6.0 \ + wheezy Debian/7.0 \ sid Debian/unstable)" [ $? -eq 0 ] || bailout } diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index d45a3d0..5d18b90 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -17,12 +17,14 @@ Introduction grml-debootstrap is a wrapper suite around debootstrap (and cdebootstrap if you want) for installing a plain Debian system (e.g. via Grml) very fast and easy. -All you have to do is adjust a few variables in configuration file -/etc/debootstrap/config (or specify some variables via command line) and invoke -grml-debootstrap without any further options then. +All you have to do is adjust a few variables in the configuration file +/etc/debootstrap/config or specify some command line options and invoke +grml-debootstrap. If invoked without any configuration modifications or command +line options a dialog based frontend will be available to control some basic +configuration options. -A plain and base Debian system will be installed on the given device (or -directory) then. Customization of this process is possible as well. +A plain and base Debian system will be installed on the given device, directory +or virtual image file then. Customization of this process is possible as well. CAUTION: The Grml team does not take responsibility for loss of any data! @@ -201,7 +203,7 @@ Usage examples grml-debootstrap --target /dev/sda1 --grub /dev/sda -Install default Debian release (stable/squeeze) on /dev/sda1 and install bootmanager +Install default Debian release (wheezy) on /dev/sda1 and install bootmanager Grub in MBR (master boot record) of /dev/sda and use /dev/sda1 as system partition. grml-debootstrap --target /dev/sda6 --grub /dev/sda --release sid @@ -212,25 +214,25 @@ Install Debian unstable/sid on /dev/sda6, install bootmanager Grub in MBR mount /dev/sda1 /data/chroot grml-debootstrap --target /data/chroot -Install default Debian release (stable/squeeze) in directory /data/chroot (without +Install default Debian release (wheezy) in directory /data/chroot (without any bootloader). grml-debootstrap --target /dev/sda3 --grub /dev/sda --mirror ftp://ftp.tugraz.at/mirror/debian -Install default debian release (stable/squeeze) in a Virtual Machine file with +Install default debian release (wheezy) in a Virtual Machine file with 3GB disk size (including Grub as bootmanager in MBR of the virtual disk file): mount /dev/sda1 /mnt/sda1 grml-debootstrap --vmfile --vmsize 3G --target /mnt/sda1/qemu.img -Install default Debian release (stable/squeeze) on /dev/sda3 and install bootmanager +Install default Debian release (wheezy) on /dev/sda3 and install bootmanager Grub in MBR (master boot record) of /dev/sda and use /dev/sda3 as system partition. Use specified mirror instead of the default (ftp://ftp.debian.de/debian) one. - mount -o loop /mnt/sda6/debian-40r0-i386-CD-1.iso /mnt/iso + mount -o loop /mnt/sda6/debian-CD-1.iso /mnt/iso grml-debootstrap --target /dev/sda1 --grub /dev/sda --iso file:/mnt/iso/debian/ -Install Debian stable/squeeze on /dev/sda1 using the loopback mounted Debian-ISO +Install Debian on /dev/sda1 using the loopback mounted Debian-ISO for the base-system and install bootmanager Grub in MBR (master boot record) of /dev/sda and use /dev/sda1 as system partition. Please notice, that the chroot system requires network access for all packages which are not part of the @@ -296,9 +298,9 @@ If environment variable AUTOINSTALL is set grml-debootstrap can be executed in a full automatic mode. While this mode isn't really useful for interactive execution (just configure /etc/debootstrap/configure or specify the relevant variables on the command line instead) it is meant for use via boot option -debian2hd. The boot option debian2hd (more precise: the kernelname on bootprompt) -supports the following boot options (they correspond with the command line options -mentioned above): +debian2hd on the Grml live system. The boot option debian2hd (more precise: the +kernelname at the bootprompt) supports the following boot options (they +correspond with the command line options mentioned above): target=... @@ -311,13 +313,13 @@ Where do you want to install grub to? Usage example: grub=/dev/sda release=... -Specify release of new Debian system. Defaults to Debian squeeze. Supported +Specify release of new Debian system. Defaults to Debian wheezy. Supported relases: lenny, squeeze, wheezy and sid. Usage example: release=sid mirror=... Specify mirror which should be used for apt-get/aptitude instead -of the default one (ftp://ftp.debian.de/debian). +of the default one (http://cdn.debian.net/debian). Usage example: mirror=ftp://ftp.tugraz.at/mirror/debian password=... @@ -350,8 +352,8 @@ include::releasetable.txt[] ================================================================================ [1] Please notice that lenny is the current old-stable release within Debian. grml-debootstrap can handle the release but you really should not use lenny -anymore unless you really know what you are doing. Choose stable (squeeze) -instead. +anymore unless you really know what you are doing. Choose Debian 6.0 (squeeze) +or Debian 7.0 (wheezy) instead. Notice that you need to specify a mirror providing the lenny release, the default (http://cdn.debian.net/debian) doesn't provide it any longer nowadays. @@ -367,8 +369,8 @@ the advantage of grub-legacy actually being able to boot from it. .sid release ================================================================================ [2] Please notice that sid is Debian/unstable and due to its nature might not be -always installable. What _might_ work instead is deploying stable (squeeze) or -testing (wheezy) and upgrade it after installation finished. +always installable. What _might_ work instead is deploying a stable or testing +release and upgrade it after installation finished. ================================================================================ Bugs