Changeset 461 in MondoRescue for trunk/mindi

Timestamp:

Apr 4, 2006, 9:40:52 AM (18 years ago)

Author:

bcornec

Message:

merge -r447:460 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

• deplist.txt (modified) (2 diffs)
• distributions/conf (copied) (copied from branches/stable/mindi/distributions/conf )
• distributions/rpm/mindi.spec (modified) (2 diffs)
• install.sh (modified) (3 diffs)
• mindi (modified) (11 diffs)

trunk/mindi/deplist.txt

@@ -1 @@
-# Mindi-Linux's dependency list                                      07/10/2004
+# Mindi-Linux's dependency list
 #
 # NB:
@@ -5 +5 @@
 # 2. If you put 'libncurses' (w/o quotation marks) on an uncommented line then
 #    Mindi will find /lib/libncurses* and include all matching files.
-# 3. You may give an absolute path if you think Mindi will have trouble finding
-#    the file on its own.
+# 3. You have to give an absolute path
 # 4. If you want to add something, just add it on its own line. K.I.S.S.
 # 5. You must _not_ put a semicolon & comment after an entry. e.g. 'foo; #bar'.
-# 6. All these worlds are yours except Europa. Attempt no landing there.
+# 6. you can add also entries in a file inside the deplist.d subdirectory
 
-#------------------------- STUFF ADDED BY THE USER ----------------------------
-#---vvvv     vvvv     vvvv  list your stuff here!  vvvv     vvvv     vvvv
-#
-# bar
-# foo
-#
-#---^^^^     ^^^^     ^^^^  list your stuff here!  ^^^^     ^^^^     ^^^^
-#------------------------------------------------------------------------------
-
-#----- Covers a multitude of sins, including XFS, JFS, ReiserFS, and RAID -----
-mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.dos mkdosfs mkvfatfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.jfs mkfs.xfs mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm
-fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks
+#----- Kept for compatibility -----
+mkswapfs mkfs.swap mkfs.dos mkvfatfs mkfatfs mkfs.reiser mke3fs mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek e2fsadm fsck.reiser
 
 #-------------------------------- ESSENTIAL -----------------------------------
-fstab raidtab modules.conf conf.modules mondorestore mt modules.conf.local
-afio star ntfsclone parted ms-sys file getfattr setfattr getfacl setfacl
-buffer
-awk gawk
-bzip2 bunzip2 lzop
-date ctrlaltdel
-dd
-eject
-grep ld-linux.so.2 ld-2.3.4.so
-hosts host.conf resolv.conf hosts.allow hosts.deny
-wc
-xargs
-gzip gunzip
-klogd sysklogd
-fdisk hdparm parted arch
-less less.bin less.dummy less.dupe less.hot.weather.in.texas.please
-loadkeys
-mount
-ping devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
+conf.modules modules.conf.local ms-sys
+less.bin less.dummy less.dupe less.hot.weather.in.texas.please
+burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
 
-# ------------------------------- for X (Hugo) --------------------------------
-#tar
-#ldd lddlibc4
-#libXmu
-#libz
-#X
-#startx
-#xinitrc
-#xinit
-#/etc/X11/XF86Config
-#xauth
-#libXext
-# --- end of X stuff ---
-
-insmod insmod.static insmod.static.old lsmod
-
-#-------------------------- For mounting NFS volumes --------------------------
-ifconfig route /sbin/start-nfs
-#ifconfig host.conf resolv.conf ping ip portmap rpc.statd
-#rpc.lockd rpc.statd nfsstat rpc.nfsd rpc.mountd rpc.exportfs exportfs hosts exports hosts.allow hosts.deny showmount /etc/sysconfig/network /etc/sysconfig/network-scripts service usernetctl services protocols inetd inetd.conf /etc/rc.d ifup ifdown
-
-
+insmod.static insmod.static.old
 
 #------------------------ Added for Stuart D. Gathman -------------------------
 #lc l lf netstat inetd tcpd in.telnetd route ldconfig ldd telnet rsh rcp services protocols rpc inetd.conf nsswitch.conf localtime security libresolv libutil libcrypt lbnss_compat libnss_files libnss_dns libpwdb libncurses
 
-
-
-#------------------------- Part of the Cuckoo Project -------------------------
-#mkisofs
-#cdrecord
-#losetup
-#fdformat
-#lilo grub
-#/usr/local/share/mondo
-#mondoarchive
-#mindi
-#/usr/local/share/mindi
-
 #----------------- For all you LVM users out there, much love -----------------
 LVMFILES:
-lvmiopversion lvchange lvcreate lvdisplay lvextend lvmchange lvmcreate_initrd lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvscan pvchange pvcreate pvdata pvdisplay pvmove pvscan vgcfgbackup vgcfgrestore vgchange vgck vgcreate vgdisplay vgexport vgextend vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgscan vgsplit liblvm lvm lvm-10 /etc/lvm/lvm.conf
+lvmiopversion  lvmcreate_initrd  pvdata
 #------------------------------------------------------------------------------

trunk/mindi/distributions/rpm/mindi.spec

@@ -21 +21 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}
 Requires:   %{addreq}
+Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
 # Not on all systems
 #Conflicts: bonnie++
@@ -60 +61 @@
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
+%config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
+%config(noreplace) %{_sysconfdir}/mindi/deplist.d/* 
+%config(noreplace) %{_sysconfdir}/mindi/mindi.conf
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}/man8/*
 %{_libdir}/mindi
+%attr(755,root,root) %{_sysconfdir}/mindi/mindi.conf
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/mindi/aux-tools/sbin/*

trunk/mindi/install.sh

@@ -41 +41 @@
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR
+install -m 755 -d $conf $conf/deplist.d $locallib/mindi $MANDIR $local/sbin $DOCDIR
 
 echo "Copying files ..."
 install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
 install -m 644 deplist.txt $conf
+install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
+install -m 755 distributions/conf/mindi.conf $conf
 
 cp -af rootfs aux-tools $locallib/mindi
@@ -51 +53 @@
 chmod 755 $locallib/mindi/rootfs/sbin/*
 chmod 755 $locallib/mindi/aux-tools/sbin/*
+chmod 755 $conf/mindi.conf
 
 if [ "$RPMBUILDMINDI" = "true" ]; then
@@ -109 +112 @@
 fi
 
+# Special case for SuSE family wher doc is put elsewhere in the RPM
+if [ _"$dfam" != _"suse" ] then;
+    rm -rf $DOCDIR
+fi
+
 exit 0

trunk/mindi/mindi

@@ -36 +36 @@
 MINDI_SBIN=${MINDI_PREFIX}/sbin
 
-
 if [ "$ARCH" = "x86_64" ] ; then
     MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
@@ -43 +42 @@
 fi
 
-EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
-IA64_BOOT_SIZE=8192       ; # size of the ia64 boot disk
-TMP_ROOT=/tmp
-WRITE_BOOT_FLOPPIES="yes" ; # do you want to be prompted to write floppy images
+MINDI_CONFIG="$MINDI_CONF/mindi.conf"
+if [ ! -f $MINDI_CONFIG ]; then
+    echo "No $MINDI_CONFIG file found using sensible values"
+else
+    . $MINDI_CONFIG
+fi  
+
+#
+# Manages defaults coming from conf files
+#
+if [ "$mindi_extra_space" == "" ]; then
+    EXTRA_SPACE=24576
+else
+    EXTRA_SPACE=$mindi_extra_space
+fi
+if [ "$mindi_ia64_boot_size" == "" ]; then
+    IA64_BOOT_SIZE=8192
+else
+    IA64_BOOT_SIZE=$mindi_ia64_boot_size
+fi
+
+if [ "$mindi_deplist_dir" == "" ]; then
+    DEPLIST_DIR="$MINDI_CONF/deplist.d"
+else
+    DEPLIST_DIR="$mindi_deplist_dir"
+fi
+if [ "$mindi_write_boot_floppy" == "" ]; then
+    WRITE_BOOT_FLOPPIES="yes"
+else
+    WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
+fi
+if [ "$mindi_write_mindi_cd" == "" ]; then
+    WRITE_BOOT_FLOPPIES="yes"
+else
+    WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
+fi
+if [ "$mindi_images_dir" == "" ]; then
+    CACHE_LOC="/var/cache/mindi"
+else
+    CACHE_LOC="$mindi_images_dir"
+fi
+if [ "$mindi_dual_floppies" == "" ]; then
+    FORCE_DUAL_FLOPPIES="/var/cache/mindi"
+else
+    FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
+fi
+if [ "$mindi_tmp_dir" == "" ]; then
+    TMP_ROOT="/tmp"
+else
+    TMP_ROOT="$mindi_tmp_dir"
+fi
+if [ "$mindi_fd_device" == "" ]; then
+    FDDEVICE="/dev/fd0"
+else
+    FDDEVICE="$mindi_fd_device"
+fi
+
+# Other parameters
+# Useless ??
 PROMPT_WRITE_BOOT_FLOPPIES="yes"
     # do you want to be prompted to write
@@ -60 +114 @@
     # you want to use your own kernel, or the supplied default.
     # If "yes" mindi will automatically use your own kernel.
-MINDI_CONFIG="$MINDI_CONF/mindi.conf"
-if [ -f $MINDI_CONFIG ]; then
-    . $MINDI_CONFIG
-fi
+
 MY_FSTAB=/etc/fstab
 FLOPPY_MODS="ide-floppy floppy"
@@ -77 +128 @@
 EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
 LOGFILE=/var/log/mindi.log
-FDDEVICE=/dev/fd0             ; # 1.44MB floppy #0
-CACHE_LOC=/var/cache/mondo-archive
-FORCE_DUAL_FLOPPIES=no
 
 BOOT_MEDIA_MESSAGE="\
@@ -280 +328 @@
     biggienumber=$4
 
-    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist.txt accordingly."
+    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist file accordingly."
     mkdir -p $outdir
 
@@ -490 +538 @@
     my_partitions=`mount | fgrep $$ | cut -f1 -d' '`
     [ "$my_partitions" != "" ] && umount $my_partitions
-    [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
+    # BCO : Too Dangerous !!!
+    #[ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
     cd /tmp
     mkdir -p mindi.err
@@ -826 +875 @@
     echo "$fname" >> $outfile.pre
         cat $tempdepfile >> $outfile.pre
-#        echo "$fname ----> dependencies:-" >> $LOGFILE
-#        cat $tempdepfile | tr -s '/' '/' | sort -u >> $LOGFILE
-#        echo -en "(end of deplist of $fname)\n\n" >> $LOGFILE
         rm -f $tempdepfile
     progress=$(($progress+1))
@@ -1315 +1361 @@
     if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
     echo -en "\rAnalyzing LVM...\r"
-    all_partitions=`$MINDI_LIB/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
+    all_partitions=`$MINDI_SBIN/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -2120 +2166 @@
     tardir=$TMP_ROOT/tardir
 
-    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
-    cat $MINDI_CONF/deplist.txt | GenerateGiantDependencyList $needlist $lines
+    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | grep -vx "" | wc -l`
+    cat $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | GenerateGiantDependencyList $needlist $lines
     res=$?
     if [ "$YOUR_KERNEL_SUCKS" ]; then
@@ -2221 +2267 @@
     cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
-    [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
-    [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/dev/mapper" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
@@ -2905 +2951 @@
 #----------------------------------- main -----------------------------------#
 ##############################################################################
-
-
-#AWK=`which gawk`
-#LocateDeps $1
-#MakeModuleLoadingScript /tmp/load-modules.sh
-#exit 0
-
-
-#cat /etc/mindi/deplist.txt | GenerateGiantDependencyList /tmp/deplist.old 200
-#exit 0
-