Changeset 350 in MondoRescue for trunk/mindi

Timestamp:

Jan 28, 2006, 12:36:00 AM (18 years ago)

Author:

bcornec

Message:

merge -r 341:349 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

• .config-busybox-i386 (modified) (31 diffs)
• analyze-my-lvm (modified) (1 diff)
• distributions/common/mindi.spec (modified) (3 diffs)
• mindi (modified) (1 diff)

trunk/mindi/.config-busybox-i386

@@ -13 +13 @@
 # CONFIG_FEATURE_INSTALLER is not set
 CONFIG_LOCALE_SUPPORT=y
-CONFIG_FEATURE_DEVFS=y
+# CONFIG_FEATURE_DEVFS is not set
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
 
@@ -25 +27 @@
 CONFIG_LFS=y
 # USING_CROSS_COMPILER is not set
+CROSS_COMPILER_PREFIX=""
 EXTRA_CFLAGS_OPTIONS=""
+CONFIG_FEATURE_SUSv2=y
+CONFIG_FEATURE_SUSv2_OBSOLETE=y
 
 #
@@ -31 +36 @@
 #
 # CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
 PREFIX="./_install"
 
@@ -37 +45 @@
 #
 # CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 CONFIG_BUNZIP2=y
 CONFIG_CPIO=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
 CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
@@ -61 +71 @@
 # Common options for cpio and tar
 #
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+CONFIG_FEATURE_UNARCHIVE_TAPE=y
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
 
 #
@@ -74 +86 @@
 CONFIG_CHROOT=y
 CONFIG_CMP=y
+# CONFIG_COMM is not set
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
+
+#
+# date (forced enabled for use with watch)
+#
 CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
@@ -88 +105 @@
 CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
-# CONFIG_EXPR is not set
+CONFIG_EXPR=y
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
@@ -107 +124 @@
 CONFIG_FEATURE_LS_USERNAME=y
 CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
 CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
@@ -112 +130 @@
 CONFIG_MKNOD=y
 CONFIG_MV=y
-# CONFIG_OD is not set
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
 # CONFIG_PRINTF is not set
 CONFIG_PWD=y
@@ -123 +144 @@
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
 CONFIG_STTY=y
+# CONFIG_SUM is not set
 CONFIG_SYNC=y
 CONFIG_TAIL=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TEST=y
 
@@ -136 +162 @@
 CONFIG_TOUCH=y
 CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
@@ -143 +171 @@
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
+CONFIG_WATCH=y
 CONFIG_WC=y
 CONFIG_WHO=y
@@ -177 +205 @@
 # CONFIG_DUMPKMAP is not set
 # CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
+CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
 CONFIG_RESET=y
-# CONFIG_SETKEYCODES is not set
+# CONFIG_SETCONSOLE is not set
+CONFIG_SETKEYCODES=y
 
 #
@@ -188 +217 @@
 CONFIG_PIPE_PROGRESS=y
 # CONFIG_READLINK is not set
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
 # CONFIG_RUN_PARTS is not set
 # CONFIG_START_STOP_DAEMON is not set
 CONFIG_WHICH=y
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_E2FSCK is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
 
 #
@@ -221 +263 @@
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
@@ -229 +272 @@
 # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
 # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 
 #
@@ -235 +278 @@
 #
 # CONFIG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_HALT=y
+CONFIG_MESG=y
 CONFIG_POWEROFF=y
 CONFIG_REBOOT=y
-CONFIG_MESG=y
 
 #
 # Login/Password Management Utilities
 #
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
 # CONFIG_USE_BB_PWD_GRP is not set
 # CONFIG_ADDGROUP is not set
@@ -249 +299 @@
 # CONFIG_DELUSER is not set
 # CONFIG_GETTY is not set
-CONFIG_FEATURE_U_W_TMP=y
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
 # CONFIG_LOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
 # CONFIG_PASSWD is not set
 # CONFIG_SU is not set
@@ -260 +312 @@
 #
 # CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
 # CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
-CONFIG_DEVFSD=y
-CONFIG_DEVFSD_MODLOAD=y
-CONFIG_DEVFSD_FG_NP=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
+CONFIG_EJECT=y
 # CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
 # CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
 # CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
 CONFIG_MT=y
+# BB_APPLET_RUNLEVEL is not set
 # CONFIG_RX is not set
 CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
 # CONFIG_TIME is not set
 CONFIG_WATCHDOG=y
@@ -280 +352 @@
 #
 CONFIG_INSMOD=y
-CONFIG_FEATURE_2_4_MODULES=y
-CONFIG_FEATURE_2_6_MODULES=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
 CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
-CONFIG_RMMOD=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+
+#
+# Options common to multiple modutils
+#
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
 
 #
@@ -296 +376 @@
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_ARPING is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
 # CONFIG_FTPGET is not set
 # CONFIG_FTPPUT is not set
 CONFIG_HOSTNAME=y
 # CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -307 +398 @@
 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
 # CONFIG_IFUPDOWN is not set
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
 # CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
 CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
@@ -329 +432 @@
 CONFIG_NAMEIF=y
 # CONFIG_NC is not set
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
 CONFIG_NETSTAT=y
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
 CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
 CONFIG_ROUTE=y
-# CONFIG_TELNET is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 # CONFIG_TELNETD is not set
-# CONFIG_TFTP is not set
-# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TELNETD_INETD is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_FEATURE_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
@@ -349 +465 @@
 # CONFIG_UDHCPD is not set
 CONFIG_UDHCPC=y
+# CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCP_SYSLOG is not set
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_ZCIP is not set
 
 #
@@ -356 +474 @@
 #
 CONFIG_FREE=y
+# CONFIG_FUSER is not set
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
 CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
 CONFIG_RENICE=y
-# CONFIG_TOP is not set
+# CONFIG_BB_SYSCTL is not set
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
 CONFIG_UPTIME=y
-CONFIG_SYSCTL=y
-
-#
-# Another Bourne-like Shell
+
+#
+# Shells
 #
 CONFIG_FEATURE_SH_IS_ASH=y
@@ -379 +502 @@
 #
 CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
@@ -384 +509 @@
 # CONFIG_ASH_GETOPTS is not set
 # CONFIG_ASH_CMDCMD is not set
-CONFIG_ASH_MAIL=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+# CONFIG_ASH_MAIL is not set
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
@@ -397 +524 @@
 # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
 CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
 CONFIG_FEATURE_COMMAND_HISTORY=15
 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
@@ -421 +549 @@
 CONFIG_DMESG=y
 # CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
 CONFIG_FDFLUSH=y
 CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
+# CONFIG_FDISK is not set
 FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -434 +564 @@
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
 # CONFIG_HEXDUMP is not set
 CONFIG_HWCLOCK=y
-# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
+CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
 CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
 CONFIG_MKSWAP=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_PIVOT_ROOT=y
+# CONFIG_SWITCH_ROOT is not set
 # CONFIG_RDATE is not set
+# CONFIG_READPROFILE is not set
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
 CONFIG_UMOUNT=y
-# CONFIG_FEATURE_MOUNT_FORCE is not set
 
 #
@@ -460 +597 @@
 #
 # CONFIG_DEBUG is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set

trunk/mindi/analyze-my-lvm

@@ -44 +44 @@
 GetValueFromField() {
     local res
-    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%sm",$1;} else if ($2=="KB") {printf "%sk",$1;} else if ($2=="GB") {printf "%sg",$1;} else {print $0;};}'
+    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%dm",$1;} else if ($2=="KB") {printf "%dk",$1;} else if ($2=="GB") {printf "%dg",$1;} else {print $0;};}'
 }
 

trunk/mindi/distributions/common/mindi.spec

@@ -19 +19 @@
 %if %is_redhat
 %define grp     Applications/Archiving
-%define addreq  %{addreqb}, which
+%define addreq  %{addreqb}, which, grep >= 2.5
 Autoreq:    0
 %endif
@@ -25 +25 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
-%define addreq  %{addreqb}, which
+%define addreq  %{addreqb}, which, grep >= 2.5
 Autoreqprov: no
 %endif
@@ -31 +31 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
-%define addreq  %{addreqb}, which
+%define addreq  %{addreqb}, which, grep >= 2.5
 Autoreqprov: no
 %endif

trunk/mindi/mindi

@@ -2945 +2945 @@
 fi
 FixPathIfBroken
-[ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep "2\.4" | cut -d' ' -f1`
+[ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | egrep "2\.[46]" | cut -d' ' -f1`
 AbortIfMkfsVfatMissing
 ### BCO