Changeset 1158 in MondoRescue
- Timestamp:
- Feb 14, 2007, 2:32:50 AM (18 years ago)
- Location:
- branches/stable
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mindi/mindi
r1143 r1158 517 517 echo -en "Adding the following keyboard mapping tables: " 518 518 mkdir -p $bigdir/tmp 519 echo "keymap-lives-here /etc/console/boottime.kmap.gz"> $MINDI_TMP/mondo-restore.cfg519 echo "keymap-lives-here=/etc/console/boottime.kmap.gz" >> $MINDI_TMP/mondo-restore.cfg 520 520 KBDEPTH=0 521 521 mkdir -p $bigdir/etc/console … … 568 568 echo -en "Adding the following keyboard mapping tables: " 569 569 mkdir -p $bigdir/tmp 570 echo "keymap-lives-here $mappath"> $MINDI_TMP/mondo-restore.cfg570 echo "keymap-lives-here=$mappath" >> $MINDI_TMP/mondo-restore.cfg 571 571 KBDEPTH=0 572 572 AddKeyboardMappingFile $mappath … … 2244 2244 # master boot record, too 2245 2245 if [ _"$MONDORESTORECFG" != _"" ]; then 2246 i=`grep bootloader.device $MONDORESTORECFG | cut -d' 2246 i=`grep bootloader.device $MONDORESTORECFG | cut -d'=' -f2 2> /dev/null` 2247 2247 if [ "$i" ] ; then 2248 2248 LogIt "Backing up $i's MBR" … … 3128 3128 echo "-----------------------------------" >> $LOGFILE 3129 3129 3130 CDRECOVERY=`grep use-cdrecovery $MONDORESTORECFG | cut -d' 3131 NOT_BOOT=`grep non-bootable $MONDORESTORECFG | cut -d' 3132 USE_LILO=`grep use-lilo $MONDORESTORECFG | cut -d' 3133 EXCLUDE_DEVS=`grep excluded-devs $MONDORESTORECFG | cut -d' 3134 NFS_DEV=`grep nfs-dev $MONDORESTORECFG | cut -d' 3135 VALUE=`grep image-devs $MONDORESTORECFG | cut -d' 3130 CDRECOVERY=`grep use-cdrecovery $MONDORESTORECFG | cut -d'=' -f2` 3131 NOT_BOOT=`grep non-bootable $MONDORESTORECFG | cut -d'=' -f2` 3132 USE_LILO=`grep use-lilo $MONDORESTORECFG | cut -d'=' -f2` 3133 EXCLUDE_DEVS=`grep excluded-devs $MONDORESTORECFG | cut -d'=' -f2` 3134 NFS_DEV=`grep nfs-dev $MONDORESTORECFG | cut -d'=' -f2` 3135 VALUE=`grep image-devs $MONDORESTORECFG | cut -d'=' -f2` 3136 3136 if [ "$VALUE" = "(null)" ] || [ "$VALUE" = "" ] ; then 3137 3137 IMAGE_DEVS="" -
branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom
r1087 r1158 7 7 for device in /dev/hd? /dev/scd? /dev/rcd? /dev/sr? /dev/cd? /dev/ide/*/*/*/*/cd /dev/scsi/*/*/*/*/cd; do 8 8 [ ! "$SECOND_TRY" ] && LogIt "Trying $device" 9 if [ "`grep "using-cdstream 9 if [ "`grep "using-cdstream=yes" /tmp/mondo-restore.cfg`" ]; then 10 10 pwd=`pwd` 11 11 cd $GROOVY … … 77 77 #mount /dev/fd0u1722 -t ext2 /mnt/floppy 78 78 [ "$1" = "--second-try" ] && exit 1; # don't try to mount floppy drive 79 if [ "`grep "using-cdstream 79 if [ "`grep "using-cdstream=yes" /tmp/mondo-restore.cfg`" ] ; then 80 80 LogIt "Because you are using cdstream, I won't try to mount CD." 81 81 exit 0 -
branches/stable/mindi/rootfs/sbin/hack-cfg-if-necessary
r275 r1158 16 16 LogIt "OK, we've found /mnt/cdrom/archives/*; great." 17 17 18 if ! grep "backup-media-type 18 if ! grep "backup-media-type=iso" /tmp/mondo-restore.cfg ; then 19 19 LogIt "Config file is fine, BTW." 20 20 exit 0 … … 23 23 LogIt "Re-jigging mondo-restore.cfg because you backed up to ISOs and then burned them to CDs" 1 24 24 mv -f /tmp/mondo-restore.cfg /tmp/mrco 25 sed 's/backup-media-type iso/backup-media-typecdr/' /tmp/mrco > /tmp/mondo-restore.cfg25 sed 's/backup-media-type=iso/backup-media-type=cdr/' /tmp/mrco > /tmp/mondo-restore.cfg 26 26 LogIt "Done re-jigging. Yay." 27 27 exit 0 -
branches/stable/mindi/rootfs/sbin/init
r1087 r1158 83 83 LoadKeymap() { 84 84 local fname 85 fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d' 85 fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d'=' -f2 2> /dev/null` 86 86 [ "$fname" = "" ] && return 87 87 if which loadkeys > /dev/null 2> /dev/null ; then … … 101 101 cd $GROOVY 102 102 [ "$1" != "" ] && tapedev=$1 103 [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' 103 [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d'=' -f2` 104 104 # tar -zxf $tapedev 105 105 dd if=$tapedev bs=32k count=1024 | tar -zx … … 107 107 if [ "$res" -eq "0" ] ; then 108 108 grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg 109 echo "media-dev 109 echo "media-dev=$tapedev" >> /tmp/mr.cfg 110 110 cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg 111 111 fi -
branches/stable/mindi/rootfs/sbin/start-nfs
r802 r1158 11 11 12 12 # Get info from config file 13 ipdev=`grep nfs-dev /tmp/mondo-restore.cfg | cut -d' 14 ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg | cut -d' 15 ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg | cut -d' 16 ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg | cut -d' 17 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d' 13 ipdev=`grep nfs-dev /tmp/mondo-restore.cfg | cut -d'=' -f2-` 14 ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg | cut -d'=' -f2-` 15 ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg | cut -d'=' -f2-` 16 ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg | cut -d'=' -f2-` 17 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d'=' -f2-` 18 18 ipconf="" 19 export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' 20 export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' 19 export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d'=' -f2-` 20 export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d'=' -f2-` 21 21 if [ "$imgname" = "" ]; then 22 22 export imgname="mondorescue" 23 23 fi 24 export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' 24 export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d'=' -f2-` 25 25 if [ "$dirimg" = "" ]; then 26 26 export dirimg="/" -
branches/stable/mondo/src/common/libmondo-archive.c
r1155 r1158 794 794 mr_fprintf(fd, "mindi_use_own_kernel=yes\n"); 795 795 796 mr_fprintf(fd1, "files-in-filelist 797 mr_fprintf(fd1, "internal-tape-block-size 798 mr_fprintf(fd1, "total-slices 799 mr_fprintf(fd1, "excluded-devs 800 mr_fprintf(fd1, "image-devs 801 mr_fprintf(fd1, "last-filelist-number 802 mr_fprintf(fd1, "bootloader.name 803 mr_fprintf(fd1, "bootloader.device 796 mr_fprintf(fd1, "files-in-filelist=%ld\n", lines_in_filelist); 797 mr_fprintf(fd1, "internal-tape-block-size=%ld\n", bkpinfo->internal_tape_block_size); 798 mr_fprintf(fd1, "total-slices=%ld\n", estimated_total_noof_slices); 799 mr_fprintf(fd1, "excluded-devs=%s\n", devs_to_exclude); 800 mr_fprintf(fd1, "image-devs=%s\n", bkpinfo->image_devs); 801 mr_fprintf(fd1, "last-filelist-number=%s\n", last_filelist_number); 802 mr_fprintf(fd1, "bootloader.name=%s\n", bootldr_str); 803 mr_fprintf(fd1, "bootloader.device=%s\n", bkpinfo->boot_device); 804 804 805 805 switch (bkpinfo->backup_media_type) { 806 806 case cdr: 807 mr_fprintf(fd1, "backup-media-type 807 mr_fprintf(fd1, "backup-media-type=cdr\n"); 808 808 break; 809 809 case cdrw: 810 mr_fprintf(fd1, "backup-media-type 810 mr_fprintf(fd1, "backup-media-type=cdrw\n"); 811 811 break; 812 812 case cdstream: 813 mr_fprintf(fd1, "backup-media-type 813 mr_fprintf(fd1, "backup-media-type=cdstream\n"); 814 814 break; 815 815 case tape: 816 mr_fprintf(fd1, "backup-media-type 816 mr_fprintf(fd1, "backup-media-type=tape\n"); 817 817 break; 818 818 case udev: 819 mr_fprintf(fd1, "backup-media-type 819 mr_fprintf(fd1, "backup-media-type=udev\n"); 820 820 break; 821 821 case iso: 822 mr_fprintf(fd1, "backup-media-type 822 mr_fprintf(fd1, "backup-media-type=iso\n"); 823 823 break; 824 824 case nfs: 825 mr_fprintf(fd1, "backup-media-type 825 mr_fprintf(fd1, "backup-media-type=nfs\n"); 826 826 break; 827 827 case dvd: 828 mr_fprintf(fd1, "backup-media-type 828 mr_fprintf(fd1, "backup-media-type=dvd\n"); 829 829 break; 830 830 case usb: 831 mr_fprintf(fd1, "backup-media-type 831 mr_fprintf(fd1, "backup-media-type=usb\n"); 832 832 break; 833 833 default: … … 842 842 mr_fprintf(fd, "mindi_write_tape=yes\n"); 843 843 mr_fprintf(fd, "mindi_tape_device=%s\n", bkpinfo->media_device); 844 mr_fprintf(fd1, "media-dev 845 mr_fprintf(fd1, "media-size 844 mr_fprintf(fd1, "media-dev=%s\n", bkpinfo->media_device); 845 mr_fprintf(fd1, "media-size=%ld\n", bkpinfo->media_size[1]); 846 846 } 847 847 if (bkpinfo->compression_level > 0) { 848 mr_fprintf(fd1, "use-comp 849 } else { 850 mr_fprintf(fd1, "use-comp 848 mr_fprintf(fd1, "use-comp=yes\n"); 849 } else { 850 mr_fprintf(fd1, "use-comp=no\n"); 851 851 } 852 852 if (bkpinfo->use_gzip) { 853 mr_fprintf(fd1, "use-gzip 854 } else { 855 mr_fprintf(fd1, "use-gzip 853 mr_fprintf(fd1, "use-gzip=yes\n"); 854 } else { 855 mr_fprintf(fd1, "use-gzip=no\n"); 856 856 } 857 857 if (bkpinfo->use_lzo) { 858 mr_fprintf(fd1, "use-lzo 859 } else { 860 mr_fprintf(fd1, "use-lzo 858 mr_fprintf(fd1, "use-lzo=yes\n"); 859 } else { 860 mr_fprintf(fd1, "use-lzo=no\n"); 861 861 } 862 862 if (bkpinfo->use_star) { 863 mr_fprintf(fd1, "use-star 864 } else { 865 mr_fprintf(fd1, "use-star 863 mr_fprintf(fd1, "use-star=yes\n"); 864 } else { 865 mr_fprintf(fd1, "use-star=no\n"); 866 866 } 867 867 if (g_getfattr) { 868 mr_fprintf(fd1, "xattr 869 } else { 870 mr_fprintf(fd1, "xattr 868 mr_fprintf(fd1, "xattr=yes\n"); 869 } else { 870 mr_fprintf(fd1, "xattr=no\n"); 871 871 } 872 872 if (g_getfacl) { 873 mr_fprintf(fd1, "acl 874 } else { 875 mr_fprintf(fd1, "acl 873 mr_fprintf(fd1, "acl=yes\n"); 874 } else { 875 mr_fprintf(fd1, "acl=no\n"); 876 876 } 877 877 878 878 if (g_cd_recovery) { 879 mr_fprintf(fd1, "use-cdrecovery 880 } else { 881 mr_fprintf(fd1, "use-cdrecovery 879 mr_fprintf(fd1, "use-cdrecovery=yes\n"); 880 } else { 881 mr_fprintf(fd1, "use-cdrecovery=no\n"); 882 882 } 883 883 884 884 if (bkpinfo->make_cd_use_lilo) { 885 mr_fprintf(fd1, "use-lilo 886 } else { 887 mr_fprintf(fd1, "use-lilo 885 mr_fprintf(fd1, "use-lilo=yes\n"); 886 } else { 887 mr_fprintf(fd1, "use-lilo=no\n"); 888 888 } 889 889 if (bkpinfo->nonbootable_backup) { 890 mr_fprintf(fd1, "non-bootable 891 } else { 892 mr_fprintf(fd1, "non-bootable 890 mr_fprintf(fd1, "non-bootable=yes\n"); 891 } else { 892 mr_fprintf(fd1, "non-bootable=no\n"); 893 893 } 894 894 if (bkpinfo->differential) { 895 mr_fprintf(fd1, "differential 896 } else { 897 mr_fprintf(fd1, "differential 895 mr_fprintf(fd1, "differential=1\n"); 896 } else { 897 mr_fprintf(fd1, "differential=0\n"); 898 898 } 899 899 900 900 mr_fclose(fd); 901 mr_fprintf(fd1, "datestamp 901 mr_fprintf(fd1, "datestamp=%s\n", mr_date()); 902 902 mr_fclose(fd1); 903 903 … … 3917 3917 3918 3918 if ((p = getenv("PATH")) == NULL) { 3919 mr_asprintf(& p,path_min);3920 } 3921 mr_asprintf(&tmp, "%s:%s",p, path_min);3922 mr_free(p);3919 mr_asprintf(&tmp, path_min); 3920 } else { 3921 mr_asprintf(&tmp, "%s:%s",p, path_min); 3922 } 3923 3923 mr_setenv("PATH",tmp); 3924 3924 mr_free(tmp); -
branches/stable/mondo/src/common/libmondo-files.c
r1153 r1158 1164 1164 1165 1165 fd1 = mr_fopen(MONDORESTORECFG, "a"); 1166 mr_fprintf(fd1, "nfs-dev 1167 mr_fprintf(fd1, "nfs-client-ipaddr 1168 mr_fprintf(fd1, "nfs-client-netmask 1169 mr_fprintf(fd1, "nfs-client-broadcast 1170 mr_fprintf(fd1, "nfs-client-defgw 1171 mr_fprintf(fd1, "nfs-server-ipaddr 1172 mr_fprintf(fd1, "nfs-server-mount 1173 mr_fprintf(fd1, "nfs-server-path 1174 mr_fprintf(fd1, "iso-prefix 1166 mr_fprintf(fd1, "nfs-dev=%s\n", nfs_dev); 1167 mr_fprintf(fd1, "nfs-client-ipaddr=%s\n", nfs_client_ipaddr); 1168 mr_fprintf(fd1, "nfs-client-netmask=%s\n", nfs_client_netmask); 1169 mr_fprintf(fd1, "nfs-client-broadcast=%s\n", nfs_client_broadcast); 1170 mr_fprintf(fd1, "nfs-client-defgw=%s\n", nfs_client_defgw); 1171 mr_fprintf(fd1, "nfs-server-ipaddr=%s\n", nfs_server_ipaddr); 1172 mr_fprintf(fd1, "nfs-server-mount=%s\n", bkpinfo->nfs_mount); 1173 mr_fprintf(fd1, "nfs-server-path=%s\n", bkpinfo->nfs_remote_dir); 1174 mr_fprintf(fd1, "iso-prefix=%s\n", bkpinfo->prefix); 1175 1175 mr_fclose(fd1); 1176 1176 -
branches/stable/mondo/src/common/libmondo-tools.c
r1155 r1158 605 605 606 606 fd1 = mr_fopen(MONDORESTORECFG, "a"); 607 mr_fprintf(fd1, "iso-dev 607 mr_fprintf(fd1, "iso-dev=%s\n", iso_dev); 608 608 609 609 sprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3", … … 614 614 615 615 log_it("res of it = %s", iso_mnt); 616 mr_fprintf(fd1, "iso-mnt 616 mr_fprintf(fd1, "iso-mnt=%s\n", iso_mnt); 617 617 log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt)); 618 618 … … 624 624 } 625 625 log_it("isodir: %s", iso_path); 626 mr_fprintf(fd1, "isodir 626 mr_fprintf(fd1, "isodir=%s\n", iso_path); 627 627 628 628 log_it("iso-prefix: %s", bkpinfo->prefix); 629 mr_fprintf(fd1, "iso-prefix 629 mr_fprintf(fd1, "iso-prefix=%s\n", bkpinfo->prefix); 630 630 631 631 mr_fclose(fd1); -
branches/stable/mondo/src/include/my-stuff.h
r1144 r1158 17 17 #define MONDO_CACHE "/var/cache/mondo" 18 18 #define MONDORESTORECFG MONDO_CACHE"/mondo-restore.cfg" 19 /** 20 * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked). 21 */ 22 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg" 23 19 24 20 25 … … 91 96 */ 92 97 #define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt" 93 94 /**95 * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).96 */97 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"98 98 99 99 /**
Note:
See TracChangeset
for help on using the changeset viewer.