Changeset 2412


Ignore:
Timestamp:
Sep 19, 2009, 1:28:31 AM (9 years ago)
Author:
bruno
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:
1 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/deplist.txt

    r2382 r2412  
    1 # Mindi-Linux's dependency list                                      07/10/2004
     1# $Id$
    22#
    33# NB:
     
    55# 2. If you put 'libncurses' (w/o quotation marks) on an uncommented line then
    66#    Mindi will find /lib/libncurses* and include all matching files.
    7 # 3. You may give an absolute path if you think Mindi will have trouble finding
    8 #    the file on its own.
     7# 3. You recommend that you give an absolute path name
    98# 4. If you want to add something, just add it on its own line. K.I.S.S.
    109# 5. You must _not_ put a semicolon & comment after an entry. e.g. 'foo; #bar'.
     
    1211#------------------------- STUFF ADDED BY THE USER ----------------------------
    1312#---vvvv     vvvv     vvvv  list your stuff here!  vvvv     vvvv     vvvv
    14 #
    15 # bar
    16 # foo
    17 #
     13
     14
    1815#---^^^^     ^^^^     ^^^^  list your stuff here!  ^^^^     ^^^^     ^^^^
    1916#------------------------------------------------------------------------------
    20 
    21 #----- Covers a multitude of sins, including XFS, JFS, ReiserFS, and RAID -----
    22 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
    23 fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks fsck.ext4
    24 vmkfstools
    25 
    26 #-------------------------------- ESSENTIAL -----------------------------------
    27 fstab raidtab
    28 /usr/sbin/mondorestore
    29 /etc/mdadm/mdadm.conf /etc/mdadm.conf
    30 /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
    31 /sbin/ldconfig
    32 afio star ntfsclone parted partprobe ms-sys file getfattr setfattr getfacl setfacl
    33 buffer
    34 gawk
    35 bzip2 bunzip2 lzop
    36 ctrlaltdel
    37 # Everything needed to handle modules correctly
    38 insmod lsmod /sbin/modprobe
    39 /etc/modprobe.d /etc/modprobe.conf /etc/modules.conf /etc/conf.modules /etc/modules.conf.local
    40 
    41 hosts host.conf resolv.conf hosts.allow hosts.deny nsswitch.conf
    42 klogd sysklogd
    43 fdisk hdparm uname partprobe
    44 loadkeys
    45 # These lines require absolute paths now !
    46 /bin/mount
    47 /sbin/mount.nfs /sbin/mount.nfs4
    48 /usr/bin/sshfs
    49 /sbin/mount.fuse /usr/bin/fusermount /usr/bin/ulockmgr_server
    50 /sbin/mount.cifs /sbin/mount.cifs3
    51 /sbin/mount.smb /sbin/mount.smb3
    52 /sbin/mount.smbfs /sbin/mount.smbfs3
    53 /sbin/mount.ntfs /sbin/mount.ntfs-3g
    54 # helps for debugging
    55 /usr/bin/ldd
    56 /usr/bin/strace
    57 # busybox df doesn't support -P which is used now
    58 /bin/df
    59 
    60 # Allow ssh
    61 /usr/sbin/sshd
    62 /usr/bin/ssh
    63 /usr/bin/scp
    64 
    65 #
    66 devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
    67 
    68 # For udev
    69 /sbin/MAKEDEV
    70 /etc/init.d/functions
    71 
    72 # For file command
    73 /usr/share/misc/file/magic /usr/share/file/magic
    74 
    75 # For swap uuid support, ia64 and probably then more in the future
    76 /usr/bin/perl
    77 # For menu management on ia64
    78 efibootmgr
    79 
    80 # For Debug  mode
    81 # gdb valgrind /usr/lib/valgrind
    82 
    83 #
    84 # Proliant extended support if available
    85 # Look at http://www.hp.com/servers/sstoolkit
    86 conrep cpqacuxe hponcfg
    87 lshw
    88 #----------------- For all you LVM users out there, much love -----------------
    89 LVMFILES:
    90 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
    91 #------------------------------------------------------------------------------
  • branches/2.2.10/mindi/install.sh

    r2256 r2412  
    6969
    7070echo "Creating target directories ..."
    71 install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR
     71install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR $conf/deplist.d
    7272
    7373echo "Copying files ..."
     
    7777install -m 644 msg-txt dev.tgz $locallib/mindi
    7878install -m 644 deplist.txt udev.files proliant.files $conf
    79 install -m 755 mindi-bkphw $local/sbin
    80 install -m 755 mindi-get-perl-modules $local/sbin
    81 install -m 755 parted2fdisk.pl $local/sbin
     79for f in deplist.d/*.conf; do
     80    install -m 644 $f $conf/deplist.d
     81done
     82for f in mindi-bkphw mindi-get-perl-modules parted2fdisk.pl; do
     83    install -m 755 $f $local/sbin
     84done
    8285
    8386# Substitute variables for mindi
     
    8992
    9093if [ "_$PREFIX" = "_" ] && [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
    91         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
     94    echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
    9295fi
    9396
  • branches/2.2.10/mindi/mindi

    r2406 r2412  
    9292fi
    9393DEPLIST_FILE="$MINDI_CONF/deplist.txt"
     94DEPLIST_DIR="$MINDI_CONF/deplist.d"
     95
    9496ISO_CMD="/usr/bin/mkisofs"
    9597ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
     
    18441846    includefile=$MINDI_TMP/$$.includefile.txt
    18451847
    1846     lfiles="$DEPLIST_FILE"
     1848    if [ -e "$DEPLIST_FILE" ]; then
     1849        lfiles="$DEPLIST_FILE $DEPLIST_DIR/*"
     1850    else
     1851        lfiles="$DEPLIST_DIR/*"
     1852    fi
    18471853    lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
    18481854    ParseModprobeForIncludes $includefile
     
    22312237        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
    22322238        rm -f bin/mount $MINDI_TMP/busy.lis
    2233         mountlis=`grep mount $DEPLIST_FILE`
     2239        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`
    22342240        for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
    22352241            if [ -f $f ]; then
Note: See TracChangeset for help on using the changeset viewer.