Changeset 3172 in MondoRescue
- Timestamp:
- Jul 28, 2013, 7:38:05 PM (11 years ago)
- Location:
- branches/3.0/mindi
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mindi/deplist.d/udev.conf
r2995 r3172 22 22 /usr/bin/udevd 23 23 24 # Systemd 25 /usr/lib/systemd/systemd-udevd 26 24 27 /sbin/udevstart.static 25 28 /sbin/udev_volume_id -
branches/3.0/mindi/mindi
r3166 r3172 255 255 fi 256 256 257 # TODO: Why that258 mkdir -p $bigdir/etc259 257 tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "WARNING: AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log 260 258 if [ "`echo $mappath | grep -F ".gz"`" ] ; then … … 629 627 if [ _"$MONDO_SHARE" != _"" ]; then 630 628 mkdir -p $bigdir/tmp 631 mkdir -p $bigdir/sbin 632 mkdir -p $bigdir/bin 629 mkdir -p $bigdir/usr/bin 633 630 if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then 634 631 LogAll "\nINFO: Incorporating post-nuke tarball" … … 909 906 echo "$d" 910 907 d2=`readlink $d` 911 c2=`echo $d2 | |cut -c1`908 c2=`echo $d2 | cut -c1` 912 909 if [ "$c2" != "/" ]; then 913 910 if [ "$c2" != "." ]; then … … 2075 2072 includefile=$MINDI_TMP/$$.includefile.txt 2076 2073 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 2077 2104 lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal` 2078 2105 if [ -e "$DEPLIST_FILE" ]; then … … 2495 2522 cd "$mountpoint" 2496 2523 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 2519 2525 # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files 2520 2526 for f in $tgz_dir_fname/*; do … … 2576 2582 # recent bash says that -d is true for a link to a dir ! 2577 2583 for f in `sort -u $MINDI_TMP/minimal.lis`; do 2578 if [ -e $f -a ! -d $f ] || [ -h $f ]; then2584 if [ -e $f -a ! -d $f ] || [ -h $f -a ! -d $f ]; then 2579 2585 finallist="$finallist $f" 2580 2586 fi … … 2611 2617 tar cf - -C / /lib/udev 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in /lib/udev analysis" $MINDI_TMP/$$.log 2612 2618 fi 2613 if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] ; then2619 if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then 2614 2620 lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf` 2615 2621 lis="" -
branches/3.0/mindi/rootfs/etc/init.d/rcS
r3154 r3172 400 400 elif [ -x /usr/bin/udevd ]; then 401 401 /usr/bin/udevd --daemon & 402 elif [ -x /usr/lib/systemd/systemd-udevd ]; then 403 /usr/lib/systemd/systemd-udevd -daemon & 402 404 fi 403 405 echo "Waiting for udev to start..."
Note:
See TracChangeset
for help on using the changeset viewer.