X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=rewrite%2Flinuxrc;h=51a31d55aa7464aa92d432836c218c1e71629a3f;hb=870edc858247330fb2d0d09056334572f343627e;hp=bc81d855788353da58dc5fb17dfb665247e05428;hpb=cc90bc8be11d67028d10bcdf7eeedbd961a8a7d7;p=grml-live.git

diff --git a/rewrite/linuxrc b/rewrite/linuxrc
index bc81d85..51a31d5 100644
--- a/rewrite/linuxrc
+++ b/rewrite/linuxrc
@@ -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: Tue Mar 27 23:05:51 CEST 2007
+# Latest change: Fri Apr 13 10:55:59 CEST 2007 [mika]
 #######################################################################################
 
 # hardcoded configurable options
@@ -171,17 +171,30 @@ FAILED=" ${NORMAL}[${RED}fail${NORMAL}]"
 # echo "$CLEAR"
 # Just go to the top of the screen
 # echo -n ""
+DISTRI="$(getbootparam 'distri' 2>/dev/null)"
+if [ -n "$DISTRI" ] ; then
+SPLASH="
+${RED} $DISTRI
+
+${WHITE}based on grml.org.
+
+${NORMAL}"
+else
+SPLASH="
+${RED}   ____ ____  __  __ _
+${RED}  / ___|  _ \|  \/  | |
+${RED} | |  _| |_) | |\/| | |
+${RED} | |_| |  _ <| |  | | |___
+${RED}  \____|_| \_\_|  |_|_____|
+
+${WHITE}grml.org - Linux for users of texttools and sysadmins.
+
+${NORMAL}"
+fi
+
 echo ""
 echo "${WHITE}Welcome to"
-echo ""
-echo "${RED}   ____ ____  __  __ _     "
-echo "${RED}  / ___|  _ \|  \/  | |    "
-echo "${RED} | |  _| |_) | |\/| | |    "
-echo "${RED} | |_| |  _ <| |  | | |___ "
-echo "${RED}  \____|_| \_\_|  |_|_____|"
-echo ""
-echo "${WHITE}grml.org - Linux for users of texttools and sysadmins."
-echo "${NORMAL}"
+echo "$SPLASH"
 
 # We need the builtin commands and /static only starting at this point
 PATH=/static
@@ -215,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
@@ -326,7 +340,7 @@ fi
 
 # New sysfs based SCSI detection (thanks, Jörg Schirottke)
 sysfsscsi(){
-SYS=$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x; done|cut -f2 -d:)
+SYS=$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x 2>/dev/null; done|cut -f2 -d:)
 while read id driver; do
  for sysid in $SYS; do
   case $sysid in $id)
@@ -539,7 +553,7 @@ if [ -n "$NFS" ]; then
 
   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
@@ -571,31 +585,41 @@ if [ -n "$NFS" ]; then
 fi
 
 # Now that the right SCSI driver is (hopefully) loaded, try to find CD-ROM
-if test -z $NFS ; then
-  DEVICES="/dev/hd?"
-  test -n "$FOUND_SCSI" -a -z "$NOCD" && DEVICES="/dev/scd? /dev/scd?? $DEVICES"
-  # New: Also try parallel port CD-Roms [for Mike].
-  DEVICES="$DEVICES /dev/pcd?"
-  # New: also check HD partitions for a GRML/GRML image
-  # notice: use /dev/sd? for usb-sticks without partition(s)
-  test -n "$FOUND_SCSI" -a -z "$NOSCSI" && DEVICES="$DEVICES /dev/sd?[1-9] /dev/sd?[1-9][0-9] /dev/sd?"
-  DEVICES="$DEVICES /dev/hd?[1-9] /dev/hd?[1-9][0-9]"
-  case "$CMDLINE" in *fromhd=/dev/*) DEVICES="$fromhd"; ;; esac
-  for i in $DEVICES
-  do
-  log_begin_msg "${CRE} ${GREEN}*${NORMAL} Looking for CD-ROM in:    ${MAGENTA}$i${NORMAL}"
-  if mountit $i /cdrom "-o ro" >/dev/null 2>&1
-    then
-    echo "  $SUCCESS"
-    if test -f /cdrom/$GRML_DIR/$GRML_NAME
-      then
-      log_begin_msg "Accessing grml CD-ROM at: ${MAGENTA}$i${NORMAL}" ; echo "  $SUCCESS"
-      FOUND_GRML="$i"
-      break
-    fi
-    umount /cdrom
+grmlmount()
+{
+  if test -z $NFS ; then
+    DEVICES="/dev/hd?"
+    test -n "$FOUND_SCSI" -a -z "$NOCD" && DEVICES="/dev/scd? /dev/scd?? $DEVICES"
+    # New: Also try parallel port CD-ROMs
+    DEVICES="$DEVICES /dev/pcd?"
+    # New: also check HD partitions for a GRML/GRML image
+    # notice: use /dev/sd? for usb-sticks without partition(s)
+    test -n "$FOUND_SCSI" -a -z "$NOSCSI" && DEVICES="$DEVICES /dev/sd?[1-9] /dev/sd?[1-9][0-9] /dev/sd?"
+    DEVICES="$DEVICES /dev/hd?[1-9] /dev/hd?[1-9][0-9]"
+    case "$CMDLINE" in *fromhd=/dev/*) DEVICES="$fromhd"; ;; esac
+    for i in $DEVICES ; do
+      log_begin_msg "${CRE} ${GREEN}*${NORMAL} Looking for CD-ROM in:    ${MAGENTA}$i${NORMAL}"
+      if mountit $i /cdrom "-o ro" >/dev/null 2>&1 ; then
+         echo "  $SUCCESS"
+         if test -f /cdrom/$GRML_DIR/$GRML_NAME ; then
+            log_begin_msg "Accessing grml CD-ROM at: ${MAGENTA}$i${NORMAL}" ; echo "  $SUCCESS"
+            FOUND_GRML="$i"
+            break
+         fi
+        umount /cdrom
+      fi
+    done
   fi
-  done
+}
+
+# Rerun the grml-CDROM part 3 times at total
+if ! grmlmount ; then
+   log_warning_msg "grml CD-ROM not yet found, sleeping for 5 seconds and trying again then."
+   sleep 5
+   if ! grmlmount ; then
+      log_warning_msg "grml CD-ROM still not yet found, sleeping for 5 more seconds and trying once more again."
+      sleep 5
+   fi
 fi
 
 # Harddisk-installed script part version has been removed
@@ -874,6 +898,24 @@ MINLEFT=16000
 # 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
@@ -902,15 +944,13 @@ if test -n "$UNIONFS" && /bin/mount -t $UNIONFS_FILETYPE -o noatime${SECURE},dir
  fi
  # We now have unionfs, copy some data from the initial ramdisk first
  cp -a /etc/fstab /etc/auto.mnt /etc/filesystems /etc/mtab /UNIONFS/etc/
-
  # disable resolvconf on the terminalserver client
  if [ -n "$NFS" ] ; then
     rm /UNIONFS/etc/resolv.conf
     cp -a /etc/resolv.conf /UNIONFS/etc
     echo REPORT_ABSENT_SYMLINK=no >> /UNIONFS/etc/default/resolvconf
  fi
-
- for i in bin boot etc sbin var lib opt root usr; do # Move directories to unionfs
+ for i in bin boot etc sbin var opt root usr $EMUL $LIB64 lib ; do # Move directories to unionfs
   if test -d /$i; then
    /bin/mv /$i /$i.old && \
    # /GRML/lib/ld-linux.so.2 --library-path /GRML/lib /GRML/bin/ln -snf /UNIONFS/$i /$i && \