Changeset 537 in MondoRescue for trunk/mondo

Timestamp:

May 12, 2006, 2:04:55 AM (18 years ago)

Author:

bcornec

Message:

merge -r 526:534 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (1 diff)
• distributions/conf/mondo.conf (modified) (5 diffs)
• distributions/gentoo/mondo.ebuild (modified) (2 diffs)
• distributions/redhat/changelog (copied) (copied from branches/stable/mondo/distributions/redhat/changelog )
• distributions/redhat/spec.m4 (modified) (1 diff)
• distributions/rpm/mondo-doc.spec (copied) (copied from branches/stable/mondo/distributions/rpm/mondo-doc.spec )
• distributions/rpm/mondo.spec (modified) (1 diff)
• mondo/common/libmondo-conf.c (copied) (copied from branches/stable/mondo/mondo/common/libmondo-conf.c )
• mondo/common/libmondo-conf.h (copied) (copied from branches/stable/mondo/mondo/common/libmondo-conf.h )
• mondo/common/libmondo-msg.c (copied) (copied from branches/stable/mondo/mondo/common/libmondo-msg.c )
• mondo/mondo-makefilelist (deleted)
• mondo/mondoarchive/Makefile.am (modified) (1 diff)
• mondo/test (copied) (copied from branches/stable/mondo/mondo/test )

trunk/mondo/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = 1.7
-SUBDIRS        = mondo po
+SUBDIRS        = m4 mondo po
 man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config.rpath  config.rpath
+EXTRA_DIST = config.rpath mkinstalldirs

trunk/mondo/configure.in

@@ -127 +127 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
 
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile po/Makefile.in m4/Makefile])

trunk/mondo/distributions/conf/mondo.conf

@@ -30 +30 @@
 #
 #  ISO Burning CLI command options
-iso_burning_options="-eject dev=%s speed=%d fs=24m"
+iso_burning_options="-eject dev=%s speed=%d fs=24m driveropts=burnfree"
 
 #
-# ISO Burning Speed
+# ISO Burning Speed (optional)
 #
-iso_burning_speed=1
+#iso_burning_speed=1
 
 #
@@ -62 +62 @@
 
 #
-# prefix for ISO names
+# default prefix for ISO names
 #
 prefix=mondorescue
-
-#
-# Size of the boot image for ia64
-#
-ia64_boot_size=8192
 
 #
@@ -141 +136 @@
 
 #
+# Paths to include onto the backup
+# (white space separated list of paths)
+#
+include_files=""
+
+#
 # Activate semi-graphical mode by default (yes|no)
 #
@@ -147 +148 @@
 #
 # Activate automatic restore (Use with caution) (yes|no)
+# (look at -H option in man page)
 #
 automatic_restore=no
@@ -165 +167 @@
 # Images creation dir
 #
-images_dir="/root/images/mindi"
+images_dir="/var/cache/mondo"

trunk/mondo/distributions/gentoo/mondo.ebuild

@@ -7 +7 @@
 DESCRIPTION="The premier GPL disaster recovery solution."
 HOMEPAGE="http://www.mondorescue.org"
-SRC_URI="ftp://ftp.berlios.de/pub/mondorescue/src/${PN/-rescue/}-${PV}.tgz"
+SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tgz"
 
 LICENSE="GPL-2"
@@ -22 +22 @@
     >=app-arch/bzip2-0.9
     app-cdr/cdrtools
-    >=sys-apps/mindi-1.06
+    >=sys-apps/mindi-1.0.7
     >=dev-libs/newt-0.50
     >=sys-libs/slang-1.4.1

trunk/mondo/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', %{name}-%{version}.tgz)dnl
+define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', %{addreqb})dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Archiving/Archiving)dnl
+define(`GRP', Applications/Archiving)dnl
 dnl OBS is replaced vy what is being obsoleted
 define(`OBS', )dnl

trunk/mondo/distributions/rpm/mondo.spec

@@ -23 +23 @@
 License:    GPL
 Group:      %{grp}
-Url:        http://mondorescue.berlios.de
+Url:        http://www.mondorescue.org
 Source:     %{src}
-BuildRoot:  %{_tmppath}/%{name}-%{version}
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")

trunk/mondo/mondo/mondoarchive/Makefile.am

@@ -2 +2 @@
 ## Process with Automake to generate Makefile.in
 ##
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\"
 
 ## Headers