X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=rewrite%2Flinuxrc;h=8b42b785fc842fe59a14b6dc6fe69fb95e6671e1;hb=3238309ccd306e404a153e60b61f8ac9cf0b9eb0;hp=48b2aa9d0d68db5e9105e588974cec99d2484c28;hpb=c2973166d09f796d31916b37790739730071a8d6;p=grml-live-grml.git diff --git a/rewrite/linuxrc b/rewrite/linuxrc index 48b2aa9..8b42b78 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 , (c) Michael Prokop -# Latest change: Tue Mar 27 23:05:51 CEST 2007 +# Latest change: Mon Apr 09 12:47:28 CEST 2007 ####################################################################################### # 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 @@ -326,7 +339,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) @@ -531,8 +544,9 @@ if [ -n "$NFS" ]; then done } # modules.alias and modules.dep are in place so USE IT :)! - modLoad "$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x; done |/static/xargs)" - + find /sys/devices/ -name modalias |/static/xargs -r /static/grep -h pci: |while read i; do + modLoad "$i" + done # loading additional modules modLoad sunrpc lockd af_packet nfs @@ -570,31 +584,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 @@ -901,15 +925,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 && \