Ignore:
Timestamp:
Oct 25, 2006, 1:49:52 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r862:888 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/rootfs/sbin/init

    r764 r903  
    328328    fi
    329329
    330 }
    331 
    332 
    333 SwapTheMountExecs() {
    334     if [ -e "/bin/mount.libc5" ] ; then
    335         LogIt "Swapping busybox's mount with libc5 mount"
    336         mv /bin/mount /bin/mount.bb
    337         mv /bin/mount.libc5 /bin/mount
    338         sync
    339     fi
    340330}
    341331
     
    468458    ExtractDataDisksAndLoadModules
    469459elif [ "`grep -i pxe /proc/cmdline`" ]; then
    470     /sbin/start-nfs
     460    # We need to get here exported variables from start-nfs
     461    . /sbin/start-nfs
    471462
    472463    # Simulate a local CD
     
    477468    HandleCDROMorFloppies
    478469    ExtractDataDisksAndLoadModules
    479     /sbin/start-nfs
     470    # We need to get here exported variables from start-nfs
     471    . /sbin/start-nfs
    480472fi
    481473res=$?
    482 SwapTheMountExecs
    483474ConfigureLoggingDaemons
    484475if [ -e "/tmp/USE-DEVFS" ] ; then
Note: See TracChangeset for help on using the changeset viewer.