Changeset 3172


Ignore:
Timestamp:
Jul 28, 2013, 7:38:05 PM (6 years ago)
Author:
bruno
Message:
  • First modifications to add support for systemd-udev
Location:
branches/3.0/mindi
Files:
3 edited

Legend:

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

    r2995 r3172  
    2222/usr/bin/udevd
    2323
     24# Systemd
     25/usr/lib/systemd/systemd-udevd
     26
    2427/sbin/udevstart.static
    2528/sbin/udev_volume_id
  • branches/3.0/mindi/mindi

    r3166 r3172  
    255255    fi
    256256
    257     # TODO: Why that
    258     mkdir -p $bigdir/etc
    259257    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "WARNING: AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
    260258    if [ "`echo $mappath | grep -F ".gz"`" ] ; then
     
    629627    if [ _"$MONDO_SHARE" != _"" ]; then
    630628        mkdir -p $bigdir/tmp
    631         mkdir -p $bigdir/sbin
    632         mkdir -p $bigdir/bin
     629        mkdir -p $bigdir/usr/bin
    633630        if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
    634631            LogAll "\nINFO: Incorporating post-nuke tarball"
     
    909906        echo "$d"
    910907        d2=`readlink $d`
    911         c2=`echo $d2 |  | cut -c1`
     908        c2=`echo $d2 | cut -c1`
    912909        if [ "$c2" != "/" ]; then
    913910            if [ "$c2" != "." ]; then
     
    20752072    includefile=$MINDI_TMP/$$.includefile.txt
    20762073
     2074    # Check whether /lib64 or /lib is a link and if so explicitly create one in rootfs
     2075    if [ -h "/lib64" ]; then
     2076        mkdir -p lib || LogIt "ERROR: Unable to create lib in $mountpoint."
     2077        if [ ! -h lib64 ]; then
     2078            ln -s lib lib64 || LogIt "ERROR: /lib64 is a symbolic link, but I couldn't create it in $mountpoint."
     2079        fi
     2080    fi
     2081    if [ -h "/lib" ]; then
     2082        mkdir -p usr/lib || LogIt "ERROR: Unable to create usr/lib in $mountpoint."
     2083        mv lib/* usr/lib 2> /dev/null
     2084        if [ -d "lib" ]; then
     2085            rmdir lib
     2086        fi
     2087    fi
     2088    # Check whether /sbin and /bin are a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
     2089    if [ -h "/sbin" ]; then
     2090        mkdir -p usr/sbin || LogIt "ERROR: Unable to create usr/sbin in $mountpoint."
     2091        mv sbin/* usr/sbin 2> /dev/null
     2092        if [ -d "sbin" ]; then
     2093            rmdir sbin
     2094        fi
     2095    fi
     2096    if [ -h "/bin" ]; then
     2097        mkdir -p usr/bin || LogIt "ERROR: Unable to create usr/bin in $mountpoint."
     2098        mv bin/* usr/bin 2> /dev/null
     2099        if [ -d "bin" ]; then
     2100            rmdir bin
     2101        fi
     2102    fi
     2103
    20772104    lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal`
    20782105    if [ -e "$DEPLIST_FILE" ]; then
     
    24952522    cd "$mountpoint"
    24962523
    2497     # Check whether /lib64 or /lib is a link and if so explicitly create one in rootfs
    2498     if [ -h "/lib64" ]; then
    2499         mkdir -p lib || LogIt "ERROR: Unable to create lib in $mountpoint."
    2500         ln -s lib lib64 || LogIt "ERROR: /lib64 is a symbolic link, but I couldn't create it in $mountpoint."
    2501     fi
    2502     if [ -h "/lib" ]; then
    2503         mkdir -p usr/lib || LogIt "ERROR: Unable to create usr/lib in $mountpoint."
    2504         mv lib/* usr/lib
    2505         rmdir lib
    2506     fi
    2507     # Check whether /sbin and /bin are a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
    2508     if [ -h "/sbin" ]; then
    2509         mkdir -p usr/sbin || LogIt "ERROR: Unable to create usr/sbin in $mountpoint."
    2510         mv sbin/* usr/sbin
    2511         rmdir sbin
    2512     fi
    2513     if [ -h "/bin" ]; then
    2514         mkdir -p usr/bin || LogIt "ERROR: Unable to create usr/bin in $mountpoint."
    2515         mv bin/* usr/bin
    2516         rmdir bin
    2517     fi
    2518 
     2524   
    25192525    # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
    25202526    for f in $tgz_dir_fname/*; do
     
    25762582    # recent bash says that -d is true for a link to a dir !
    25772583    for f in `sort -u $MINDI_TMP/minimal.lis`; do
    2578         if [ -e $f -a ! -d $f ] || [ -h $f ]; then
     2584        if [ -e $f -a ! -d $f ] || [ -h $f -a ! -d $f ]; then
    25792585            finallist="$finallist $f"
    25802586        fi
     
    26112617            tar cf - -C / /lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $MINDI_TMP/$$.log
    26122618        fi
    2613         if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ]; then
     2619        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
    26142620            lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf`
    26152621            lis=""
  • branches/3.0/mindi/rootfs/etc/init.d/rcS

    r3154 r3172  
    400400        elif [ -x /usr/bin/udevd ]; then
    401401            /usr/bin/udevd --daemon &
     402        elif [ -x /usr/lib/systemd/systemd-udevd ]; then
     403            /usr/lib/systemd/systemd-udevd -daemon &
    402404        fi
    403405        echo "Waiting for udev to start..."
Note: See TracChangeset for help on using the changeset viewer.