Changeset 866


Ignore:
Timestamp:
Oct 2, 2006, 7:45:36 PM (13 years ago)
Author:
bruno
Message:
  • tabs inserted for scripts
  • MyInsmod? should be less verbose
  • x86_64 directories taken in account in install-additional-tools
  • one useless function removed from init
Location:
branches/stable/mindi/rootfs/sbin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/rootfs/sbin/MyInsmod

    r30 r866  
    44for i in insmod.static insmod busybox ; do
    55    if [ "$i" = "busybox" ] ; then
    6         $i insmod $*
     6        $i insmod $* 2> /dev/null
    77    else
    8         $i $*
     8        $i $* 2> /dev/null
    99    fi
    1010    res=$?
  • branches/stable/mindi/rootfs/sbin/init

    r859 r866  
    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
     
    480470fi
    481471res=$?
    482 SwapTheMountExecs
    483472ConfigureLoggingDaemons
    484473if [ -e "/tmp/USE-DEVFS" ] ; then
  • branches/stable/mindi/rootfs/sbin/install-additional-tools

    r229 r866  
    11#!/bin/sh
    22#
    3 # 05/04/2003
    4 # - added missing 'res=0' to line 34
    5 # - replaced /mnt/groovy-stuff with $GROOVY
     3# $Id$
    64#
    7 # 07/17/2002
    8 # - delete dest files before moving src files there
    9 #
    10 # 07/11/2002
    11 # - move softlinks from /mnt/groovy-stuff to / afterward
    12 #
    13 # 03/21/2002
    14 # - added "PLEASE WAIT" when untarring/softlinking
    15 #
    16 # 02/18/2002
    175########################################################################
    186
     
    3826else
    3927    while [ "$diskno" -lt "20" ] ; do
    40     LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
    41     untar-and-softlink $diskno $mountdir /
    42     res=$(($res+$?))
    43     [ -e "/LAST-DISK" ] && diskno=999
    44     diskno=$(($diskno+1))
    45     [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
     28        LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
     29        untar-and-softlink $diskno $mountdir /
     30        res=$(($res+$?))
     31        [ -e "/LAST-DISK" ] && diskno=999
     32        diskno=$(($diskno+1))
     33        [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
    4634    done
    4735fi
     
    5947    sliceno=0
    6048    while [ "$sliceno" -le "999" ] ; do
    61     slicefile=$stub.
     49        slicefile=$stub.
    6250        [ "$sliceno" -lt "100" ] && slicefile="$slicefile"0
    63     [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
    64     slicefile="$slicefile"$sliceno
    65     [ ! -e "$slicefile" ] && break
     51        [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
     52        slicefile="$slicefile"$sliceno
     53        [ ! -e "$slicefile" ] && break
    6654#   echo "biggienumber=$biggienumber slicefile=$slicefile" >> /tmp/mondo-restore.log
    67     cat $slicefile >> /tmp/out.dat
    68     rm -f $slicefile
    69     sliceno=$(($sliceno+1))
    70     done
     55        cat $slicefile >> /tmp/out.dat
     56        rm -f $slicefile
     57        sliceno=$(($sliceno+1))
     58        done
    7159#    echo "$sliceno slices"
    7260
     
    9482for path in `find | grep -v /etc/fstab` ; do
    9583    if [ -d "$path" ] ; then
    96     mkdir /$path 2> /dev/null
     84        mkdir /$path 2> /dev/null
    9785    else
    9886# Patch from Andrew Bulhak
     
    10290        fi
    10391# end patch
    104     mv -f $path /$path
     92        mv -f $path /$path
    10593    fi
    10694done
    10795cp -f etc/fstab /tmp/fstab
     96tar cf - sbin bin usr/bin usr/sbin lib usr/lib lib64 usr/lib64 | (cd / ; tar xf -)
     97
    10898cd /
    109 
    110 
    111 # Was disabled in mid-March 2002 (?). Dunno why. Re-enabled July 11th, 2002.
    112 # BERLIOS: This doesn't work for symlink with new busybox in PXE mode
    113 #for path in /sbin /bin /usr/bin /usr/sbin /lib /usr/lib /lib/* /usr/lib/* ; do
    114     #[ ! -e "$path" ] && mkdir -p "$path"
    115     #for i in `ls $mountdir/$path 2> /dev/null` ; do
    116     #rm -f $path/$i 2> /dev/null
    117         #mv $mountdir/$path/$i $path 2> /dev/null
    118     #done   
    119 #done
    120 
    121 cd $mountdir
    122 tar cf - sbin bin usr/bin usr/sbin lib usr/lib | (cd / ; tar xf -)
    123 cd /
    124 
    12599
    126100for i in modprobe lsmod depmod rmmod ; do
  • branches/stable/mindi/rootfs/sbin/untar-and-softlink

    r30 r866  
    11#!/bin/sh
     2#
     3# $Id$
     4#
     5########################################################################
     6
    27
    38Die() {
     
    2025else
    2126    while [ ! -f "$tarball" ] ; do
    22     echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
    23     read line
    24     mount /dev/fd0 -t ext2 -o ro $mountpoint
    25     [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
    26     echo -en "Working..."
     27        echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
     28        read line
     29        mount /dev/fd0 -t ext2 -o ro $mountpoint
     30        [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
     31        echo -en "Working..."
    2732    done
    2833fi
Note: See TracChangeset for help on using the changeset viewer.