Support raid1 only for now, update changelog and TODO

diff --git a/TODO b/TODO
index 3b0b4ae..8d33283 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,13 +4,14 @@ TODO list for grml-debootstrap
 Important
 ---------
 
 Important
 ---------
 

-* /dev/MAKEDEV is missing in tarball

 * support for SW-RAID (work in progress, needs work on bootloader)
 * support for SW-RAID (work in progress, needs work on bootloader)

-* support for LVM

 
 Would be nice to have
 ---------------------
 
 
 Would be nice to have
 ---------------------
 

+* support execution of additional scripts for further customization
+* support for LVM
+* support grub2

 * support tarballs for customization/mirror source
   -> integrate/use 'fai dirinstall'?
 * support automatic installation of grml packages:
 * support tarballs for customization/mirror source
   -> integrate/use 'fai dirinstall'?
 * support automatic installation of grml packages:

diff --git a/debian/changelog b/debian/changelog
index e8c4ea6..3976144 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,14 @@ grml-debootstrap (0.18) unstable; urgency=low
   * Initial support for SW-RAID.
   * Use stages based on target information, this gives us
     the possibility to run multiple instance of grml-debootstrap.
   * Initial support for SW-RAID.
   * Use stages based on target information, this gives us
     the possibility to run multiple instance of grml-debootstrap.

-    [Testing: issue510]
+    [Closes: issue510]

   * Use policy-rc.d inside chroot to avoid startup of daemons.
   * Use policy-rc.d inside chroot to avoid startup of daemons.

-    [Testing: issue509]
+    [Closes: issue509]

   * Do not activate /sys by default anymore in /etc/fstab.
   * Copy /etc/network/interfaces from running system to target
     installation.
   * Setting password via passwd does not work, use chpaswd instead.
   * Do not activate /sys by default anymore in /etc/fstab.
   * Copy /etc/network/interfaces from running system to target
     installation.
   * Setting password via passwd does not work, use chpaswd instead.

-  * Remove stages after successful execution.
+  * Remove stages after successful execution. [Closes: issue513]

   * Make sure the configuration file inside the chroot provides
     the same configuration as specified on the cmdline (thanks gebi
     for reporting).
   * Make sure the configuration file inside the chroot provides
     the same configuration as specified on the cmdline (thanks gebi
     for reporting).


@@ -29,6 +29,9 @@ grml-debootstrap (0.18) unstable; urgency=low
   * Run aptitude with --without-recommends option.
   * Run grub-install using --no-floppy, as requested by gebi.
   * Support setting hostname via cmdline.
   * Run aptitude with --without-recommends option.
   * Run grub-install using --no-floppy, as requested by gebi.
   * Support setting hostname via cmdline.

+  * Close issue in grml's BTS which showed up during development in hg:
+    Fix handling of config file inside chroot, thanks for spotting, gebi!
+    [Closes: issue512]

 
  -- Michael Prokop <mika@grml.org>  Fri, 29 Aug 2008 14:35:10 +0200
 
 
  -- Michael Prokop <mika@grml.org>  Fri, 29 Aug 2008 14:35:10 +0200
 

diff --git a/grml-debootstrap b/grml-debootstrap
index e2dbc6a..ed2f629 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -307,11 +307,15 @@ grubdevice() {
 config_swraid_setup()
 {
 TMPFILE=$(mktemp)
 config_swraid_setup()
 {
 TMPFILE=$(mktemp)

-RAIDLEVEL=$(dialog --stdout --title "$PN" --default-item raid1 \
-                   --menu "Which RAID level do you want to use?" 0 0 0 \
-                     raid1 "Software RAID level 1" \
-                     raid5 "Software RAID level 5")
-[ $? -eq 0 ] || bailout 20
+
+# Currently we support only raid1:
+RAIDLEVEL='raid1'
+
+#RAIDLEVEL=$(dialog --stdout --title "$PN" --default-item raid1 \
+#                   --menu "Which RAID level do you want to use?" 0 0 0 \
+#                     raid1 "Software RAID level 1" \
+#                     raid5 "Software RAID level 5")
+#[ $? -eq 0 ] || bailout 20

 
 MD_LIST=$(for i in $(seq 0 9) ; do
             awk '{print $4}' /proc/partitions | grep -q md$i || \
 
 MD_LIST=$(for i in $(seq 0 9) ; do
             awk '{print $4}' /proc/partitions | grep -q md$i || \


@@ -376,7 +380,7 @@ prompt_for_swraid()
 if dialog --stdout --title "$PN" \
           --defaultno --yesno "Do you want to configure Software RAID?
 
 if dialog --stdout --title "$PN" \
           --defaultno --yesno "Do you want to configure Software RAID?
 

-Please notice that currently only RAID levels 1 and 5 are supported by ${PN}. Configuration will take place using mdadm." 0 0 ; then
+Please notice that only RAID level 1 is supported by ${PN} currently. Configuration will take place using mdadm." 0 0 ; then

   config_swraid_setup
 fi
 }
   config_swraid_setup
 fi
 }