Changeset 1780


Ignore:
Timestamp:
Nov 9, 2007, 8:34:53 PM (12 years ago)
Author:
bruno
Message:

In udev case do not insert modules at all (udev should do it alone)
May avoid the issue with rhel4.5 kernel ? To be tested

Location:
branches/2.2.5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/rootfs/sbin/init

    r1761 r1780  
    498498    echo "Installing additional tools ..."
    499499    install-additional-tools
    500     echo "Inserting modules ..."
    501     # Keep the kernel silent again
    502     PKLVL=`cut -f1 /proc/sys/kernel/printk`
    503     echo 0 > /proc/sys/kernel/printk
    504     insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
    505     echo $PKLVL > /proc/sys/kernel/printk
     500    if [ ! -e "/tmp/USE-UDEV" ] ; then
     501        echo "Inserting modules ..."
     502        # Keep the kernel silent again
     503        PKLVL=`cut -f1 /proc/sys/kernel/printk`
     504        echo 0 > /proc/sys/kernel/printk
     505        insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
     506        echo $PKLVL > /proc/sys/kernel/printk
     507    fi
    506508}
    507509
     
    545547LaunchTerminals
    546548
    547 # Keeping kernel silent  for module insertion
    548 PKLVL=`cut -f1 /proc/sys/kernel/printk`
    549 echo 0 > /proc/sys/kernel/printk
    550 InsertEssentialModules
    551 echo $PKLVL > /proc/sys/kernel/printk
     549if [ ! -e "/tmp/USE-UDEV" ] ; then
     550    # Keeping kernel silent  for module insertion
     551    PKLVL=`cut -f1 /proc/sys/kernel/printk`
     552    echo 0 > /proc/sys/kernel/printk
     553    InsertEssentialModules
     554    echo $PKLVL > /proc/sys/kernel/printk
     555fi
    552556
    553557EnableCcissIfAppropriate
  • branches/2.2.5/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

    r1766 r1780  
    3333        elif [ "$format" = "swap" ] ; then
    3434            if [ "$opttun" = "-U" ]; then
    35                 LogIt "Creating uuid $label on swap partition $label"
     35                LogIt "Creating uuid $label on swap partition $mountpt"
    3636                echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
    3737            else
Note: See TracChangeset for help on using the changeset viewer.