Changeset 904 in MondoRescue for trunk/mondo

Timestamp:

Oct 25, 2006, 1:51:57 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• configure.in (modified) (1 diff)
• distributions/rpm/mondo.spec (modified) (1 diff)
• src/restore-scripts/Makefile.am (modified) (1 diff)
• src/restore-scripts/mondo/label-partitions-as-necessary (modified) (2 diffs)

trunk/mondo/configure.in

@@ -18 +18 @@
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE([mondo], MONDO_VER)
+AM_INIT_AUTOMAKE([src], MONDO_VER)
 AM_MAINTAINER_MODE
 

trunk/mondo/distributions/rpm/mondo.spec

@@ -19 +19 @@
 ExcludeArch:    ppc
 OBS
-Requires:   mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
+Requires:   mindi >= 1.2.0, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 %ifarch ia64
 Requires:   elilo, parted

trunk/mondo/src/restore-scripts/Makefile.am

@@ -1 @@
-SUBDIRS = mondo usr
+SUBDIRS = src usr
 
 restoreetcdir       = $(pkgdatadir)/restore-scripts/etc

trunk/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -1 +1 @@
 #!/bin/sh
 #
-# 09/05
-# - replaced 'grep -w' with 'grep " $.. "'
+# $Id$
 #
-# 06/11
-# - added support for 5th column, for labels
-#
-# 02/02/2003
-# - something
-#
-# mid-2001
-# - first written
 ############################################
 
 
-#LogIt() {
-#    echo "$1" >> /dev/stderr
-#}
-
- 
 read_partition_line() {
     local tmp label mountpt mountline command format
@@ -34 +20 @@
             LogIt "Not labeling $mountpt as anything because $label is not a label"
         else
-            command="e2label $mountpt $label"
             if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
-                LogIt "Running '$command'"
+                command="e2label $mountpt $label"
+                LogIt "Running $command"
                 $command
+            elif [ "$format" = "swap" ] ; then
+                command="mkswap -L $label $mountpt"
+                LogIt "Running $command"
             else
-                LogIt "I am NOT going to run '$command': the partition is format '$format', which doesn't like e2label anyway"
+                LogIt "I am NOT going to run e2label: the partition is format '$format', which doesn't like e2label anyway"
             fi
     fi