Changeset 2964


Ignore:
Timestamp:
Mar 14, 2012, 2:42:05 AM (6 years ago)
Author:
bruno
Message:

r4563@localhost: bruno | 2012-03-13 00:29:34 +0100

  • Fix partly #589 by improving Arch Linux support (MC)
  • mv udev.files to udev.conf under deplist.d to be more coherent
Location:
branches/3.0/mindi
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/deplist.d/addon.conf

    r2409 r2964  
    44#
    55/usr/games/petris
     6/usr/bin/nano
  • branches/3.0/mindi/deplist.d/base.conf

    r2893 r2964  
    5252/usr/bin/lzma
    5353
    54 /bin/bash
    5554/bin/date
    5655/sbin/ctrlaltdel
     
    6059/usr/bin/xargs
    6160/usr/bin/less
    62 # On ArchLinux
    63 /bin/less
     61
    6462/sbin/ldconfig
    6563/usr/bin/tee
  • branches/3.0/mindi/deplist.d/minimal.conf

    r2951 r2964  
    77
    88# Base Unix commands
     9/bin/bash
    910/bin/mt
    1011/bin/awk
     
    2021/bin/loadkeys
    2122/sbin/pidof
     23/etc/init.d/functions
    2224# On ArchLinux
    2325/bin/pidof
    24 /etc/init.d/functions
    25 # On ArchLinux
    2626/etc/rc.d/functions
     27/usr/bin/grep
    2728
    2829# Compression
     
    6869/sbin/mount.ntfs-3g
    6970
    70 # For udev/devfs
     71# For devfs
    7172/sbin/MAKEDEV
    72 /etc/init.d/functions
    7373/sbin/devfsd
    74 /etc/udev
    75 /etc/hotplug.d
    76 /sbin/udev.static
    77 /sbin/udevsend
    78 /sbin/udevd
    7974/sbin/hwup
    80 /sbin/path_id
    81 /sbin/scsi_tur
    82 # On ArchLinux
    83 /sbin/udevadm
    84 /sbin/udevstart.static
    85 /sbin/udev_volume_id
    86 /sbin/start_udev
    87 /sbin/udev
    88 /sbin/udevstart
    89 /sbin/create_static_dev_nodes
    90 /etc/init.d/functions
     75
    9176# On SLES 10
    9277/sbin/path_id
     
    9580/sbin/hwup
    9681
     82/sbin/usb_id
     83/sbin/vol_id
     84/sbin/pam_console_apply
     85
    9786# Modules
    9887/sbin/insmod
    9988/sbin/lsmod
     89/sbin/kmod
    10090# On ArchLinux
    101 /bin/lsmod
     91/usr/bin/lsmod
     92/usr/bin/insmod
     93/usr/bin/kmod
    10294/sbin/modprobe
    10395/etc/modprobe.d
  • branches/3.0/mindi/deplist.d/net.conf

    r2952 r2964  
    1515/var/lib/dhclient
    1616# On ArchLinnux
    17 /sbin/dhcpcd
    18 /var/lib/dhcpd
    19 # On ArchLinnux
    20 /sbin/dhcpcd
     17/usr/sbin/dhcpcd
    2118/var/lib/dhcpd
    2219
  • branches/3.0/mindi/deplist.d/udev.conf

    r2899 r2964  
    88#
    99/sbin/udevd
    10 /sbin/modprobe
    11 /sbin/insmod
    1210/sbin/udevstart
    1311/sbin/udevcontrol
    1412/sbin/udevtrigger
    1513/sbin/udevsettle
    16 /sbin/pam_console_apply
    17 /bin/bash
     14/sbin/udevadm
     15/sbin/udev.static
     16/sbin/udevsend
     17/etc/udev
     18/etc/hotplug.d
     19
     20# On ArchLinux
     21/usr/bin/udevadm
     22/usr/bin/udevd
     23
     24/sbin/udevstart.static
     25/sbin/udev_volume_id
     26/sbin/start_udev
     27/sbin/udev
    1828/sbin/create_static_dev_nodes
    19 /sbin/start_udev
    20 /sbin/udevadm
    21 /sbin/usb_id
    22 /sbin/vol_id
     29
  • branches/3.0/mindi/install.sh

    r2882 r2964  
    7676install -m 755 analyze-my-lvm $locallib/mindi
    7777install -m 644 msg-txt dev.tgz $locallib/mindi
    78 install -m 644 deplist.txt udev.files mindi.conf $conf
     78install -m 644 deplist.txt mindi.conf $conf
    7979for f in deplist.d/*.conf; do
    8080    install -m 644 $f $conf/deplist.d
  • branches/3.0/mindi/mindi

    r2963 r2964  
    25452545        fi
    25462546        if [ -x /sbin/udevd ]; then
    2547             lis2=`grep -Ev '^#' $MINDI_CONF/udev.files`
     2547            lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf`
    25482548            lis=""
    25492549            # Get only the files which exist in that list
     
    26562656    done
    26572657
    2658     # Also copy modules.dep in case of udev so that normal modprobe works
    2659     tar cf - -C / /$needed_modules_path/modules.dep 2>> $MINDI_TMP/$$.log | (cd "$mountpoint" ; tar xf -) || LogIt "ERROR: Unable to copy modules.dep to $mountpoint" $MINDI_TMP/$$.log
     2658    # Also copy modules.* in case of udev so that normal modprobe works
     2659    tar cf - -C / /$needed_modules_path/modules.* 2>> $MINDI_TMP/$$.log | (cd "$mountpoint" ; tar xf -) || LogIt "ERROR: Unable to copy modules.* to $mountpoint" $MINDI_TMP/$$.log
    26602660
    26612661    # Copy FW in case some drivers needs it
  • branches/3.0/mindi/rootfs/etc/init.d/rcS

    r2955 r2964  
    150150
    151151    # Here we can add the USB storage module, it's working even with OBDR !
    152     modprobe -q usb-storage
     152    modprobe -q usb-storage 2> /dev/null
    153153    # Tape takes some time to appear
    154154    sleep 10
     
    198198    fi
    199199    echo "Activating a potential USB Storage device"
    200     modprobe -q usb-storage
     200    modprobe -q usb-storage 2> /dev/null
    201201    for i in 1 2 3 4 5 6 7 8 9 10 ; do
    202202        sleep 1
     
    390390    return
    391391fi
    392 modprobe -q uhcd_hci
    393 modprobe -q usbhid
     392modprobe -q uhcd_hci 2> /dev/null
     393modprobe -q usbhid 2> /dev/null
    394394}
    395395
     
    403403        LogIt "Scanning LVM's..." 1
    404404        if which lvm ; then
    405             modprobe -q dm-mod
    406             modprobe -q dm_mod
     405            modprobe -q dm-mod 2> /dev/null
     406            modprobe -q dm_mod 2> /dev/null
    407407            lvm vgscan --mknodes
    408408        else
     
    687687        if [ $? -eq 0 ]; then
    688688            echo "Forcing first $j..."
    689             modprobe -q $j
     689            modprobe -q $j 2> /dev/null
    690690        fi
    691691    done
     
    703703        fi
    704704        echo "Probing $j..."
    705         modprobe -q $j
     705        modprobe -q $j 2> /dev/null
    706706    done
    707707}
     
    742742MINDI_REV=PBREV
    743743trap CaughtSoftReset SIGTERM
    744 trap GetShell SIGINTR
     744trap GetShell SIGINT
    745745LOGFILE=/var/log/mondorestore.log
    746746PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
Note: See TracChangeset for help on using the changeset viewer.