Changeset 3278 in MondoRescue for branches/3.2/mondo

Timestamp:

Apr 30, 2014, 12:30:11 PM (10 years ago)

Author:

Bruno Cornec

Message:

• File KEYMAP-LIVES-HERE, USING-* not used anymore
• Nomalize name usinf iso-dir and ISO-DIR where relevant
• config entry netfs-server-path not used anymore (iso-dir instead when needed)
• In network restore mode, also have the extended boot messages
• Manages grub2 version string as grub 1 was

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-files.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (6 diffs)
• common/mondostructures.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (5 diffs)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -684 +684 @@
         }
         mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
+        if (strcmp(bootldr_ver,"") ==0) {
+            mf_free(bootldr_ver);
+            mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub2-install --version"));
+        }
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(bootldr_str, "ELILO");

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -2501 +2501 @@
             strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
         } else {
+            // Why netfsdir ?
             sprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);

branches/3.2/mondo/src/common/libmondo-files.c

@@ -1086 +1086 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c netfs_mount
- * - @c netfs_remote_dir
  * - @c tmpdir
  */
@@ -1095 +1094 @@
     char *netfs_dev = NULL;
     char *netfs_client_hwaddr = NULL;
-    char *netfs_mount = NULL;
-    char *netfs_client_ipaddr = NULL;
-    char *netfs_client_netmask = NULL;
-    char *netfs_client_broadcast = NULL;
-    char *netfs_client_defgw = NULL;
-    char *netfs_server_ipaddr = NULL;
-    char *tmp = NULL;
     char *command = NULL;
-
-    /*@ pointers ***** */
-    char *p;
-
-    if (bkpinfo->netfs_mount == NULL) {
-        fatal_error("No netfs_mount found !");
-    }
-
-    log_it("Storing Network configuration");
 
     /********

branches/3.2/mondo/src/common/libmondo-tools.c

@@ -351 +351 @@
     char *mondo_mkisofs_sz = NULL;
     char *command = NULL;
-    char *hostname = NULL;
     char *isofs_cmd = NULL;
-    char *ip_address = NULL;
     int retval = 0;
-    char *colon;
     char *cdr_exe = NULL;
     char *tmp = NULL;
@@ -362 +359 @@
     char *iso_mnt = NULL;
     char *iso_tmp = NULL;
-    char *iso_path = NULL;
-    char *cfg_fname = NULL;
+    char *iso_dir = NULL;
 
     assert(bkpinfo != NULL);
@@ -532 +528 @@
     if (bkpinfo->backup_media_type == iso) {
 
-/* Patch by Conor Daly <conor.daly@met.ie> 
- * 23-june-2004
- * Break up isodir into iso_mnt and iso_path
+/* Break up isodir into iso_mnt and iso_dir
  * These will be used along with iso-dev at restore time
  * to locate the ISOs where ever they're mounted
@@ -560 +554 @@
         mr_free(command);
 
-        log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
+        log_it("iso_mnt: %s, %d", iso_mnt, strlen(iso_mnt));
         mr_asprintf(iso_tmp, "%s", bkpinfo->isodir);
         if (strlen(iso_tmp) < strlen(iso_mnt)) {
-            mr_asprintf(iso_path, "%s", "");
+            mr_asprintf(iso_dir, "%s", "");
         } else {
-            // If iso_mnt is only / then iso_path is the full dir
+            // If iso_mnt is only / then iso_dir is the full dir
             // (the formula bellow doesn't work in this case)
             if (strcmp(iso_mnt, "/") == 0) {
-                mr_asprintf(iso_path, "%s", iso_tmp);
+                mr_asprintf(iso_dir, "%s", iso_tmp);
             // else it's a part of iso_tmp
             } else {
-                mr_asprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
+                mr_asprintf(iso_dir, "%s", iso_tmp + strlen(iso_mnt));
             }
         }
@@ -577 +571 @@
         mr_free(iso_tmp);
 
-        mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, iso_path);
-        mr_free(tmp);
-
-        log_it("isodir: %s", iso_path);
-        mr_free(iso_path);
+        mr_asprintf(tmp, "%s/ISO-DIR", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_dir);
+        mr_free(tmp);
+
+        log_it("iso-dir: %s", iso_dir);
+        mr_free(iso_dir);
 
         mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
@@ -596 +590 @@
         mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, bkpinfo->prefix);
+        mr_free(tmp);
+
+        mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->isodir);
+        mr_free(tmp);
+
+        mr_asprintf(tmp, "%s/ISO-DIR", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
         mr_free(tmp);
 

branches/3.2/mondo/src/common/mondostructures.h

@@ -455 +455 @@
    * The directory we're backing up to.
    * If backup_media_type is @b iso, then this is that directory.
+   * If backup_media_type is @b netfs, then this is the directory where the share is mounted.
    * If backup_media_type is anything else, this is ignored.
    */

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -267 +267 @@
         strcpy(bkpinfo->isodir, "/");
     }
-    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
+    // TODO: Are we shure it does what it's expected to do here ?
+    if (does_file_exist("/tmp/NETFS-SERVER-MOUNT")) {
         strcpy(isodir_device, last_line_of_file("/tmp/NETFS-SERVER-MOUNT"));
         strcpy(isodir_format, "netfs");
-        strcpy(bkpinfo->isodir, last_line_of_file("/tmp/NETFS-SERVER-PATH"));
+        strcpy(bkpinfo->isodir, last_line_of_file("/tmp/ISO-DIR"));
     }
     if (nuke_me_please) {
@@ -276 +277 @@
     }
 
-    if (popup_and_get_string
-        ("ISO Mode - device", "On what device do the ISO files live?",
-         isodir_device, MAX_STR_LEN / 4)) {
-        if (popup_and_get_string
-            ("ISO Mode - format",
-             "What is the disk format of the device? (Hit ENTER if you don't know.)",
-             isodir_format, 16)) {
+    if (popup_and_get_string("ISO Mode - device", "On what device do the ISO files live?", isodir_device, MAX_STR_LEN / 4)) {
+        if (popup_and_get_string ("ISO Mode - format", "What is the disk format of the device? (Hit ENTER if you don't know.)", isodir_format, 16)) {
             if (popup_with_buttons("Are you restoring from an external hard drive ?", "Yes", "No")) {
                 HDD = TRUE;
             }
-            if (popup_and_get_string
-                ("ISO Mode - path",
-                "At what path on this device can the ISO files be found ?",
-                bkpinfo->isodir, MAX_STR_LEN / 4)) {
+            if (popup_and_get_string ("ISO Mode - path", "At what path on this device can the ISO files be found ?", bkpinfo->isodir, MAX_STR_LEN / 4)) {
                 strip_spaces(isodir_device);
                 strip_spaces(isodir_format);
@@ -327 +320 @@
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
 if (bkpinfo->disaster_recovery) {
-    /* Patch Conor Daly 26-june-2004 
-    * Don't let this clobber an existing bkpinfo->isodir */
+    /* Don't let this clobber an existing bkpinfo->isodir */
     if (!bkpinfo->isodir[0]) {
         strcpy(bkpinfo->isodir, "/tmp/isodir");
     }
-    /* End patch */
     mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
     run_program_and_log_output(command, 5);
@@ -865 +856 @@
         mr_free(bkpinfo->netfs_mount);
         mr_asprintf(bkpinfo->netfs_mount, "%s", value);
-
-        read_cfg_var(cfg_file, "netfs-server-path", value);
+        if (bkpinfo->netfs_mount != NULL) {
+            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        }
+
+        read_cfg_var(cfg_file, "iso-dir", value);
         mr_free(bkpinfo->netfs_remote_dir);
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", value);
-
-        if (bkpinfo->netfs_mount != NULL) {
-            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
-        }
         if (bkpinfo->netfs_remote_dir != NULL) {
             log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
         }
+
         if (bkpinfo->netfs_proto != NULL) {
             log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
@@ -907 +898 @@
     mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
     read_cfg_var(cfg_file, "iso-mnt", iso_mnt);
-    read_cfg_var(cfg_file, "isodir", iso_path);
+    read_cfg_var(cfg_file, "iso-dir", iso_path);
     sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
     if (!bkpinfo->isodir[0]) {

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -702 +702 @@
 //    {
     if (system("umount -d /tmp/isodir 2> /dev/null")) {
-        log_to_screen
-            ("WARNING - unable to unmount device where the ISO files are stored.");
+        log_to_screen("WARNING - unable to unmount device where the ISO files are stored.");
     }
 //    }