From: Michael Prokop <mika@grml.org>
Date: Fri, 3 Nov 2006 20:58:09 +0000 (+0100)
Subject: * Added support for:
X-Git-Tag: 0.2~38
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=8049bba1690cb33dd986f2836f92d578d17e56bd

* Added support for:
  - setting hostname via /etc/hostname
  - /etc/kernel-img.conf
* Added ssh to default package list.
---

diff --git a/chroot-script b/chroot-script
index 9731659..2f8b964 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Nov 03 21:45:09 CET 2006 [mika]
+# Latest change: Fre Nov 03 21:57:11 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,9 +17,15 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "$CHROOTMIRROR" > /etc/apt/sources.list
 fi
 
-# if ! [ -n /etc/kernel-img.conf ] ; then
-#   echo "do_initrd = Yes" > /etc/kernel-img.conf
-# fi
+if ! [ -n /etc/kernel-img.conf ] ; then
+   echo "Setting up /etc/kernel-img.conf"
+   cat > /etc/kernel-img.conf << EOF
+# Kernel Image management overrides
+# See kernel-img.conf(5) for details
+do_initrd = Yes
+do_symlinks = Yes
+EOF
+fi
 
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
@@ -87,6 +93,12 @@ if grep -q UNCONFIGURED /etc/fstab ; then
    createfstab
 fi
 
+# set up hostname
+if [ -n "$HOSTNAME" ] ; then
+   echo "Setting hostname to ${HOSTNAME}."
+   echo "$HOSTNAME" > /etc/hostname
+fi
+
 # create default devices
 if ! [ -r /dev/hda20 ] ; then
    echo "Creating generic devices in /dev - this might take a while..."
diff --git a/debian/changelog b/debian/changelog
index d680a4d..0fb062a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 grml-debootstrap (0.2) unstable; urgency=low
 
   * Add 'debootstrap | cdebootstrap' to depends.
-  * Added support for cdebootstrap.
+  * Added support for:
+    - cdebootstrap
+    - setting hostname via /etc/hostname
+    - /etc/kernel-img.conf
+  * Added ssh to default package list.
 
  -- Michael Prokop <mika@grml.org>  Fri,  3 Nov 2006 19:05:19 +0100
 
diff --git a/packages b/packages
index 921da3a..c523838 100644
--- a/packages
+++ b/packages
@@ -1,3 +1,3 @@
 locales console-data
-vim most zsh screen less initrd-tools file grub usbutils pciutils bzip2 sysfsutils dhcp3-client resolvconf strace lsof w3m
-linux-headers-2.6-686 linux-image-2.6-686
+linux-headers-2.6-686 linux-image-2.6-686 initrd-tools grub
+bzip2 dhcp3-client file less lsof most pciutils resolvconf screen ssh strace sysfsutils usbutils vim w3m zsh