Changeset 2412 in MondoRescue

Timestamp:

Sep 19, 2009, 1:28:31 AM (15 years ago)

Author:

Bruno Cornec

Message:

• sshfs also needs ssh at restore time in initrd
• Better list of mandatory tools
• Adds fuse and sshfs support in initrd
• Split deplist.txt into multiple conf files under deplist.d in the conf dir. This will allow to have a minimal.conf file for initrd content to analyze to improve support of new embedded feature in the future (sshfs, live install). The other conf files contain the additional commands to put in the all.tar.gz. For the moment, mindi is still working the same. THis infra will allow that support in a near future. deplist.txt is now reserved for the admin additional commands.
• Remove useless script

(Backport from 2.2.9)

Location:

branches/2.2.10/mindi

Files:

• deplist.d (copied) (copied from branches/2.2.9/mindi/deplist.d )
• deplist.txt (modified) (3 diffs)
• install.sh (modified) (3 diffs)
• mindi (modified) (3 diffs)
• rootfs/sbin/insist-on-cd (deleted)

branches/2.2.10/mindi/deplist.txt

@@ -1 @@
-# Mindi-Linux's dependency list                                      07/10/2004
+# $Id$
 #
 # 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 recommend that you give an absolute path name
 # 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'.
@@ -12 +11 @@
 #------------------------- 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.ntfs mkfs.dos mkdosfs mkvfatfs mkntfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.ext4 mke4fs mkfs.jfs mkfs.xfs mkfs.ocfs2 mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm /etc/mke2fs.conf reiserfstune
-fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks fsck.ext4
-vmkfstools
-
-#-------------------------------- ESSENTIAL -----------------------------------
-fstab raidtab 
-/usr/sbin/mondorestore
-/etc/mdadm/mdadm.conf /etc/mdadm.conf
-/sbin/multipath /sbin/dmsetup /sbin/kpartx /sbin/dmraid /sbin/scsi_id /sbin/mpath_prio_alua /sbin/mpath_wait /sbin/mpath_ctl /sbin/mpath_prio_emc /sbin/mpath_prio_hds_modular /sbin/mpath_prio_netapp /sbin/mpath_prio_ontap /sbin/mpath_prio_rdac /sbin/mpath_prio_tpc
-/sbin/ldconfig
-afio star ntfsclone parted partprobe ms-sys file getfattr setfattr getfacl setfacl
-buffer
-gawk
-bzip2 bunzip2 lzop
-ctrlaltdel
-# Everything needed to handle modules correctly
-insmod lsmod /sbin/modprobe
-/etc/modprobe.d /etc/modprobe.conf /etc/modules.conf /etc/conf.modules /etc/modules.conf.local
-
-hosts host.conf resolv.conf hosts.allow hosts.deny nsswitch.conf
-klogd sysklogd
-fdisk hdparm uname partprobe
-loadkeys
-# These lines require absolute paths now !
-/bin/mount
-/sbin/mount.nfs /sbin/mount.nfs4 
-/usr/bin/sshfs 
-/sbin/mount.fuse /usr/bin/fusermount /usr/bin/ulockmgr_server
-/sbin/mount.cifs /sbin/mount.cifs3
-/sbin/mount.smb /sbin/mount.smb3
-/sbin/mount.smbfs /sbin/mount.smbfs3
-/sbin/mount.ntfs /sbin/mount.ntfs-3g
-# helps for debugging
-/usr/bin/ldd
-/usr/bin/strace
-# busybox df doesn't support -P which is used now
-/bin/df
-
-# Allow ssh
-/usr/sbin/sshd
-/usr/bin/ssh
-/usr/bin/scp
-
-#
-devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
-
-# For udev
-/sbin/MAKEDEV
-/etc/init.d/functions
-
-# For file command
-/usr/share/misc/file/magic /usr/share/file/magic
-
-# For swap uuid support, ia64 and probably then more in the future
-/usr/bin/perl
-# For menu management on ia64
-efibootmgr
-
-# For Debug  mode
-# gdb valgrind /usr/lib/valgrind
-
-#
-# Proliant extended support if available
-# Look at http://www.hp.com/servers/sstoolkit
-conrep cpqacuxe hponcfg
-lshw
-#----------------- 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
-#------------------------------------------------------------------------------

branches/2.2.10/mindi/install.sh

@@ -69 +69 @@
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR
+install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR $conf/deplist.d
 
 echo "Copying files ..."
@@ -77 +77 @@
 install -m 644 msg-txt dev.tgz $locallib/mindi
 install -m 644 deplist.txt udev.files proliant.files $conf
-install -m 755 mindi-bkphw $local/sbin
-install -m 755 mindi-get-perl-modules $local/sbin
-install -m 755 parted2fdisk.pl $local/sbin
+for f in deplist.d/*.conf; do
+    install -m 644 $f $conf/deplist.d
+done
+for f in mindi-bkphw mindi-get-perl-modules parted2fdisk.pl; do
+    install -m 755 $f $local/sbin
+done
 
 # Substitute variables for mindi
@@ -89 +92 @@
 
 if [ "_$PREFIX" = "_" ] && [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
-        echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
+    echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi
 

branches/2.2.10/mindi/mindi

@@ -92 +92 @@
 fi
 DEPLIST_FILE="$MINDI_CONF/deplist.txt"
+DEPLIST_DIR="$MINDI_CONF/deplist.d"
+
 ISO_CMD="/usr/bin/mkisofs"
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
@@ -1844 +1846 @@
     includefile=$MINDI_TMP/$$.includefile.txt
 
-    lfiles="$DEPLIST_FILE"
+    if [ -e "$DEPLIST_FILE" ]; then
+        lfiles="$DEPLIST_FILE $DEPLIST_DIR/*"
+    else
+        lfiles="$DEPLIST_DIR/*"
+    fi
     lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
     ParseModprobeForIncludes $includefile
@@ -2231 +2237 @@
         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
         rm -f bin/mount $MINDI_TMP/busy.lis
-        mountlis=`grep mount $DEPLIST_FILE`
+        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`
         for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
             if [ -f $f ]; then