Changeset 1579 in MondoRescue for branches/2.2.5

Timestamp:

Jul 27, 2007, 1:19:42 AM (17 years ago)

Author:

Bruno Cornec

Message:

Remove the useless modify_rclocal_one_time

Location:

branches/2.2.5/mondo/src/mondorestore

Files:

• mondo-restore.c (modified) (2 diffs)
• mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (1 diff)
• mondo-rstr-tools.h (modified) (1 diff)

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -614 +614 @@
     clean_blkid(bkpinfo);
     protect_against_braindead_sysadmins();
-    //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
     retval += unmount_all_devices(mountlist);
     /*  if (restore_some || restore_all || */
@@ -853 +852 @@
     clean_blkid(bkpinfo);
     protect_against_braindead_sysadmins();
-    //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
     retval += unmount_all_devices(mountlist);
     mvaddstr_and_log_it(g_currentY,

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -8 +8 @@
 extern int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
 extern void kill_petris(void);
-extern int modify_rclocal_one_time(char *path);
 extern int mount_cdrom(struct s_bkpinfo *bkpinfo);
 extern int mount_all_devices(struct mountlist_itself *, bool);

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

@@ -526 +526 @@
 *END_KILL_PETRIS                                                         *
 **************************************************************************/
-
-
-/**
-* (Disabled) Modify rc.local to fix some things on first boot.
-* This function currently doesn't do anything except make sure /tmp has the
-* right permissions.
-* @param path The path to /etc on the user's filesystem.
-* @return 0 for success, nonzero for failure.
-*/
-int modify_rclocal_one_time(char *path)
-{
-/** malloc **/
-char *rclocal_fname;
-char *newfile_fname;
-char *tmp;
-
-malloc_string(rclocal_fname);
-malloc_string(newfile_fname);
-malloc_string(tmp);
-assert_string_is_neither_NULL_nor_zerolength(path);
-
-sprintf(rclocal_fname, "%s/rc.local", path);
-
-//  sprintf(tmp, "chmod 1777 %s/tmp", MNT_RESTORING);
-//  run_program_and_log_output( tmp, FALSE );
-return (0);                 /* remove this line to open the floodgates... */
-
-if (!does_file_exist(rclocal_fname)) {
-sprintf(rclocal_fname, "%s/rc.d/rc.local", path);
-}
-if (!does_file_exist(rclocal_fname)) {
-paranoid_free(rclocal_fname);
-paranoid_free(newfile_fname);
-paranoid_free(tmp);
-return (1);
-}
-sprintf(newfile_fname, "%s/rc.local.mondorescue", path);
-sprintf(tmp, "grep mondorescue %s > /dev/null 2> /dev/null",
-    rclocal_fname);
-if (system(tmp)) {
-sprintf(tmp, "echo \"[ -e %s ] && %s\n\" >> %s",
-        newfile_fname, newfile_fname, rclocal_fname);
-
-paranoid_system(tmp);
-}
-sprintf(tmp, "echo -en \"#!/bin/sh\
-\\n\
-\\n\
-grep -v mondorescue %s > %s\\n\
-rm -f /var/lock/subsys/*xfs*\\n\
-rm -f /var/run/xfs.*\\n\
-killall xfs\\n\
-service xfs start\\n\
-yes | rm -f %s\\n\
-\" > %s", rclocal_fname, rclocal_fname, newfile_fname, newfile_fname);
-sprintf(tmp, "chmod +x \"%s\"", newfile_fname);
-run_program_and_log_output(tmp, FALSE);
-paranoid_free(rclocal_fname);
-paranoid_free(newfile_fname);
-paranoid_free(tmp);
-return (0);
-}
-
-/**************************************************************************
-*END_ MODIFY_RCLOCAL_ONE_TIME                                            *
-**************************************************************************/
-
-
-
 
 

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -8 +8 @@
 int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
 void kill_petris(void);
-int modify_rclocal_one_time(char *path);
 int mount_cdrom(struct s_bkpinfo *bkpinfo);
 int mount_device(char *, char *, char *, bool);