Changeset 3542


Ignore:
Timestamp:
Mar 24, 2016, 5:48:03 PM (20 months ago)
Author:
bruno
Message:
  • Rename all mondorestore scripts with the mr- prefix and adapt callers
  • Place these scripts in /usr/bin on the restore media
  • Fix a mindi bug where these scripts were not copied anymore with previous modifications around removal of cd
Location:
branches/3.2
Files:
1 deleted
8 edited
16 moved

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3541 r3542  
    21422142    fi
    21432143    if [ -e "$MONDO_SHARE/restore-scripts" ]; then
    2144         cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
     2144        cp -Rdf $MONDO_SHARE/restore-scripts/* $bigdir/usr/bin 2>> $LOGFILE
    21452145        [ $? -ne 0 ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
    21462146    fi
    21472147    if [ -d "/lib/dev-state" ]; then
    2148         cp -a /lib/dev-state ./lib/ 2>> $MINDI_TMP/$$.log || LogAll "ERROR: Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     2148        cp -a /lib/dev-state $bigdir/lib/ 2>> $MINDI_TMP/$$.log || LogAll "ERROR: Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
    21492149    fi
    21502150    TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
     
    22632263                LogFile "INFO: Copying $LDLINUXE64 to $efidir"
    22642264                cp $LDLINUXE64 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
     2265                cp $LDLINUXE64/../libutil.c32 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
    22652266            fi
    22662267        fi
  • branches/3.2/mindi/rootfs/etc/init.d/rcS

    r3526 r3542  
    11291129        LogIt "Executing final script $post"
    11301130        if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
    1131             mount-me
     1131            mr-mount-me
    11321132        fi
    11331133        chmod 755 $post
    11341134        $post
    11351135        if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
    1136             unmount-me
     1136            mr-unmount-me
    11371137        fi
    11381138    fi
  • branches/3.2/mindi/rootfs/usr/sbin/post-init

    r3279 r3542  
    5050fi
    5151
    52 for i in mount-me unmount-me mondorestore ; do
     52for i in mr-mount-me mr-unmount-me mondorestore ; do
    5353    if which $i > /dev/null 2> /dev/null ; then
    5454        LogIt "$i found"
  • branches/3.2/mondo-doc/mondorescue-howto.sgml

    r3527 r3542  
    19601960<row>
    19611961<entry>
    1962         bash# mount-me
     1962        bash# mr-mount-me
    19631963</entry>
    19641964</row>
     
    19841984<row>
    19851985<entry>
    1986         bash# unmount-me
     1986        bash# mr-unmount-me
    19871987
    19881988</entry>
  • branches/3.2/mondo/src/mondorestore/mondo-prep.c

    r3531 r3542  
    14731473
    14741474    // mark relevant partition as bootable
    1475     mr_asprintf(tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
     1475    mr_asprintf(tmp1,"mr-make-me-bootable /tmp/mountlist.txt %s",drivename);
    14761476    call_program_and_get_last_line_of_output(tmp1);
    14771477    mr_free(tmp1);
  • branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

    r3439 r3542  
    591591run_program_and_log_output("touch " MNT_RESTORING "/var/log/pacct", FALSE);
    592592run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct", FALSE);
    593 if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {
     593if (run_program_and_log_output("ls -al " MNT_RESTORING " /tmp", FALSE)) {
    594594    run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp", FALSE);
    595595}
     
    13991399            /*  Only try to adapt grub here first if the mountlist wasn't changed before */
    14001400            if (! mntlistchg) {
    1401                 mr_asprintf(command, "stabgrub-me %s", boot_device);
     1401                mr_asprintf(command, "mr-stabgrub-me %s", boot_device);
    14021402                res = run_program_and_log_output(command, 1);
    14031403                mr_free(command);
     
    14441444                    newtResume();
    14451445                }
    1446                 mr_asprintf(command, "stabgrub-me %s", boot_device);
     1446                mr_asprintf(command, "mr-stabgrub-me %s", boot_device);
    14471447                res = run_program_and_log_output(command, 1);
    14481448                mr_free(command);
     
    14631463    } else {
    14641464        /* nuke mode */
    1465         if (!run_program_and_log_output("which grub-MR", FALSE)) {
    1466             log_msg(1, "Yay! grub-MR found...");
    1467             mr_asprintf(command, "grub-MR %s /"MOUNTLIST_FNAME_STUB, boot_device);
     1465        if (!run_program_and_log_output("which mr-grub", FALSE)) {
     1466            log_msg(1, "Yay! mr-grub found...");
     1467            mr_asprintf(command, "mr-grub %s /"MOUNTLIST_FNAME_STUB, boot_device);
    14681468            log_msg(1, "command = %s", command);
    14691469        } else {
    14701470            // Or grub2-install
    14711471            mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
    1472             log_msg(1, "WARNING - grub-MR not found; using grub-install");
     1472            log_msg(1, "WARNING - mr-grub not found; using grub-install");
    14731473        }
    14741474        mvaddstr_and_log_it(g_currentY, 0, "Running GRUB...                                                 ");
     
    14891489            ("GRUB ran w/error(s). See %s for more info.", MONDO_LOGFILE);
    14901490        log_msg(1, "Type:-");
    1491         log_msg(1, "    mount-me");
     1491        log_msg(1, "    mr-mount-me");
    14921492        log_msg(1, "    chroot " MNT_RESTORING);
    14931493        log_msg(1, "    mount /boot");
    14941494        log_msg(1, "    grub-install '(hd0)'");
    14951495        log_msg(1, "    exit");
    1496         log_msg(1, "    unmount-me");
     1496        log_msg(1, "    mr-unmount-me");
    14971497        log_msg(1,
    14981498                "If you're really stuck, please e-mail the mailing list.");
     
    15331533                            0,
    15341534                            "Modifying fstab and elilo.conf...                             ");
    1535         mr_asprintf(command, "stabelilo-me");
     1535        mr_asprintf(command, "mr-stabelilo-me");
    15361536        res = run_program_and_log_output(command, 3);
    15371537        mr_free(command);
     
    16091609                            0,
    16101610                            "Modifying fstab and lilo.conf, and running LILO...                             ");
    1611         mr_asprintf(command, "stablilo-me");
     1611        mr_asprintf(command, "mr-stablilo-me");
    16121612        res = run_program_and_log_output(command, 3);
    16131613        mr_free(command);
     
    17351735            }
    17361736            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
    1737             mr_asprintf(command, "stabraw-me %s", boot_device);
     1737            mr_asprintf(command, "mr-stabraw-me %s", boot_device);
    17381738            res = run_program_and_log_output(command, 3);
    17391739            mr_free(command);
     
    17471747    } else {
    17481748        /* nuke mode */
    1749         mr_asprintf(command, "raw-MR %s /"MOUNTLIST_FNAME_STUB, boot_device);
     1749        mr_asprintf(command, "mr-raw %s /"MOUNTLIST_FNAME_STUB, boot_device);
    17501750        log_msg(2, "run_raw_mbr() --- command='%s'", command);
    17511751
  • branches/3.2/mondo/src/mondorestore/mondorestore.c

    r3510 r3542  
    20452045            mr_asprintf(fstab_fname, "/tmp/fstab");
    20462046        }
    2047         mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
     2047        mr_asprintf(tmp1, "mr-label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
    20482048        mr_free(fstab_fname);
    20492049
     
    20512051        mr_free(tmp1);
    20522052        if (res) {
    2053             log_to_screen("label-partitions-as-necessary returned an error");
     2053            log_to_screen("mr-label-partitions-as-necessary returned an error");
    20542054            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    20552055        } else {
     
    21912191    mvaddstr_and_log_it(g_currentY, 0, "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
    21922192
    2193     mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", "/tmp/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     2193    mr_asprintf(tmp1, "mr-label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", "/tmp/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
    21942194    res = run_program_and_log_output(tmp1, TRUE);
    21952195    mr_free(tmp1);
    21962196    if (res) {
    2197         log_to_screen("label-partitions-as-necessary returned an error");
     2197        log_to_screen("mr-label-partitions-as-necessary returned an error");
    21982198        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    21992199    } else {
  • branches/3.2/mondo/src/restore-scripts/mondo/Makefile.am

    r3450 r3542  
    11restoremondodir = $(pkgdatadir)/restore-scripts/mondo
    2 restoremondo_SCRIPTS = grub-MR hack-fstab hack-grub hack-lilo hack-elilo \
    3                         label-partitions-as-necessary \
    4                         make-me-bootable mount-me mount-subroutine-me raw-MR \
    5                         stabgrub-me stablilo-me stabelilo-me \
    6                         stabraw-me unmount-me unmount-subroutine-me
     2restoremondo_SCRIPTS = mr-grub mr-hack-fstab mr-hack-lilo mr-hack-elilo \
     3                        mr-label-partitions-as-necessary \
     4                        mr-make-me-bootable mr-mount-me mr-mount-subroutine-me mr-raw \
     5                        mr-stabgrub-me mr-stablilo-me mr-stabelilo-me \
     6                        mr-stabraw-me mr-unmount-me mr-unmount-subroutine-me
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-grub

    r3541 r3542  
    33# $Id$
    44#
    5 # grub-MR ------ a rudimentary replacement for grub-install
     5# mr-grub ------ a rudimentary replacement for grub-install
    66#
    77#
     
    9393
    9494if [ "$#" -ne "2" ] ; then
    95     Die "grub-MR <boot drive> <mountlist filename>; e.g. grub-MR /dev/hda /tmp/mountlist.txt"
     95    Die "mr-grub <boot drive> <mountlist filename>; e.g. mr-grub /dev/hda /tmp/mountlist.txt"
    9696fi
    9797[ ! -f "$2" ] && Die "mountlist file not found"
     
    191191# ---------------------------------
    192192
    193 echo "Now I'll use grub-install.patched" >> $LOGFILE
    194 cp -f `which grub-install.patched` /mnt/RESTORING/sbin
    195 chroot /mnt/RESTORING grub-install.patched $1 >> $LOGFILE 2>> $LOGFILE
     193echo "Now I'll use mr-grub-install.patched" >> $LOGFILE
     194cp -f `which mr-grub-install.patched` /mnt/RESTORING/sbin
     195chroot /mnt/RESTORING mr-grub-install.patched $1 >> $LOGFILE 2>> $LOGFILE
    196196res=$?
    197 echo "grub-install.patched returned $res" >> $LOGFILE
     197echo "mr-grub-install.patched returned $res" >> $LOGFILE
    198198[ "$res" -eq "0" ] && exit 0
    199199
     
    220220[ "$res" -eq "0" ] && exit 0
    221221
    222 echo "grub-MR returned res=$res" >> $LOGFILE
     222echo "mr-grub returned res=$res" >> $LOGFILE
    223223
    224224exit $res
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-hack-fstab

    r3541 r3542  
    110110# ----------------- main ---------------
    111111
    112 LogIt "hack-fstab --- starting"
     112LogIt "mr-hack-fstab --- starting"
    113113
    114114if [ "$#" -ne "4" ] ; then
    115     LogIt "hack-fstab <old mountlist> <old fstab> <new mountlist> <new fstab>" 1
     115    LogIt "mr-hack-fstab <old mountlist> <old fstab> <new mountlist> <new fstab>" 1
    116116    LogIt "NB: the new fstab file is outgoing; all other files are incoming." 1
    117117    exit 1
    118118fi
    119119
    120 LogIt "hack-fstab '$1' '$2' '$3' '$4'"
     120LogIt "mr-hack-fstab '$1' '$2' '$3' '$4'"
    121121
    122122old_mountlist=$1
     
    141141
    142142LogIt "Finished writing to outfile ($outfile)"
    143 LogIt "hack-fstab --- leaving"
     143LogIt "mr-hack-fstab --- leaving"
    144144exit 0
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-hack-lilo

    r3541 r3542  
    111111# ------------------ main ------------------
    112112
    113 LogIt "hack-lilo --- starting"
     113LogIt "mr-hack-lilo --- starting"
    114114
    115115bootlistfile=/tmp/partitions-to-make-bootable.txt
     
    117117
    118118if [ "$#" -ne "6" ] ; then
    119     LogIt "hack-lilo <old mountlist> <old fstab> <old lilo> <new mountlist> <new fstab> <new lilo>" 1
     119    LogIt "mr-hack-lilo <old mountlist> <old fstab> <old lilo> <new mountlist> <new fstab> <new lilo>" 1
    120120    LogIt "NB: the new lilo file is outgoing; all others are incoming." 1
    121121    exit 1
     
    134134sort -u $bootlistfile -o $bootlistfile
    135135
    136 #------ disabled 12/10/01 (doesn't do anything anyway *g*)
    137 #make-me-bootable $bootlistfile > /tmp/make-me-bootable.log 2> /tmp/make-me-bootable.log
    138 
    139 LogIt "hack-lilo --- leaving"
     136LogIt "mr-hack-lilo --- leaving"
    140137exit 0
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-label-partitions-as-necessary

    r3541 r3542  
    106106LogIt "Identifying your drives with FS tune tool"
    107107if [ "$#" -ne "1" ] ; then
    108     LogIt "label-partitions-as-necessary /tmp/mountlist.txt < /tmp/fstab.new" 1
     108    LogIt "mr-label-partitions-as-necessary /tmp/mountlist.txt < /tmp/fstab.new" 1
    109109    exit 1
    110110fi
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-make-me-bootable

    r3541 r3542  
    11#!/bin/sh
     2#
     3# $Id$
     4#
    25
    36
    47if [ "$#" -ne "2" ] && [ "$#" -ne "3" ] ; then
    5     echo "make-me-bootable <fname> <drive> [noaction]"
     8    echo "mr-make-me-bootable <fname> <drive> [noaction]"
    69    exit 1
    710fi
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-mount-me

    r3541 r3542  
    11#!/bin/sh
     2#
     3# $Id$
     4#
    25
    36mountlist=/tmp/mountlist.txt
    47
    58if [ "$#" -ne "0" ] ;then
    6     echo "mount-me <no params>"
     9    echo "mr-mount-me <no params>"
    710    echo "...mountlist is assumed to be at $mountlist"
    811    exit 1
     
    1922    grep " $i " $mountlist >> $mountlist.sorted
    2023done
    21 mount-subroutine-me < $mountlist.sorted
     24mr-mount-subroutine-me < $mountlist.sorted
    2225exit $?
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-mount-subroutine-me

    r3541 r3542  
    11#!/bin/sh
     2#
     3# $Id$
     4#
    25
    3 LogIt "mount-subroutine-me --- starting"
     6LogIt "mr-mount-subroutine-me --- starting"
    47if [ "$#" -ne "0" ] ; then
    5     LogIt "mount-subroutine-me < mountlist" 1
     8    LogIt "mr-mount-subroutine-me < mountlist" 1
    69    exit 1
    710fi
    811
    912# ----------- mount partitions to be restored to --------------
    10 
    11 #echo "START mount-me"
    1213
    1314errors=0
     
    6465fi
    6566
    66 LogIt "mount-subroutine-me --- leaving"
     67LogIt "mr-mount-subroutine-me --- leaving"
    6768exit $errors
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-raw

    r3541 r3542  
    11#!/bin/sh
     2#
     3# $Id$
     4#
    25
    36if [ "$#" -lt "1" ] ; then
    4     echo "raw-MR <dev>" >> /dev/stderr
     7    echo "mr-raw <dev>" >> /dev/stderr
    58    exit 1
    69fi
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-stabelilo-me

    r3541 r3542  
    66QuitIfNotFound() {
    77    if [ ! -f "$1" ] ; then
    8     LogIt "(stabelilo-me) Where's $1? I cannot continue." 1
     8    LogIt "(mr-stabelilo-me) Where's $1? I cannot continue." 1
    99    exit 1
    1010    fi
     
    130130# --------------------------------- main -------------------------------
    131131
    132 LogIt "stabelilo-me --- starting"
     132LogIt "mr-stabelilo-me --- starting"
    133133LocateOldFstab
    134134LocateOldElilo
     
    150150LogIt "Modifying fstab..." 2
    151151outval=0
    152 hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
     152mr-hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
    153153res=$?
    154154if [ "$res" -ne "0" ] ; then
    155     echo "Warning - hack-fstab failed"
     155    echo "Warning - mr-hack-fstab failed"
    156156    outval=$(($outval+$res))
    157157fi
    158158   
    159159LogIt "Modifying elilo.conf. Please wait..." 2
    160 hack-elilo $old_mountlist $old_fstab $old_liloconf $new_mountlist $new_fstab $new_liloconf
     160mr-hack-elilo $old_mountlist $old_fstab $old_liloconf $new_mountlist $new_fstab $new_liloconf
    161161res=$?
    162162outval=$(($outval+$res))
     
    189189    LogIt "/etc/fstab and /etc/elilo.conf were modified ok." 3
    190190fi
    191 LogIt "stabelilo-me --- leaving"
     191LogIt "mr-stabelilo-me --- leaving"
    192192exit $outval
    193193
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-stabgrub-me

    r3541 r3542  
    88QuitIfNotFound() {
    99    if [ ! -f "$1" ] ; then
    10         LogIt "(stabgrub-me) Where's $1? I cannot continue." 1
     10        LogIt "(mr-stabgrub-me) Where's $1? I cannot continue." 1
    1111        exit 1
    1212    fi
     
    8787
    8888
    89 BEFORE=stabgrub-me.PRE
     89BEFORE=mr-stabgrub-me.PRE
    9090
    9191MakeBackups() {
     
    113113
    114114if [ "$#" -ne "1" ] ; then
    115     LogIt "stabgrub-me </dev/bootdrive>"
     115    LogIt "mr-stabgrub-me </dev/bootdrive>"
    116116    exit 1
    117117fi
     
    119119bootdrive=$1
    120120
    121 LogIt "stabgrub-me '$1' --- starting"
     121LogIt "mr-stabgrub-me '$1' --- starting"
    122122LocateOldFstab
    123123LocateOldGrub
     
    147147LogIt "where_they_live = $where_they_live"
    148148
    149 LogIt "Calling hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab"
     149LogIt "Calling mr-hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab"
    150150
    151151outval=0
    152 hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
     152mr-hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
    153153res=$?
    154154if [ "$res" -ne "0" ] ; then
    155     LogIt "Warning - hack-fstab failed"
     155    LogIt "Warning - mr-hack-fstab failed"
    156156    outval=$(($outval+$res))
    157157else
    158     LogIt "Back from hack-fstab OK" 1
     158    LogIt "Back from mr-hack-fstab OK" 1
    159159fi
    160160
     
    183183#    cd ..
    184184    LogIt "Running grub..." 2
    185     LogIt "grub-MR $bootdrive $new_mountlist"
    186     grub-MR $bootdrive $new_mountlist >> $LOGFILE 2>> $LOGFILE
     185    LogIt "mr-grub $bootdrive $new_mountlist"
     186    mr-grub $bootdrive $new_mountlist >> $LOGFILE 2>> $LOGFILE
    187187    grub_res=$?
    188188    if [ "$grub_res" -ne "0" ] ; then
    189         LogIt "grub-MR failed. Running grub-install..."
     189        LogIt "mr-grub failed. Running grub-install..."
    190190        chroot /mnt/RESTORING grub-install '(hd0)' >> $LOGFILE 2>> $LOGFILE
    191191        grub_res=$?
    192192    else
    193         LogIt "grub-MR ran ok." 2
     193        LogIt "mr-grub ran ok." 2
    194194    fi
    195195    if [ "$grub_res" -ne "0" ] ; then
     
    217217    LogIt "/etc/fstab was modified ok. GRUB ran ok.                      "
    218218fi
    219 LogIt "stabgrub-me --- leaving"
     219LogIt "mr-stabgrub-me --- leaving"
    220220echo -en "\n\n\n"
    221221exit $outval
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-stablilo-me

    r3541 r3542  
    11#!/bin/sh
    22#
     3# $Id$
    34#
    4 # 2003/04/09
    5 # - changed new_* paths from /tmp to /mnt/RESTORING/etc
    6 #
    7 #
    8 # created in mid-2002?
    9 ######################################################################
    10 
    115
    126
    137QuitIfNotFound() {
    148    if [ ! -f "$1" ] ; then
    15     LogIt "(stablilo-me) Where's $1? I cannot continue." 1
     9    LogIt "(mr-stablilo-me) Where's $1? I cannot continue." 1
    1610    exit 1
    1711    fi
     
    9993# --------------------------------- main -------------------------------
    10094
    101 LogIt "stablilo-me --- starting"
     95LogIt "mr-stablilo-me --- starting"
    10296LocateOldFstab
    10397old_mountlist=/tmp/mountlist.original
     
    118112LogIt "Modifying fstab..." 2
    119113outval=0
    120 hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
     114mr-hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
    121115res=$?
    122116if [ "$res" -ne "0" ] ; then
    123     echo "Warning - hack-fstab failed"
     117    echo "Warning - mr-hack-fstab failed"
    124118    outval=$(($outval+$res))
    125119fi
    126120   
    127121LogIt "Modifying lilo.conf. Please wait..." 2
    128 hack-lilo $old_mountlist $old_fstab $old_liloconf $new_mountlist $new_fstab $new_liloconf
     122mr-hack-lilo $old_mountlist $old_fstab $old_liloconf $new_mountlist $new_fstab $new_liloconf
    129123res=$?
    130124outval=$(($outval+$res))
     
    170164    LogIt "/etc/fstab and /etc/lilo.conf were modified ok. LILO ran ok." 3
    171165fi
    172 LogIt "stablilo-me --- leaving"
     166LogIt "mr-stablilo-me --- leaving"
    173167exit $outval
    174168
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-stabraw-me

    r3541 r3542  
    88QuitIfNotFound() {
    99    if [ ! -f "$1" ] ; then
    10     LogIt "(stabraw-me) Where's $1? I cannot continue." 1
     10    LogIt "(mr-stabraw-me) Where's $1? I cannot continue." 1
    1111    exit 1
    1212    fi
     
    7474
    7575if [ "$#" -ne "1" ] ; then
    76     LogIt "stabraw-me </dev/bootdrive>"
     76    LogIt "mr-stabraw-me </dev/bootdrive>"
    7777    exit 1
    7878fi
     
    8080bootdrive=$1
    8181
    82 LogIt "stabraw-me --- starting"
     82LogIt "mr-stabraw-me --- starting"
    8383LocateOldFstab
    8484old_mountlist=/tmp/mountlist.original
     
    9696LogIt "Modifying fstab..." 2
    9797outval=0
    98 hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
     98mr-hack-fstab $old_mountlist $old_fstab $new_mountlist $new_fstab
    9999res=$?
    100100if [ "$res" -ne "0" ] ; then
    101     echo "Warning - hack-fstab failed"
     101    echo "Warning - mr-hack-fstab failed"
    102102    outval=$(($outval+$res))
    103103fi
     
    119119    cd $where_they_live
    120120    cd ..
    121     raw-MR $bootdrive
     121    mr-raw $bootdrive
    122122    mbr_res=$?
    123123    if [ "$mbr_res" -ne "0" ] ; then
     
    138138    LogIt "/etc/fstab was modified ok; mbr was installed ok, too.       "
    139139fi
    140 LogIt "stabraw-me --- leaving"
     140LogIt "mr-stabraw-me --- leaving"
    141141echo -en "\n\n\n"
    142142exit $outval
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-unmount-me

    r3541 r3542  
    11#!/bin/sh
     2#
     3# $Id$
     4#
    25
    36mountlist=/tmp/mountlist.txt
    47
    58if [ "$#" -ne "0" ] ;then
    6     echo "unmount-me <no params>"
     9    echo "mr-unmount-me <no params>"
    710    echo "...mountlist is assumed to be at $mountlist"
    811    exit 1
    912fi
    1013
    11 #unmount-subroutine-me < $mountlist
    12 #unmount-subroutine-me < $mountlist
    13 
    14 #for j in 1 2 ; do
    1514for i in `mount | grep /mnt/RESTORING | cut -d' ' -f3 | sort -r`; do
    1615    umount $i
  • branches/3.2/mondo/src/restore-scripts/mondo/mr-unmount-subroutine-me

    r3541 r3542  
    11#!/bin/sh
     2#
     3# $Id$
     4#
    25
    3 LogIt "unmount-subroutine-me --- starting"
     6LogIt "mr-unmount-subroutine-me --- starting"
    47if [ "$#" -ne "0" ] ; then
    5     LogIt "unmount-subroutine-me < mountlist" 1
     8    LogIt "mr-unmount-subroutine-me < mountlist" 1
    69    exit 1
    710fi
     
    6669fi
    6770
    68 LogIt "unmount-subroutine-me --- leaving (retval=$retval)"
     71LogIt "mr-unmount-subroutine-me --- leaving (retval=$retval)"
    6972exit $retval
    7073
Note: See TracChangeset for help on using the changeset viewer.