From: Michael Prokop <mika@grml.org>
Date: Fri, 13 Apr 2007 09:46:42 +0000 (+0200)
Subject: branch merge
X-Git-Tag: 0.0.1~80
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=098457244f08fa0ee9d6aac13f4749a2335c9572;hp=-c

branch merge
---

098457244f08fa0ee9d6aac13f4749a2335c9572
diff --combined rewrite/linuxrc
index 51a31d5,199e123..cd0b251
--- a/rewrite/linuxrc
+++ b/rewrite/linuxrc
@@@ -2,7 -2,7 +2,7 @@@
  # Filename: /linuxrc
  # Purpose:  minirt for kernel 2.6 running on grml live-cd
  # Authors:  (c) Klaus Knopper <knoppix@knopper.net>, (c) Michael Prokop <mika@grml.org>
 -# Latest change: Mon Apr 09 12:47:28 CEST 2007
 +# Latest change: Fri Apr 13 10:55:59 CEST 2007 [mika]
  #######################################################################################
  
  # hardcoded configurable options
@@@ -228,7 -228,6 +228,7 @@@ GRML_DIR="GRML
  GRML_NAME="GRML"
  case "$CMDLINE" in *grml_dir=*) GRML_DIR="$grml_dir"; ;; esac
  case "$CMDLINE" in *grml_name=*) GRML_NAME="$grml_name"; ;; esac
 +case "$CMDLINE" in *small*) GRML_TYPE="small"; ;; esac
  
  # NFS
  for i in $cmdline; do case "$i" in nfsdir=*|NFSDIR=*) eval $i;; esac; done
@@@ -240,6 -239,27 +240,27 @@@ if [ -n "$DEBUG" ]; the
     cat /proc/cmdline
  fi
  
+ # check for available ram 
+ RAM=$(/static/awk '/MemTotal/{print $2}' /proc/meminfo)
+ log_begin_msg "${RAM} kB of RAM available"
+ 
+ case "$CMDLINE" in *small*) GRML_TYPE="small"; ;; esac
+ 
+ if [ "$GRML_TYPE" = "small" ]
+ then
+     if [[ $RAM -lt 25000 ]]
+     then 
+ 	log_end_msg "You need at least 32MB of RAM available for grml-small"
+ 	return 1
+     fi
+ else
+     if [[ $RAM -lt 58000 ]]
+     then
+ 	log_end_msg "You need at least 64Mb of RAM available for grml"
+ 	return 1
+     fi
+ fi
+ 
  # Run a shell if in debug mode
  # echo "${BLUE}Dropping you to a busybox shell for debugging.${NORMAL}"
  stage=1
@@@ -553,7 -573,7 +574,7 @@@ if [ -n "$NFS" ]; the
  
    dhcp_iface_=$(getbootparam dhcp_iface)
    if [ -z "$dhcp_iface_" ]; then
 -  	dhcp_iface_=`ifconfig -a | grep '^eth' | sed 's/ .*//'`
 +        dhcp_iface_=`ifconfig -a | grep '^eth' | sed 's/ .*//'`
    fi
  
    # make sure we have a udhcpc executable, if it's not present
@@@ -898,24 -918,6 +919,24 @@@ MINLEFT=1600
  # Default ramdisk size for ramdisk
  [ -n "$TOTALMEM" ] && RAMSIZE="$(/usr/bin/expr $TOTALMEM / 5)"
  
 +# check for available RAM
 +# check for bootoption small and/or grml-small
 +if [ -n "$FOUNDMEM" ] ; then
 +   if [ "$GRML_TYPE" = "small" ] ; then
 +      if [ "$FOUNDMEM" -lt 25000 ] ; then
 +         log_begin_msg "Bootoption *small detected, but you need at least 32MB of RAM available." ; echo " $FAILED"
 +         log_begin_msg "Dropping you to a shell, continue on your own risk." ; echo " $FAILED"
 +         /bin/bash
 +      fi
 +   else
 +      if [ "$FOUNDMEM" -lt 58000 ] ; then
 +         log_begin_msg "You need at least 64MB of RAM available for grml." ; echo "   $FAILED"
 +         log_begin_msg "Dropping you to a shell, continue on your own risk." ; echo " $FAILED"
 +         /bin/bash
 +      fi
 +   fi
 +fi
 +
  # Create additional dynamic ramdisk.
  test -z "$RAMSIZE" -o "$RAMSIZE" -lt "$MINSIZE" && RAMSIZE="$MINSIZE"
  mkdir -p /ramdisk