linuxrc: just added a comment regarding booting via pcmcia (which is not available...

[grml-live-grml.git] / rewrite / linuxrc

diff --git a/rewrite/linuxrc b/rewrite/linuxrc
index bede0d8..ba11fe5 100644 (file)
--- 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: Sat Apr 14 12:41:44 CEST 2007 [mika]
+# Latest change: Thu May 10 11:29:02 CEST 2007 [mika]
 #######################################################################################
 
 # hardcoded configurable options
@@ -134,7 +134,7 @@ if checkbootparam "splash" ; then
   echo "${RED} | |_| |  _ <| |  | | |___ "
   echo "${RED}  \____|_| \_\_|  |_|_____|"
   echo ""
-  echo "${WHITE}grml.org - Linux for users of texttools and sysadmins."
+  echo "${WHITE}grml.org - Linux for sysadmins and texttool users."
   echo "${NORMAL}"
   exec >/dev/null </dev/null 2>&1
 fi
@@ -187,7 +187,7 @@ ${RED} | |  _| |_) | |\/| | |
 ${RED} | |_| |  _ <| |  | | |___
 ${RED}  \____|_| \_\_|  |_|_____|
 
-${WHITE}grml.org - Linux for users of texttools and sysadmins.
+${WHITE}grml.org - Linux for sysadmins and texttool users.
 
 ${NORMAL}"
 fi
@@ -459,7 +459,7 @@ fi
 # Unfortunately, hotpluggable devices tend to need some time in order to register
 if test -n "$FOUNDUSB" -o -n "$FOUNDFIREWIRE"; then
   log_begin_msg "Scanning for USB/Firewire devices."
-  sleep 4
+  sleep 6
   if test -n "$USB"; then
     sleep 10
   fi
@@ -473,7 +473,7 @@ if checkbootparam scandelay ; then
   sleep $DELAY && echo "  $SUCCESS"
 fi
 
-# boot via pcmcia
+# boot via pcmcia - not yet supported!
 if checkbootparam bootpcmcia ; then
   log_begin_msg "Bootoption bootpcmcia found. Trying to load ${WHITE}PCMCIA${NORMAL} modules..."
   if $INSMOD /modules/div/pcmcia_core.ko 1>/dev/null ; then
@@ -597,6 +597,12 @@ grmlmount()
     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
+    # make sure we dont' search for the booting device if cdrom=... is present
+    case "$CMDLINE" in *cdrom=/dev/*)
+            CDROMDEV="$(echo $CMDLINE | tr ' ' '\n' | sed -n '/cdrom=/s/.*=//p' | tail -1)"
+            DEVICES="$(echo $CDROMDEV | awk -F/ '{ print $1 "/" $2 "/" $3 }')"
+            ;;
+    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
@@ -606,19 +612,23 @@ grmlmount()
             FOUND_GRML="$i"
             break
          fi
-        umount /cdrom
+      umount /cdrom
       fi
     done
   fi
 }
 
 # 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
+grmlmount
+if [ -z "$FOUND_GRML" ] ; then
+   echo
+   log_warn_msg "grml CD-ROM not yet found, sleeping for 5 seconds and trying again then."
+   sleep 5 && echo " $SUCCESS"
+   grmlmount
+   if [ -z "$FOUND_GRML" ] ; then
+      echo
+      log_warn_msg "grml CD-ROM still not yet found, sleeping for 5 more seconds and trying once more again."
+      sleep 5 && echo " $SUCCESS"
    fi
 fi
 
@@ -626,7 +636,7 @@ fi
 # (GRML can be booted directly from HD now).
 mount_grml()
 {
-  if test -n "$FOUND_GRML" -a -f $1/$GRML_DIR/$GRML_NAME; then
+  if test -n "$FOUND_GRML" -a -f $1/$GRML_DIR/$GRML_NAME ; then
     # echo "6" > /proc/sys/kernel/printk
     mount -t squashfs $1/$GRML_DIR/$GRML_NAME /GRML -o loop,ro$SECURE || FOUND_GRML=""
   fi
@@ -662,7 +672,11 @@ boot_from()
   # load filesystems
   /GRML/sbin/modprobe fuse
   /GRML/sbin/modprobe ntfs
-  $INSMOD /modules/div/ntfs.ko 1>/dev/null
+  if [ -r /modules/div/ntfs.ko ] ; then
+     grep -q ntfs /proc/modules || $INSMOD /modules/div/ntfs.ko 1>/dev/null
+  else
+     log_failure_msg "No NTFS kernel module found." ; echo "$FAILED"
+  fi
 
   if [ -n "$ISO_PATH" ]; then
      LOOP_SOURCE="$TARGET.loop"
@@ -682,7 +696,7 @@ boot_from()
      return 1
   fi
 
-  if [ -f $TARGET/$GRML_DIR/$GRML_NAME ]; then
+  if [ -f "$TARGET/$GRML_DIR/$GRML_NAME" ]; then
     log_begin_msg "Accessing grml CD-ROM at ${MAGENTA}$TARGET_DEV${NORMAL}." ; echo "  $SUCCESS"
   else
     log_failure_msg "Accessing grml CD-ROM failed. Could not find $GRML_DIR/$GRML_NAME on ${MAGENTA}$TARGET_DEV${RED}.${NORMAL}" ; echo "$FAILED"