X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=29cd840872bf70e8fed97cb273be99c0c6acbba5;hp=cdb6c0a19935c7814885f87b896eb631dd89840c;hb=a454a1ad00616dd231602e66782483010384723b;hpb=d965b4983de8c08698d60c3d23c446d0acba0e5e

diff --git a/chroot-script b/chroot-script
index cdb6c0a..29cd840 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: Mon Apr 16 12:21:19 CEST 2007 [mika]
+# Latest change: Mon Apr 16 14:48:41 CEST 2007 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -16,10 +16,10 @@ set -e # exit on any error
 
 # use aptitude only if it's available
 if [ -x /usr/bin/aptitude ] ; then
-   APTINSTALL='aptitude -y'
+   APTINSTALL='aptitude -y install '
    APTUPDATE='aptitude update'
 else
-   APTINSTALL='apt-get --force-yes -y'
+   APTINSTALL='apt-get --force-yes -y install'
    APTUPDATE='apt-get update'
 fi
 
@@ -32,12 +32,12 @@ fi
 
 # helper functions {{{
 stage() {
-  if grep -q done "$STAGES/$1" 2>/dev/null ; then
-     echo " * Notice: stage $1 has been executed already, skipping execution therefore."
-     return 1
-  else
+  if [ -n "$2" ] ; then
      echo "$2" > "$STAGES/$1"
      return 0
+  elif grep -q done "$STAGES/$1" 2>/dev/null ; then
+     ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
+     return 1
   fi
 }
 # }}}
@@ -89,7 +89,7 @@ packages() {
        exit 1
      else
        $APTUPDATE
-       $APT $(cat /etc/debootstrap/packages) $GRMLPACKAGES
+       $APTINSTALL $(cat /etc/debootstrap/packages) $GRMLPACKAGES
      fi
   fi
 }
@@ -260,13 +260,18 @@ grub() {
      [ "$RELEASE" = 'sarge' ]       && cp /lib/grub/i386-pc/* /boot/grub/
 
      # finally install grub
-     update-grub -y
+     if [ -x /usr/sbin/update-grub ] ; then
+        UPDATEGRUB='/usr/sbin/update-grub'
+     else
+        UPDATEGRUB='/sbin/update-grub'
+     fi
+     $UPDATEGRUB -y
      if [ -f /boot/grub/menu.lst ] ; then
         sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
         sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro|g" /boot/grub/menu.lst
         # not sure why savedefault does not work for me; any ideas?
         sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
-        update-grub -y
+        $UPDATEGRUB -y
      fi
   fi
 }