Changeset 232 for branches/2.05


Ignore:
Timestamp:
Dec 17, 2005, 10:33:56 AM (14 years ago)
Author:
bcornec
Message:

Some echo during init and code cleanup

Location:
branches/2.05/mindi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.05/mindi/mindi

    r224 r232  
    16721672    if [ "`DidMondoCallMe`" ] ; then
    16731673        if [ "$CDRECOVERY" != "yes" ] ; then
    1674                 if [ -e "$MONDO_TMP/start-nfs" ] ; then
    1675                     echo -en "Press <enter> to continue.\n"
    1676         elif [ ! "$MONDO_TMP" ] ; then
    1677             echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
    1678                 else
    1679                     echo -en "$BOOT_MEDIA_MESSAGE"
    1680                 fi
     1674            if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1675                echo -en "Press <enter> to continue.\n"
     1676            elif [ ! "$MONDO_TMP" ] ; then
     1677                echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
     1678            else
     1679                echo -en "$BOOT_MEDIA_MESSAGE"
     1680            fi
    16811681        fi
    16821682    fi
  • branches/2.05/mindi/rootfs/sbin/init

    r229 r232  
    649649        # Simulate a local CD
    650650        echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
     651        CD_MOUNTED_OK=yes
    651652    else
    652653            HandleCDROMorFloppies
     
    654655fi
    655656res=$?
    656 echo "Please wait."
    657 insert-all-my-modules > /dev/null &
    658 sleep 7
     657echo "Inserting modules ..."
     658insert-all-my-modules > $LOGFILE 2> $LOGFILE
     659echo "Installing additional tools ..."
    659660install-additional-tools
    660661SwapTheMountExecs
    661662ConfigureLoggingDaemons
    662 echo "Please wait."
    663 insert-all-my-modules &
    664 sleep 7
     663echo "Inserting modules again ..."
     664insert-all-my-modules > $LOGFILE 2> $LOGFILE
    665665if [ -e "/tmp/USE-DEVFS" ] ; then
    666666    umount /mnt/cdrom 2> /dev/null
     
    669669    RunDevfsd
    670670fi
     671echo "Starting potential Raid/LVMs ..."
    671672PauseForRaids
    672673StartRaids
  • branches/2.05/mindi/rootfs/sbin/post-init

    r30 r232  
    11#!/bin/sh
    22#
     3# $Id$
    34#
    4 # 07/14/04
    5 # - if interactive then not expert :)
    6 #
    7 # 06/12/04
    8 # - tell user to call mondorestore --mbr after nuking
    9 #
    10 # 08/02/03
    11 # - don't call multifunc cd, even if it is one
    12 #
    13 # 05/30/03
    14 # - added hooks for multi-function CD
    15 #
    16 # 05/04/03
    17 # - better handling of mondorestore softlinks
    18 # - no more 'mondo-restore' --- it's 'mondorestore'
    19 #
    20 # 03/26/03
    21 # - report if mount-me, unmount-me, mondorestore missing
    22 # - call mondorestore instead of mondo-restore
    23 #
    24 # 07/15/02
    25 # - copy mountlist.txt to logfile at start
    26 #
    27 # 07/11/02
    28 # - exit w/o calling mondorestore, if non-mondo CD/floppy
    29 #
    30 # 06/28/02
    31 # - RESTORE == nuke_mode
    32 #
    33 # 06/24/02
    34 # - disabled isonuke
    35 #
    36 # 06/13/02
    37 # - added isonuke
    38 #
    39 # 02/03/02
    40 # - softlink mondo-restore -> mondorestore if mondorestore exists but m-r not
    41 #
    42 # 12/10/01
    43 # - removed the 'clear' from the start of the script
    44 #
    45 # 12/09/01
    46 # - broke up spaghetti code; made lots of subroutines
    47 # - moved some subroutines to /sbin/init, where they belong
    485#------------------------------------------------------------
    496
     
    10562nuke=`cat /proc/cmdline | grep "nuke"`
    10663if [ "$nuke" = "" ] ; then
    107     nuke=`cat /proc/cmdline | grep "RESTORE "`
     64    nuke=`cat /proc/cmdline | grep -i "RESTORE "`
    10865fi
    10966expert=`cat /proc/cmdline | grep "expert"`
     
    148105done
    149106
    150 #if [ "$iso" ] && [ "$nuke" ] ; then
    151 #    LogIt "------------------ISONUKE MODE-----------------" 1
    152 #    mondorestore --isonuke
    153 #el
    154 #if [ "$iso" ] ; then
    155 #    LogIt "--------------------ISO MODE-------------------" 1
    156 #    mondorestore --iso
    157 #el
    158107if [ "$compare" ] ; then
    159108    LogIt "------------------COMPARE MODE-----------------" 1
Note: See TracChangeset for help on using the changeset viewer.