Changeset 2594


Ignore:
Timestamp:
Mar 17, 2010, 3:55:16 AM (10 years ago)
Author:
bruno
Message:

r3735@localhost: bruno | 2010-03-14 19:50:12 +0100

  • Avoids remaining error messages at restore time in new mindi
  • Adapt group file to include latest one needed by udev
  • Explicitely add a dep on libnss_files.so.2 needed for uid resolution at restore time
Location:
branches/2.2.10/mindi
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/deplist.d/minimal.conf

    r2592 r2594  
    6868/etc/termcap
    6969/etc/bashrc
     70# For id resolution
     71/etc/nsswitch.conf
     72/lib/libnss_files.so.2
    7073
    7174# Compression
  • branches/2.2.10/mindi/rootfs/etc/group

    r1733 r2594  
    2424fuse::106:
    2525nogroup::65534:
     26cdwriter:x:80:saned
     27video:x:82:
     28dialout:x:83:
  • branches/2.2.10/mindi/rootfs/sbin/ide-opt

    r2488 r2594  
    11#!/bin/sh
    22
    3 #echo "Optimize access to IDE drives? (Type 'YES' or just press <enter>)"
    4 #echo "Warning - this can result in filesystem corruption."
    5 #read response
    6 #if [ "$response" = "YES" ] || [ "$response" = "yes" ] ; then
    7     > /tmp/oid.log
    8     echo -e -n "Optimizing IDE drive access..."
     3> /tmp/oid.log
     4echo -e -n "Optimizing IDE drive access..."
    95
    10     cdrom_lives_here=`cat $MINDI_CACHE/CDROM-LIVES-HERE`
    11     if [ "$?" -ne "0" ] ; then
     6cdrom_lives_here=`cat $MINDI_CACHE/CDROM-LIVES-HERE 2> /dev/null`
     7if [ "$?" -ne "0" ] ; then
    128    echo "I don't know where the CDROM lives. Optimization cancelled."
    139    exit 1
    14     fi
     10fi
    1511
    16     for dev in hda hdb hdc hdd hde hdf hdg hdh ; do
     12for dev in hda hdb hdc hdd hde hdf hdg hdh ; do
    1713    echo " " > /tmp/oid1.log
    1814    if [ "$cdrom_lives_here" = "$dev" ] ; then
    19 # -c 1
    20         hdparm -u 1 -d 1 /dev/$dev > /tmp/oid1.log 2> /dev/null
     15        hdparm -u 1 -d 1 /dev/$dev > /tmp/oid1.log 2> /dev/null
    2116    else
    22 # -X34 -X66
    23         hdparm -u1 -d1 -c1 -m8 -W1 /dev/$dev > /tmp/oid1.log 2> /dev/null
     17        hdparm -u1 -d1 -c1 -m8 -W1 /dev/$dev > /tmp/oid1.log 2> /dev/null
    2418    fi
    2519    cat /tmp/oid1.log >> /tmp/oid.log
    26     done
    27     echo "Done. See /tmp/oid.log for logs."
    28 #else
    29 #    echo "Fair enough. I shan't optimize IDE access."
    30 #fi
     20done
     21echo "Done. See /tmp/oid.log for logs."
    3122
    3223echo "'ide-opt' has tried to optimize IDE access. If you saw lots of warnings,"
  • branches/2.2.10/mindi/rootfs/sbin/init

    r2592 r2594  
    9191    openvt -l /bin/sh /sbin/wait-for-petris
    9292    openvt -l /usr/bin/tail -f $LOGFILE
    93     # May avoid shell error messages
    94     # chmod 666 /dev/tty* /dev/console
    9593    # By default first serial line is configured as tty
    9694    # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)
     
    313311        /sbin/udevadm settle --timeout=10
    314312    fi
    315     # It seems we need to have more static devs on some distro were
    316     # udev as some other requirements to be covered later on.
     313    # It seems we need to have more static devs on some distro where
     314    # udev has some other requirements to be covered later on.
    317315    # So in the mean time:
    318316    for d in `ls /dev.static`; do
     
    321319        fi
    322320    done
    323     rm -rf /dev.static
    324321    echo $PKLVL > /proc/sys/kernel/printk
    325322}
     
    680677    if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
    681678        if [ -x /sbin/udevadm ]; then
    682             /sbin/udevadm trigger --retry-failed
     679            udaver=`/sbin/udevadm --version`
     680            if [ $udaver -lt 146 ]; then
     681                /sbin/udevadm trigger --retry-failed
     682            else
     683                # After version 146 option --retry-failed doesn't exist anymore
     684                /sbin/udevadm trigger
     685            fi
    683686        fi
    684687    fi
  • branches/2.2.10/mindi/rootfs/sbin/install-additional-tools

    r2592 r2594  
    6060    cd $old_pwd
    6161    echo -e -n "\r"
    62     [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && umount $mountpoint
     62    [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && [ -e "$tarball" ] && umount $mountpoint
    6363    sleep 1
    6464fi
Note: See TracChangeset for help on using the changeset viewer.