Changeset 1886 in MondoRescue for branches/stable

Timestamp:

Mar 2, 2008, 12:40:00 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Align mindi stable with version 2.2.5 (remaining part is now conf file)

Location:

branches/stable

Files:

• mindi/mindi (modified) (20 diffs)
• pbconf/mondorescue.pb (modified) (4 diffs)

branches/stable/mindi/mindi

@@ -17 +17 @@
 
 #RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
-    # after booting from image/CD image but before
+    # after booting from image/CD but before
     # accessing auxiliary data disks (or the rest of
     # the CD), the initscript will run the above command.
@@ -587 +587 @@
     done
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-       mappath=$(locate */kbd/keymaps/*/$locale)
+            mappath=$(find / -name "*/kbd/keymaps/*/$locale")
     fi
     echo "mappath = $mappath" >> $LOGFILE
@@ -612 +612 @@
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib/syslinux/isolinux.bin
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib64/syslinux/isolinux.bin
-    [ ! -e "$ISOLINUX" ] && ISOLINUX=`locate isolinux.bin | grep -x "/.*/isolinux.bin"`
+    [ ! -e "$ISOLINUX" ] && ISOLINUX=`find / -name isolinux.bin | grep -x "/.*/isolinux.bin"`
     [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.com and click on 'Download'"
     echo "Found isolinux.bin at $ISOLINUX" >> $LOGFILE
@@ -778 +778 @@
     progress=0
     noof_lines=`cat $tempfile | wc -l`
+    echo "---------------------------------" >> $LOGFILE
+    echo "List of dependencies:             " >> $LOGFILE
+    echo "---------------------------------" >> $LOGFILE
     for fname in `cat $tempfile` ; do
-        echo "$fname" >> $outfile.pre
-        LocateDeps $fname >> $outfile.pre
+        echo "$fname" | tee -a $LOGFILE >> $outfile.pre
+        LocateDeps $fname | tee -a $LOGFILE >> $outfile.pre
         progress=$(($progress+1))
         echo -en "\r\t\t\t\t\t\t\t\t"
@@ -811 +814 @@
             LogIt "If Mindi was called by Mondo then send me a bug report.\n It not, type 'ps ax' to see which Mondo-related process is still running;\n then kill it. :-)\n Finally, run Mindi again."
             Die "Odd."
+        fi
+        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
+        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+            LogIt "Incorporating NFS-related settings"
+            for r in NFS-* ISO-PREFIX ; do
+                cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
+                echo "Copying $r to ramdisk" >> $LOGFILE
+            done
         fi
     fi
@@ -1039 +1050 @@
     file="$1"
 
+    echo "$file"
     if [ ! -h $file ]; then
-        echo "$file"
         return 0
     fi
 
-    link=`readlink -f $file`
+    link=`readlink $file`
     d=`dirname $file`
-    if [ ! -e "$link" -a ! -e "$d/$link" ]; then
-        echo "Problem with dead link on $file -> $link" >> $LOGFILE
-    fi
+    fchar=`echo $link | cut -c1`
+    # If mother dir is a link print it
     if [ -h "$d" ]; then
-        echo "$link"
         echo "$d"
-    else
-        echo "$link"
+        d=`readlink $d`
+    fi
+    if [ "$fchar" != "/" ]; then
+        # Relative or local link
+        ReadAllLink "$d/$link" 
+    else
+        # Absolute path
+        ReadAllLink $link 
     fi
 }
@@ -1363 +1378 @@
             fi
         else
-            str_to_find_fmt_with=$current_partition
+            # Needs to handle the recent OpenSUSE fancy way of dealing with fstab :-(
+            # they use symlinks in fstab unrelated to what is shown in mount !
+            if [ _"$partition_mountpt" = _"" ]; then
+                for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -Ev "^#" | $AWK '{print $1}'`; do
+                        if [ _"`readlink -f $tmpp`" = _"$current_partition" ]; then
+                            str_to_find_fmt_with=$tmpp
+                            partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$tmpp" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
+                            break;
+                        fi
+                done
+            else
+                str_to_find_fmt_with=$current_partition
+            fi
         fi
 
@@ -1448 +1475 @@
         if [ ! "$partition_mountpt" ] ; then
             echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
-            for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
+            for qq in "" `find /dev/ida/c*d* ! -name '*p*' 2> /dev/null`; do
                 partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
                 [ "$partition_format" ] && break
@@ -1593 +1620 @@
     done
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
-    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
+    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
     if [ _"$MONDO_SHARE" != _"" ]; then 
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"/dev/null 
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
 
     fi
@@ -1659 +1686 @@
     echo "Transforming $USBDEVICE in a Bootable device"  >> $LOGFILE
     echo "Checking $USBDEVICE" >> $LOGFILE
-    $FDISK -l $USBDEVICE 2>&1 >> $LOGFILE
+    $FDISK -l $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE
     if [ $? -ne 0 ]; then
         echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
@@ -2578 +2605 @@
 
 TurnTgzIntoRdz() {
-    local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w
+    local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
 
     tgz_dir_fname=$1
@@ -2617 +2644 @@
     [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
 
-    # Handle the case where busybox is dynamically linked
+    # Handle the case where busybox and mount are dynamically linked
     # Should be done first so that if /lib64 is a link, it's
     # created first like that, instead of as a real dir later on
     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
     if [ $? -eq 0 ]; then
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
+        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
         cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
         rm -f $MINDI_TMP/busy.lis
@@ -2676 +2703 @@
         LogIt "Hardware Information found and saved ..."
         cp -rp $MINDI_CACHE/bkphw .
-        lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
-        LocateDeps $lis > $MINDI_TMP/tools.lis
-        cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
+        if [ -f $MINDI_CACHE/tools.files ]; then
+            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
+            LocateDeps $lis > $MINDI_TMP/tools.lis
+            cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
+        fi
         if [ -f $MINDI_CACHE/mindi-rsthw ]; then
             mv -f $MINDI_CACHE/mindi-rsthw .
@@ -2718 +2747 @@
     needed_modules=""
     list_of_groovy_mods="$CDROM_MODS $FORCE_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+
     if [ "$NFS_DEV" != "" ] ; then
         # For PXE boot
@@ -2775 +2805 @@
     mkdir -p $mountpoint/proc
     echo "$BOOT_SIZE" > $mountpoint/tmp/$BOOT_SIZE.siz
-    find $mountpoint -name CVS -exec rm -rf '{}' \;
     # Determine what filesystem to use for initrd image
     echo "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." >> $LOGFILE
@@ -2875 +2904 @@
 ##############################################################################
 
-# Now we can create what we nedd
+# Now we can create what we need
 mkdir -p $MINDI_TMP
 
@@ -2884 +2913 @@
 rm -rf $MINDI_CACHE/* 2> /dev/null
 mkdir -p $MINDI_CACHE
-
 
 if [ "$1" = "--printvar" ] ; then
@@ -2915 +2943 @@
 [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
 echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
-if [ -f $MINDI_CONF ]; then
+if [ -f $MINDI_CONFIG ]; then
     echo "-----------------------------" >> $LOGFILE
     echo " Mindi configuration file    " >> $LOGFILE
     echo "-----------------------------" >> $LOGFILE
-    grep -Ev '^#' $MINDI_CONF >> $LOGFILE
+    grep -Ev '^#' $MINDI_CONFIG >> $LOGFILE
     echo "-----------------------------" >> $LOGFILE
 fi
@@ -3060 +3088 @@
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
 fi
+echo "FORCE_MODS:" >> $LOGFILE
+echo "-------------" >> $LOGFILE
+echo $FORCE_MODS >> $LOGFILE
+echo "-------------" >> $LOGFILE
+echo "DENY_MODS:" >> $LOGFILE
+echo "-------------" >> $LOGFILE
+echo $DENY_MODS >> $LOGFILE
 echo "-------------" >> $LOGFILE
 echo "df result:" >> $LOGFILE
@@ -3305 +3340 @@
     echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot image (y/[n]) ?"
     read ch
-    if [ "$ch" = "y" ] || [ "$ch" = "Y" ] ; then
+    if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
+        USE_LILO=no
+    else
         USE_LILO=yes
     fi

branches/stable/pbconf/mondorescue.pb

@@ -12 +12 @@
 # Which CMS system is used
 #
-cms mondorescue = svn
+pburl mondorescue = svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue
 
 #
 # Packager label
 #
-packager mondorescue = "Bruno Cornec <bruno@mondorescue.org>"
+pbpackager mondorescue = "Bruno Cornec <bruno@mondorescue.org>"
 
 #
@@ -35 +35 @@
 # a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
 #
-vmlist mondorescue = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,fedora_8,rhel_2.1,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10,gentoo_nover,slackware_10.2,slackware_11.0,freebsd_5.5
+vmlist mondorescue = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
+
+# List of  VEs
+velist mondorescue = fedora-7-i386
+
+#
+# Valid values for vetype are
+# chroot (maybe others in the future)
+vetype mondorescue = chroot
 
 #
@@ -57 +65 @@
 
 testver mondorescue = true
-projver mondorescue = stable
+projver mondorescue = branches/stable
 projtag mondorescue = 1
 
@@ -73 +81 @@
 
 # Hash of valid version names
-version devel
-version stable
+version mondorescue = devel,stable,trunk
 
 # List of additional files on which to apply filters