X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=ac11325d0911324790a6faab3c50ba64171e8731;hp=c59f455d070fe439e4de145c8f491c33b9e03c25;hb=fbf2dd19acaa441025d0beb33b8e17ad3c1d61f0;hpb=fa164cea7481233fb376f1a3bb8ba56475f5228c

diff --git a/chroot-script b/chroot-script
index c59f455..ac11325 100755
--- a/chroot-script
+++ b/chroot-script
@@ -47,12 +47,14 @@ stage() {
 # define chroot mirror {{{
 chrootmirror() {
   [ -n "$KEEP_SRC_LIST" ] && return
+  [ -z "$COMPONENTS" ]    && COMPONENTS='main contrib non-free'
+
   if [ -n "$ISO" ] ; then
-     echo "deb $ISO $RELEASE main contrib" > /etc/apt/sources.list
-     [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list
+     echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
+     [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || /bin/true
   else
     if [ -n "$MIRROR" ] ; then
-       echo "deb $MIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
+       echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
     fi
   fi
 }
@@ -405,11 +407,20 @@ grub() {
      $UPDATEGRUB -y
      if [ -f /boot/grub/menu.lst ] ; then
         sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
-	if [ -n "$TARGET_UUID" ] ; then
-	   sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-	else
-	   sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-	fi
+        case "$TARGET" in
+             # do NOT use uuid with SW-RAID
+             /dev/md*)
+               sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
+               ;;
+             *)
+               if [ -n "$TARGET_UUID" ] ; then
+                 sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
+               else
+                 sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
+               fi
+               ;;
+        esac
+
         # not sure why savedefault does not work for me; any ideas?
         sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
         $UPDATEGRUB -y