Changeset 541 in MondoRescue for branches/stable


Ignore:
Timestamp:
May 13, 2006, 8:47:23 PM (18 years ago)
Author:
bcornec
Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

Location:
branches/stable
Files:
21 deleted
60 edited
14 copied

Legend:

Unmodified
Added
Removed

  • branches/stable/contrib/backup-kungfu/backup-kungfu

    r538 r541  
    6868function remove_garbage {
    6969    echo -e "Removing the files left from previous mondoarchive run...\n"
    70     rm -rf /var/cache/mondo
     70    rm -rf /root/images
    7171    rm -rf ${backup_dir}/mondo*
    7272    rm -rf ${backup_dir}/tmp*
    … …  
    107107    echo -e "Creating the new backup directory and moving the files there...\n"
    108108    mkdir -p ${backup_dir}/${comp_name}_${date}/images
    109     cp /var/cache/mindi/* ${backup_dir}/${comp_name}_${date}/images/
     109    cp /root/images/mindi/* ${backup_dir}/${comp_name}_${date}/images/
    110110   
    111111    # If you want just move the iso files without renaming them just uncomment the next line

  • branches/stable/documentation/Makefile.howto

    r508 r541  
    3434    @rm -fr $(TARGET)
    3535    @docbook2html -d $(TARGET).dsl'#html' -o $(TARGET) $(TARGET).sgml
    36     @(cd $(TARGET) ; ln -sf ../$(IMAGESDIR) .)
    3736
    3837$(TARGET).html: $(SRC) $(DSL) $(IMAGES)
    … …  
    6463    @echo "Delivering mondorescue howto"
    6564    @echo ""
    66     @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; else echo "No INSTALLDIR specified aborting install"; fi
     65    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; cp -a ${IMAGESDIR} ${INSTALLDIR}/$(TARGET) ; else echo "No INSTALLDIR specified aborting install"; fi

  • branches/stable/documentation/mondoarchive.8

    r493 r541  
    369369Backup PC using DVD Media:
    370370.br
    371 .I "mondoarchive -OVr -d /dev/scd0 -gF -s 4200m"
     371.I "mondoarchive -OVr 2 -d /dev/scd0 -gF -s 4200m"
    372372
    373373.BI TAPE:

  • branches/stable/documentation/mondorescue-howto.sgml

    r481 r541  
    24582458</qandaentry>
    24592459<qandaentry>
    2460 <question><para>Q: Where is my CD burner, in SCSI terms?</para></question>
     2460<question><para>Q: Where is my CD burner, in SCSI
     2461                terms?</para></question>
    24612462<answer>
    24622463<para>A: Type:</para>
    … …  
    24842485long as your kernel and modules support it, Mindi will support it
    24852486and therefore so will Mondo.</para>
    2486 </answer>
    2487 </qandaentry>
    2488 <qandaentry>
    2489         <question><para>Q: Why doesn't cdrecord -scanbus work ?</para></question>
    2490         <answer>
    2491                 <para>A: If you have a 2.4.x kernel (typical example are fedora legacy kernels for redhat 7.X/8/9) and an IDE CDRW device, and the drive is not
    2492 listed when you run
    2493 
    2494 <informaltable><tgroup cols="1"><tbody>
    2495 <row>
    2496 <entry>
    2497 bash# cdrecord -scanbus
    2498 </entry>
    2499 </row>
    2500 </tbody></tgroup></informaltable>
    2501 
    2502 try adding the following kernel option to your boot script to enable
    2503 SCSI emulation: hdx=ide-scsi, where "hdx" should be replaced with the
    2504 appropriate drive letter of the CDRW device, e.g., "hdc".
    2505 (Answer provided by Christopher Moriarity cdm7_at_cdc.gov)
    2506 </para>
    25072487</answer>
    25082488</qandaentry>

  • branches/stable/mindi/deplist.txt

    r454 r541  
    1 # Mindi-Linux's dependency list
     1# Mindi-Linux's dependency list                                      07/10/2004
    22#
    33# NB:
    … …  
    55# 2. If you put 'libncurses' (w/o quotation marks) on an uncommented line then
    66#    Mindi will find /lib/libncurses* and include all matching files.
    7 # 3. You have to give an absolute path
     7# 3. You may give an absolute path if you think Mindi will have trouble finding
     8#    the file on its own.
    89# 4. If you want to add something, just add it on its own line. K.I.S.S.
    910# 5. You must _not_ put a semicolon & comment after an entry. e.g. 'foo; #bar'.
    10 # 6. you can add also entries in a file inside the deplist.d subdirectory
     11# 6. All these worlds are yours except Europa. Attempt no landing there.
    1112
    12 #----- Kept for compatibility -----
    13 mkswapfs mkfs.swap mkfs.dos mkvfatfs mkfatfs mkfs.reiser mke3fs mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek e2fsadm fsck.reiser
     13#------------------------- STUFF ADDED BY THE USER ----------------------------
     14#---vvvv     vvvv     vvvv  list your stuff here!  vvvv     vvvv     vvvv
     15#
     16# bar
     17# foo
     18#
     19#---^^^^     ^^^^     ^^^^  list your stuff here!  ^^^^     ^^^^     ^^^^
     20#------------------------------------------------------------------------------
     21
     22#----- Covers a multitude of sins, including XFS, JFS, ReiserFS, and RAID -----
     23mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.dos mkdosfs mkvfatfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.jfs mkfs.xfs mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm
     24fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks
    1425
    1526#-------------------------------- ESSENTIAL -----------------------------------
    16 conf.modules modules.conf.local ms-sys
    17 less.bin less.dummy less.dupe less.hot.weather.in.texas.please
    18 burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
     27fstab raidtab modules.conf conf.modules mondorestore mt modules.conf.local
     28afio star ntfsclone parted ms-sys file getfattr setfattr getfacl setfacl
     29buffer
     30awk gawk
     31bzip2 bunzip2 lzop
     32date ctrlaltdel
     33dd
     34eject
     35grep ld-linux.so.2 ld-2.3.4.so
     36hosts host.conf resolv.conf hosts.allow hosts.deny
     37wc
     38xargs
     39gzip gunzip
     40klogd sysklogd
     41fdisk hdparm parted arch
     42less less.bin less.dummy less.dupe less.hot.weather.in.texas.please
     43loadkeys
     44mount
     45ping devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
    1946
    20 insmod.static insmod.static.old
     47# ------------------------------- for X (Hugo) --------------------------------
     48#tar
     49#ldd lddlibc4
     50#libXmu
     51#libz
     52#X
     53#startx
     54#xinitrc
     55#xinit
     56#/etc/X11/XF86Config
     57#xauth
     58#libXext
     59# --- end of X stuff ---
     60
     61insmod insmod.static insmod.static.old lsmod
     62
     63#-------------------------- For mounting NFS volumes --------------------------
     64ifconfig route /sbin/start-nfs
     65#ifconfig host.conf resolv.conf ping ip portmap rpc.statd
     66#rpc.lockd rpc.statd nfsstat rpc.nfsd rpc.mountd rpc.exportfs exportfs hosts exports hosts.allow hosts.deny showmount /etc/sysconfig/network /etc/sysconfig/network-scripts service usernetctl services protocols inetd inetd.conf /etc/rc.d ifup ifdown
     67
     68
    2169
    2270#------------------------ Added for Stuart D. Gathman -------------------------
    2371#lc l lf netstat inetd tcpd in.telnetd route ldconfig ldd telnet rsh rcp services protocols rpc inetd.conf nsswitch.conf localtime security libresolv libutil libcrypt lbnss_compat libnss_files libnss_dns libpwdb libncurses
    2472
     73
     74
     75#------------------------- Part of the Cuckoo Project -------------------------
     76#mkisofs
     77#cdrecord
     78#losetup
     79#fdformat
     80#lilo grub
     81#/usr/local/share/mondo
     82#mondoarchive
     83#mindi
     84#/usr/local/share/mindi
     85
    2586#----------------- For all you LVM users out there, much love -----------------
    2687LVMFILES:
    27 lvmiopversion  lvmcreate_initrd  pvdata
     88lvmiopversion lvchange lvcreate lvdisplay lvextend lvmchange lvmcreate_initrd lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvscan pvchange pvcreate pvdata pvdisplay pvmove pvscan vgcfgbackup vgcfgrestore vgchange vgck vgcreate vgdisplay vgexport vgextend vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgscan vgsplit liblvm lvm lvm-10 /etc/lvm/lvm.conf
    2889#------------------------------------------------------------------------------

  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r530 r541  
    11# Copyright 1999-2005 Gentoo Foundation
    22# Distributed under the terms of the GNU General Public License v2
    3 # $Id$
     3# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.04.ebuild,v 1.1 2005/01/22 10:29:25 wschlich Exp $
    44
    55DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
    66HOMEPAGE="http://www.mondorescue.org"
    7 SRC_URI="ftp://ftp.mondorescue.org/src/${P}.tgz"
     7SRC_URI="ftp://ftp.berlios.de/pub/mondorescue/src/${P}.tgz"
    88
    99LICENSE="GPL-2"
    … …  
    1515RDEPEND=">=app-arch/bzip2-0.9
    1616        >=sys-apps/mindi-kernel-1.0-r1
     17        app-cdr/cdrtools
    1718        sys-libs/ncurses
    1819        sys-devel/binutils
    … …  
    2223src_unpack() {
    2324    unpack ${A} || die "Failed to unpack ${A}"
     25    cd ${S}/rootfs || die
     26    tar xzf symlinks.tgz || die "Failed to unpack symlinks.tgz"
     27
     28    # This will need to change when IA64 is tested. Obviously.
     29    rm -f bin/busybox-ia64 sbin/parted2fdisk-ia64
     30    mv bin/busybox-i386 bin/busybox
    2431}
    2532
    2633src_install() {
    27     export PREFIX="/usr"
    28     export CONFDIR="/etc"
    29     export RPMBUILDMINDI="true"
    3034    ./install.sh
    3135}

  • branches/stable/mindi/distributions/redhat/spec.m4

    r494 r541  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
     4define(`SSS', %{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Applications/Archiving)dnl
     8define(`GRP', Archiving/Archiving)dnl

  • branches/stable/mindi/distributions/rpm/mindi.spec

    r494 r541  
    1717License:    GPL
    1818Group:      %{grp}
    19 Url:        http://www.mondorescue.org
     19Url:        http://mondorescue.berlios.de
    2020Source:     %{src}
    21 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
     21BuildRoot:  %{_tmppath}/%{name}-%{version}
    2222Requires:   %{addreq}
    23 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
    2423# Not on all systems
    2524#Conflicts: bonnie++
    … …  
    3231
    3332%prep
     33%{__rm}  -rf $RPM_BUILD_ROOT
    3434%setup -n %name-%{version}
    3535
    … …  
    4141
    4242%install
    43 %{__rm}  -rf $RPM_BUILD_ROOT
    4443export DONT_RELINK=1
    4544
     45%{__rm} -rf $RPM_BUILD_ROOT
    4646export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
    4747export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
    … …  
    6060%files
    6161%defattr(644,root,root,755)
    62 %config(noreplace) %{_sysconfdir}/mindi
    63 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    64 %config(noreplace) %{_sysconfdir}/mindi/deplist.d/*
    65 %config(noreplace) %{_sysconfdir}/mindi/mindi.conf
     62%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    6663%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    6764%{_mandir}/man8/*
    6865%{_libdir}/mindi
    69 %attr(755,root,root) %{_sysconfdir}/mindi/mindi.conf
    7066%attr(755,root,root) %{_sbindir}/*
    7167%attr(755,root,root) %{_libdir}/mindi/aux-tools/sbin/*

  • branches/stable/mindi/install.sh

    r488 r541  
    4141
    4242echo "Creating target directories ..."
    43 install -m 755 -d $conf $conf/deplist.d $locallib/mindi $MANDIR $local/sbin $DOCDIR
     43install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR
    4444
    4545echo "Copying files ..."
    4646install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
    4747install -m 644 deplist.txt $conf
    48 install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
    49 install -m 755 distributions/conf/mindi.conf $conf
    5048
    5149cp -af rootfs aux-tools $locallib/mindi
    … …  
    5351chmod 755 $locallib/mindi/rootfs/sbin/*
    5452chmod 755 $locallib/mindi/aux-tools/sbin/*
    55 chmod 755 $conf/mindi.conf
    5653
    5754if [ "$RPMBUILDMINDI" = "true" ]; then
    … …  
    6158fi
    6259chmod 755 $local/sbin/mindi
    63 install -m 755 parted2fdisk.pl $local/sbin
    64 install -m 755 analyze-my-lvm $locallib/mindi
     60install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
    6561
    6662install -m 644 mindi.8 $MANDIR
    … …  
    107103if [ "$RPMBUILDMINDI" != "true" ]; then
    108104    chown -R root:root $locallib/mindi $conf $DOCDIR
    109     chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl
     105    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl
    110106    if [ "$ARCH" = "ia64" ] ; then
    111107        chown root:root $local/sbin/parted2fdisk
    … …  
    113109fi
    114110
    115 # Special case for SuSE family where doc is put elsewhere in the RPM
    116 if [ _"$dfam" = _"suse" ]; then
    117     rm -rf $DOCDIR
    118 fi
    119 
    120111exit 0

  • branches/stable/mindi/mindi

    r538 r541  
    1616export ARCH=`/bin/arch`
    1717
     18ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
     19
    1820RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
    1921    # after booting from floppy/CD image but before
    … …  
    3335MINDI_CONF=YYY
    3436MINDI_SBIN=${MINDI_PREFIX}/sbin
     37
    3538
    3639if [ "$ARCH" = "x86_64" ] ; then
    … …  
    4043fi
    4144
    42 MINDI_CONFIG="$MINDI_CONF/mindi.conf"
    43 if [ ! -f $MINDI_CONFIG ]; then
    44     echo "No $MINDI_CONFIG file found using sensible values"
    45 else
    46     . $MINDI_CONFIG
    47 fi 
    48 
    49 #
    50 # Manages defaults coming from conf files
    51 #
    52 if [ "$mindi_extra_space" == "" ]; then
    53     EXTRA_SPACE=24576
    54 else
    55     EXTRA_SPACE=$mindi_extra_space
    56 fi
    57 if [ "$mindi_ia64_boot_size" == "" ]; then
    58     IA64_BOOT_SIZE=8192
    59 else
    60     IA64_BOOT_SIZE=$mindi_ia64_boot_size
    61 fi
    62 if [ "$mindi_deplist_dir" == "" ]; then
    63     DEPLIST_DIR="$MINDI_CONF/deplist.d"
    64 else
    65     DEPLIST_DIR="$mindi_deplist_dir"
    66 fi
    67 # TBC
    68 if [ "$mindi_write_boot_floppy" == "" ]; then
    69     WRITE_BOOT_FLOPPIES="yes"
    70 else
    71     WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
    72 fi
    73 # TBC
    74 if [ "$mindi_write_cd" == "" ]; then
    75     WRITE_MINDI_CD="yes"
    76 else
    77     WRITE_MINDI_CD="$mindi_write_cd"
    78 fi
    79 # TBC
    80 if [ "$mindi_images_dir" == "" ]; then
    81     CACHEDIR="/var/cache/mindi"
    82 else
    83     CACHEDIR="$mindi_images_dir"
    84 fi
    85 if [ "$mindi_dual_floppies" == "" ]; then
    86     FORCE_DUAL_FLOPPIES="/var/cache/mindi"
    87 else
    88     FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
    89 fi
    90 if [ "$mindi_tmp_dir" == "" ]; then
    91     TMP_ROOT="/tmp"
    92 else
    93     TMP_ROOT="$mindi_tmp_dir"
    94 fi
    95 if [ "$mindi_fd_device" == "" ]; then
    96     FDDEVICE="/dev/fd0"
    97 else
    98     FDDEVICE="$mindi_fd_device"
    99 fi
    100 if [ "mindi_boot_params" == "" ]; then
    101     ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
    102 else
    103     ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
    104 fi
    105 
    106 
    107 # Other parameters
    108 # Useless ??
     45EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
     46IA64_BOOT_SIZE=8192       ; # size of the ia64 boot disk
     47TMP_ROOT=/tmp
     48WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
    10949PROMPT_WRITE_BOOT_FLOPPIES="yes"
    11050    # do you want to be prompted to write
    … …  
    12060    # you want to use your own kernel, or the supplied default.
    12161    # If "yes" mindi will automatically use your own kernel.
    122 
     62MINDI_CONFIG="$MINDI_CONF/mindi.conf"
     63if [ -f $MINDI_CONFIG ]; then
     64    . $MINDI_CONFIG
     65fi
    12366MY_FSTAB=/etc/fstab
    12467FLOPPY_MODS="ide-floppy floppy"
    12568TAPE_MODS="ht st osst ide-tape ide_tape"
    126 SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
     69SCSI_MODS="3c59x 3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
    12770
    12871# ide-probe-mod
    … …  
    13174USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
    13275CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
    133 NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
    134 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
     76NET_MODS="sunrpc nfs nfs_acl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32 vmxnet"
     77EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
    13578LOGFILE=/var/log/mindi.log
     79FDDEVICE=/dev/fd0             ; # 1.44MB floppy #0
     80CACHE_LOC=/var/cache/mondo-archive
     81FORCE_DUAL_FLOPPIES=no
    13682
    13783BOOT_MEDIA_MESSAGE="\
    … …  
    219165Aborted() {
    220166    trap SIGHUP SIGTERM SIGTRAP SIGINT
    221     rm -f $CACHEDIR/mindi*img $CACHEDIR/*gz $CACHEDIR/mindi.iso
     167    [ "$imagesdir" != "" ] && rm -f $imagesdir/mindi*img $imagesdir/*gz $imagesdir/mindi.iso
    222168    [ "$minidir_root" != "" ] && rm -Rf $minidir_root/*
    223169    Die "User abort."
    … …  
    334280    biggienumber=$4
    335281
    336     [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist file accordingly."
     282    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist.txt accordingly."
    337283    mkdir -p $outdir
    338284
    … …  
    506452    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
    507453    rm -f /tmp/mke2fs.$$
    508     mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $imagefile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
     454    mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $mountpoint; does your kernel support loopfs? If not, please recompile your kernel. Your Linux distro is broken."
    509455    mv $tarball $mountpoint/
    510456    if [ "$?" -ne "0" ] ; then
    511457    umount $mountpoint
    512     Die "Tarball $tarball is too big for disk! (CODI)\nTell dev team to adjust MAX_COMPRESSED_SIZE"
     458    Die "Tarball $tarball is too big for disk! (CODI)\nTell Hugo to adjust MAX_COMPRESSED_SIZE"
    513459    fi
    514460    [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
    … …  
    544490    my_partitions=`mount | fgrep $$ | cut -f1 -d' '`
    545491    [ "$my_partitions" != "" ] && umount $my_partitions
    546     # BCO : Too Dangerous !!!
    547     #[ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
     492    [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
    548493    cd /tmp
    549494    mkdir -p mindi.err
    … …  
    684629    echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
    685630    echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
    686     mkdir -p $CACHEDIR
     631    mkdir -p $CACHE_LOC
    687632}
    688633
    … …  
    881826    echo "$fname" >> $outfile.pre
    882827        cat $tempdepfile >> $outfile.pre
     828#        echo "$fname ----> dependencies:-" >> $LOGFILE
     829#        cat $tempdepfile | tr -s '/' '/' | sort -u >> $LOGFILE
     830#        echo -en "(end of deplist of $fname)\n\n" >> $LOGFILE
    883831        rm -f $tempdepfile
    884832    progress=$(($progress+1))
    … …  
    13061254    if [ $tmpmodprobe_flag == "Y" ] ; then
    13071255        infile="/tmp/modprobe.conf.mindi.$$"
    1308         find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
     1256        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f > $infile
    13091257    else
    13101258        infile="/etc/modules.conf"
    … …  
    13821330    [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
    13831331    if [ -h "$c_p" ] && [ "`echo "$c_p" | fgrep "/dev/hd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/sd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/md"`" = "" ] ; then
    1384         current_partition=`ResolveSoftlink $c_p`
     1332            current_partition=`ResolveSoftlink $c_p`
    13851333        [ "`echo "$current_partition" | fgrep "/dev/mapper"`" != "" ] && current_partition="$c_p"
    1386         [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
     1334            [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
    13871335    else
    13881336        current_partition="$c_p"
    13891337    fi
    13901338    [ "$c_p" = "none" ] && continue
    1391     absolute_partition=`ResolveSoftlink $c_p`
    1392     partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
    1393 
    1394     # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
    1395     # current_partition contains only first column of /etc/fstab
    1396     if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then
     1339        absolute_partition=`ResolveSoftlink $c_p`
     1340    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     1341    redhat_label=""
     1342    if [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
    13971343        str_to_find_fmt_with=$current_partition
    1398         redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
    1399         actual_dev=""
    1400 
    1401         # 1st try : blkid, the good way
    1402         if [ -x "/sbin/blkid" ] ; then
    1403             actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`
    1404         fi
    1405 
    1406         # 2nd try, which works on a standard partition (ext2/3), but not on swap
    1407         if [ "x$actual_dev" = "x" ] ; then
    1408             actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1`
    1409         fi
    1410 
    1411         # 3rd try, with vol_id (which works with swap)
    1412         if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ] ; then
    1413                 list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
    1414                 for dev_swap in $list_swaps ; do
    1415                     dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
    1416                     if [ "x$dev_exists" != "x" ] ; then
    1417                         actual_dev=$dev_swap
    1418                         break;
    1419                     fi
    1420                 done
    1421         fi
    1422 
    1423         # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
    1424         if [ "x$actual_dev" = "x" -a  "`echo "$current_partition" | /bin/grep -i "LABEL=SWAP"`" != ""] ; then
    1425                 try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
    1426                 present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
    1427                 if [ "x$present_dev" != "x" ] ; then
    1428                     actual_dev="/dev/$try_dev"
    1429                 fi
    1430         fi
    1431 
    1432         # Check if one of all those tries has known success
    1433         if [ "x$actual_dev" != "x" ] ; then
    1434                 current_partition=$actual_dev
    1435         else
    1436             Die "Your system uses a labelled swap partition, but you lack the tool to support it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
    1437         fi
     1344        redhat_label=`echo "$current_partition" | cut -d'=' -f2`
     1345        actual_dev=`mount -l | fgrep " [$redhat_label]" | cut -d' ' -f1`
     1346#       partition_mountpt=$redhat_label
     1347        current_partition=$actual_dev
    14381348    else
    14391349        str_to_find_fmt_with=$current_partition
    14401350    fi
    1441 
    14421351    partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
    14431352    if [ -d "/proc/lvm" ] && [ "`lvdisplay $current_partition 2> /dev/null`" ] ; then
    … …  
    16261535
    16271536
     1537OfferToCopyImagesToDisks() {
     1538    local imagesdir i imagename dev count boot_dev data_dev
     1539    imagesdir=$1
     1540    boot_dev=$2
     1541    data_dev=$3
     1542    echo -en "Would you like to create boot+data floppy disks now (y/n) ?"
     1543    read i
     1544    [ "$i" != "y" ] && [ "$i" != "Y" ] && return
     1545    mount | fgrep /dev/fd > /dev/null && Die "Please unmount your floppies first."
     1546    echo "WARNING! THIS WILL ERASE YOUR FLOPPY DISKS."
     1547    [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
     1548    [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
     1549    i=`find $imagesdir -type f | fgrep "/mindi-root.1" 2> /dev/null`
     1550    j=`find $imagesdir -type f | fgrep "/mindi-boot" | egrep -v '2880|5760'`
     1551#    echo "i=$i"
     1552#    echo "j=$j"
     1553    if [ "$i" ] ; then
     1554        CopyImageToDisk $j $data_dev "boot disk"
     1555        CopyImageToDisk $i $data_dev "root disk"
     1556    else
     1557        CopyImageToDisk $j $boot_dev "boot/root disk"
     1558    fi
     1559    count=1
     1560    for i in `find $imagesdir | fgrep mindi-data` ; do
     1561        CopyImageToDisk $i $data_dev "data disk #$count"
     1562        count=$(($count+1))
     1563    done
     1564}
     1565
    16281566
    16291567
    … …  
    16591597    cp $kernelpath $TMP_ROOT/iso/isolinux/vmlinuz || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
    16601598    cp $TMP_ROOT/mindi.rdz $TMP_ROOT/iso/isolinux/initrd.img
    1661     cp $TMP_ROOT/mindi.rdz $CACHEDIR/initrd.img
     1599    cp $TMP_ROOT/mindi.rdz $imagesdir/initrd.img
    16621600    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    16631601    cd $TMP_ROOT/iso/isolinux
    … …  
    16801618    fi
    16811619    if [ "$ARCH" != "ia64" ] ; then
    1682         mkisofs -U -J -r -o $CACHEDIR/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> /tmp/$$.mk
    1683     else
    1684         mkisofs -J -r -o $CACHEDIR/mindi.iso -b images/mindi-bootroot.$IA64_BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> /tmp/$$.mk
     1620        mkisofs -U -J -r -o $imagesdir/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> /tmp/$$.mk
     1621    else
     1622        mkisofs -J -r -o $imagesdir/mindi.iso -b images/mindi-bootroot.$IA64_BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> /tmp/$$.mk
    16851623    fi
    16861624    if [ "$?" -ne "0" ] ; then
    … …  
    16911629    LogIt "Failed to create ISO image.\n"
    16921630    else
    1693     echo "Created bootable ISO image at $CACHEDIR/mindi.iso" >> $LOGFILE
     1631    echo "Created bootable ISO image at $imagesdir/mindi.iso" >> $LOGFILE
    16941632    fi
    16951633    rm -f /tmp/$$.mk
    … …  
    17961734    return $res
    17971735
     1736# --- the kernel-only method NO LONGER WORKS. Not since Apr 2002.
     1737# It should work, according to the Boot Disk HOWTO, but it doesn't.
     1738# It works for my failsafe kernel & for RH7.2 but not RH7.3, 8.0, etc.
     1739# -Hugo, Apr 19th 2004
     1740#   dd if=$1 of=$2 bs=1k &> /dev/null || Die "Cannot dd blank file"
     1741#   dd if=/dev/zero bs=1k count=$3 >> $2 2> /dev/null || Die "Cannot dd blank file"
     1742#   mv -f $2 $2.old
     1743#   dd if=$2.old bs=1k count=$3 of=$2 &> /dev/null || Die "Cannot dd blank file"
     1744#   rm -f $2.old
     1745#   if [ "$3" = "1440" ] ; then
     1746#       rdev $2 "/dev/fd0H"$3
     1747#   else
     1748#       rdev $2 "/dev/fd0u"$3
     1749#   fi
     1750#   rdev -R $2 0
     1751#   rdev -r $2 49152
    17981752}
    17991753
    … …  
    21452099    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
    21462100    return $retval
     2101}
     2102
     2103
     2104
     2105
     2106PrepareDataDiskImages() {
     2107    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines
     2108
     2109    imagesdir=$1
     2110    rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
     2111    needlist=$TMP_ROOT/what-we-need.txt
     2112    bigdir=$TMP_ROOT/bigdir
     2113    minidir_root=$TMP_ROOT/minidir
     2114    mkdir -p $minidir_root
     2115    mkdir -p $bigdir/usr/bin
     2116    tardir=$TMP_ROOT/tardir
     2117
     2118    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
     2119    cat $MINDI_CONF/deplist.txt | GenerateGiantDependencyList $needlist $lines
     2120    res=$?
     2121    if [ "$YOUR_KERNEL_SUCKS" ]; then
     2122    pwd=`pwd`
     2123    cd $TMP_ROOT
     2124        for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
     2125        cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
     2126        if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
     2127        cp --parents -pRdf $i $bigdir
     2128        else
     2129        ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
     2130        BIGNO=$(($BIGNO+1))
     2131        fi
     2132    done
     2133    for i in $EXTRA_MODS ; do
     2134        j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
     2135        [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
     2136        for k in $j ; do
     2137        if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
     2138            cp --parents -pRdf $k $bigdir
     2139        else
     2140            ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
     2141            BIGNO=$(($BIGNO+1))
     2142        fi
     2143        echo "Added failsafe module $k to ramdisk" >> $LOGFILE
     2144        done
     2145    done
     2146    cd $pwd
     2147    else
     2148    ListKernelModulePaths >> $needlist
     2149    fi
     2150    if [ "$res" -ne "0" ] ; then
     2151        Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
     2152    fi
     2153    FindAndAddUserKeyboardMappingFile
     2154    mkdir -p $bigdir/tmp
     2155    if [ "`DidMondoCallMe`" ] ; then
     2156        MakeMondoConfigFile $TMP_ROOT/mondo-restore.cfg
     2157        cp -f $TMP_ROOT/mondo-restore.cfg $bigdir/tmp &> /dev/null
     2158        cp -f $TMP_ROOT/mondo-restore.cfg $CACHE_LOC &> /dev/null
     2159    fi
     2160    [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
     2161    DropOptimizedLibraries $needlist $bigdir
     2162    echo -en "Assembling dependency files"
     2163    CopyDependenciesToDirectory < $needlist $bigdir
     2164
     2165# also copy io.sys and msdos.sys, if we can find them
     2166    for i in `mount | cut -d' ' -f3` ; do
     2167    for j in io.sys msdos.sys ; do
     2168        [ -e "$i/$j" ] && cp -f $i/$j $bigdir
     2169    done
     2170    done
     2171
     2172# master boot record, too
     2173    i=`cat $MONDO_TMP/BOOTLOADER.DEVICE 2> /dev/null`
     2174    if [ "$i" ] ; then
     2175    LogIt "Backing up $i's MBR\n"
     2176    dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
     2177# < < E O F
     2178    sleep 1
     2179    sync
     2180#        [ "$?" -ne "0" ] && echo "Failed to save $i's MBR to bigdir" >> $LOGFILE
     2181    j=$i
     2182    [ -h "$j" ] && j=`ResolveSoftlink $j`
     2183    LogIt "Creating /dev/boot_device ($j)\n"
     2184    mkdir -p $bigdir/dev
     2185    cp -pRdf $j $bigdir/dev/boot_device || Die "Unable to create /dev/boot_device on ramdisk"
     2186    fi
     2187
     2188# more stuff
     2189#    cp -f $MINDI_LIB/embleer* $bigdir
     2190    old_pwd=`pwd`
     2191    cd $bigdir
     2192
     2193    [ -e "$MINDI_LIB/aux-tools" ] || Die "aux-tools not found in Mindi's home dir. Do you have multiple copies of Mindi lying around? Please delete them. No, don't e-mail me and ask how. ;) Use 'rm'."
     2194    cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping aux-tools\n"
     2195    if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
     2196    tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
     2197    fi
     2198    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
     2199        cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
     2200        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     2201    fi
     2202    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
     2203    cd $old_pwd
     2204    echo -e "$DONE"
     2205    TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
     2206    SplitDirectoryIntoMinidirs $bigdir $minidir_root
     2207    noof_disks=$?
     2208    [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
     2209#    if [ "$noof_disks" -ge "8" ] ; then
     2210#        LogIt "You are putting a ludicrously large amount of data on these disks."
     2211#        LogIt "I shall therefore double EXTRA_SPACE, just in case your ramdisk is too small."
     2212#        EXTRA_SPACE=$(($EXTRA_SPACE*2))
     2213#    fi
     2214    MakeMountlist $TMP_ROOT/mountlist.txt
     2215    mkdir -p $minidir_root/$noof_disks/tmp
     2216    cp -f $TMP_ROOT/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $TMP_ROOT to data disk"
     2217    cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
     2218    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
     2219    [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2220    [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2221    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     2222    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
     2223    CreateDataDiskImagesFromTarballs $tardir $imagesdir $noof_disks
     2224    FRIENDLY_OUTSTRING="Boot and data disk images were created."
     2225# One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
     2226    rmdir $tardir $bigdir
     2227    rm -f $needlist
     2228    return $noof_disks
    21472229}
    21482230
    … …  
    24532535       root="/"
    24542536    fi
    2455     for fname in `find $root -maxdepth 2 -type f | fgrep lin | egrep -v '^/proc/|^/net/'` ; do
     2537    for fname in `find $root -maxdepth 2 -type f | fgrep lin | fgrep -v /proc/` ; do
    24562538    [ ! -e "$fname" ] && continue
    24572539        [ "$fname" = "/boot/vmlinuz.shipped" ] && [ -f "/boot/vmlinuz" ] && continue; # ignore SuSE's extra kernel
    … …  
    26132695    echo -en "..."
    26142696    mkdir -p $mountpoint
    2615     mount -t ext2 -o loop $tempfile $mountpoint || Die "Cannot loopmount $tempfile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
     2697    mount -t ext2 -o loop $tempfile $mountpoint || Die "Cannot loopmount $tempfile to $mountpoint"
    26162698    echo -en "..."
    26172699    old_pwd=`pwd`
    … …  
    27732855    while [ "$diskno" -le "$noof_disks" ] ; do
    27742856        cd $minidir_root/$diskno || LogIt "Warning - cannot cd to $minidir_root/$diskno\n"
    2775         tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell dev team -exactly- what the errors where."
     2857        tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell Hugo -exactly- what the errors where."
    27762858        diskno=$(($diskno+1))
    27772859        echo -n "..."
    … …  
    28212903
    28222904
     2905#AWK=`which gawk`
     2906#LocateDeps $1
     2907#MakeModuleLoadingScript /tmp/load-modules.sh
     2908#exit 0
     2909
     2910
     2911#cat /etc/mindi/deplist.txt | GenerateGiantDependencyList /tmp/deplist.old 200
     2912#exit 0
     2913
     2914
     2915
    28232916if [ "$1" = "-V" ] || [ "$1" = "-v" ] || [ "$1" = "--version" ] || [ "$1" = "-version" ] ; then
    28242917    echo "mindi v$MINDI_VERSION"
    2825     exit 0
    2826 fi
    2827 
    2828 if [ "$1" = "-printvar" ] ; then
    2829     shift
    2830     if [ _"$1" != _"" ] ; then
    2831         set | egrep "^$1" | cut -d= -f2
    2832     fi
    28332918    exit 0
    28342919fi
    … …  
    28822967BIGNO=0
    28832968MAX_COMPRESSED_SIZE=1300
    2884 imagesdir=$CACHEDIR
     2969imagesdir=/root/images/mindi
     2970mkdir -p $imagesdir
    28852971kernelpath=""
    28862972MONDO_ROOT=/tmp/mindilinux/mondo-root
    … …  
    29173003        exit $?
    29183004    elif [ "$1" = " --version" ] || [ "$1" = "-v" ] ; then
    2919         echo "Mindi v$MINDI_VERSION"
     3005    echo "Mindi v$MINDI_VERSION"
    29203006        exit 0
    29213007    elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
    2922         TMP_ROOT=$2
    2923         MONDO_TMP=$2
    2924         imagesdir=$3
    2925         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
     3008    TMP_ROOT=$2
     3009    MONDO_TMP=$2
     3010    imagesdir=$3
     3011    kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
    29263012###
    29273013### Sq-Modification...
    … …  
    29303016###
    29313017        kernelname=`echo $kernelpath | cut -d'-' -f2-`
    2932         LogIt "kernelname = $kernelname\n"
    2933         LogIt "kernelpath = $kernelpath\n"
     3018    LogIt "kernelname = $kernelname\n"
     3019    LogIt "kernelpath = $kernelpath\n"
    29343020        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
    29353021        then
    … …  
    29433029### end of Sq-Modification
    29443030###
    2945         TAPEDEV=$5
    2946         TAPESIZE=$6
    2947         FILES_IN_FILELIST=$7
    2948         USE_LZO=$8
    2949         CDRECOVERY=$9
     3031    TAPEDEV=$5
     3032    TAPESIZE=$6
     3033    FILES_IN_FILELIST=$7
     3034    USE_LZO=$8
     3035    CDRECOVERY=$9
    29503036        if [ "${10}" = "(null)" ] || [ "${10}" = "" ] ; then
    29513037            IMAGE_DEVS=""
    … …  
    29533039            IMAGE_DEVS="`echo "${10}" | tr '|' ' '`"
    29543040        fi
    2955         if [ "${11}" ] ; then
    2956             LILO_OPTIONS=""
     3041    if [ "${11}" ] ; then
     3042        LILO_OPTIONS=""
    29573043#       LogIt "LILO will use conservative settings, to be compatible with older BIOSes."
    2958         fi
    2959         LAST_FILELIST_NUMBER=${12}
     3044    fi
     3045    LAST_FILELIST_NUMBER=${12}
    29603046        ESTIMATED_TOTAL_NOOF_SLICES=${13}
    29613047        EXCLUDE_DEVS="${14}"
    29623048        USE_COMP="${15}"
    29633049        USE_LILO="${16}"
    2964         USE_STAR="${17}"
    2965         INTERNAL_TAPE_BLOCK_SIZE="${18}"
     3050    USE_STAR="${17}"
     3051    INTERNAL_TAPE_BLOCK_SIZE="${18}"
    29663052        DIFFERENTIAL="${19}"
    29673053        NOT_BOOT="${20}"
    29683054        [ "$USE_COMP" = "" ] && USE_COMP=yes
    29693055        [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
    2970         [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine.\n"
    2971         [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
     3056    [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine.\n"
     3057    [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
    29723058        kernelname=`echo $kernelpath | cut -d'-' -f2-`
    29733059        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
    … …  
    29793065           LogIt "Using modules for kernel: ${kernelname}\n"
    29803066        fi
    2981         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
     3067    [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
    29823068        MONDO_ROOT=`echo $imagesdir | sed 's/\(.*\)\/.*/\1/'`
    2983         [ "$MONDO_ROOT" = "" ] && Die "MONDO_ROOT is undefined"
    2984     else
    2985         echo "Syntax: mindi (--custom ....)" >> /dev/stderr
    2986         exit 1
     3069    [ "$MONDO_ROOT" = "" ] && Die "MONDO_ROOT is undefined"
     3070    else
     3071    echo "Syntax: mindi (--custom ....)" >> /dev/stderr
     3072    exit 1
    29873073    fi
    29883074fi
    … …  
    29983084
    29993085
     3086
     3087
     3088#ReplaceIndividualLine /tmp/init `grep -n "#WHOLIVESINAPINEAPPLEUNDERTHESEA#" /tmp/init | cut -d':' -f1` "$RUN_AFTER_INITIAL_BOOT_PHASE"
     3089#exit 0
     3090
     3091
     3092#ListKernelModules
     3093#exit 0
     3094
     3095
     3096
     3097
    30003098[ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
    30013099rm -Rf $TMP_ROOT/mindilinux/*
    30023100TMP_ROOT=$TMP_ROOT/mindilinux/$$
    30033101mkdir -p $TMP_ROOT
     3102mkdir -p $imagesdir
    30043103if [ ! "`DidMondoCallMe`" ] ; then
    30053104    LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION\n"
    3006     LogIt "Latest Mindi is available from http://www.mondorescue.org\n"
     3105    LogIt "Latest Mindi is available from http://mondorescue.berlios.de\n"
    30073106    LogIt "BusyBox sources are available from http://www.busybox.net\n"
    30083107    LogIt "------------------------------------------------------------------------------"
    … …  
    30463145    fi
    30473146    if [ "$USE_OWN_KERNEL" = "yes" ]; then
    3048         YOUR_KERNEL_SUCKS=""
    3049         kernelpath=`TryToFindKernelPath`
    3050         if [ "$kernelpath" = "" ] ; then
    3051             echo -n "Please enter kernel path : "
    3052             read kernelpath
    3053         fi
    3054     else
    3055         YOUR_KERNEL_SUCKS="That's why you're using mine, dude. :-)"
     3147    YOUR_KERNEL_SUCKS=""
     3148    kernelpath=`TryToFindKernelPath`
     3149    if [ "$kernelpath" = "" ] ; then
     3150        echo -n "Please enter kernel path : "
     3151        read kernelpath
     3152    fi
     3153    else
     3154    YOUR_KERNEL_SUCKS="That's why you're using mine, dude. :-)"
    30563155    fi
    30573156fi
    … …  
    30823181[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it. Go to http://www.mondorescue.org and download it, then install it."
    30833182
    3084 rm -f $CACHEDIR/{*img,*gz,*iso}
    3085 
    3086 rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
    3087 needlist=$TMP_ROOT/what-we-need.txt
    3088 bigdir=$TMP_ROOT/bigdir
    3089 minidir_root=$TMP_ROOT/minidir
    3090 mkdir -p $minidir_root
    3091 mkdir -p $bigdir/usr/bin
    3092 tardir=$TMP_ROOT/tardir
    3093 
    3094 lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | grep -vx "" | wc -l`
    3095 cat $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | GenerateGiantDependencyList $needlist $lines
    3096 res=$?
    3097 if [ "$YOUR_KERNEL_SUCKS" ]; then
    3098     pwd=`pwd`
    3099     cd $TMP_ROOT
    3100     for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
    3101         cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
    3102         if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
    3103             cp --parents -pRdf $i $bigdir
    3104         else
    3105             ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
    3106             BIGNO=$(($BIGNO+1))
    3107         fi
    3108     done
    3109     for i in $EXTRA_MODS ; do
    3110         j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
    3111         [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
    3112         for k in $j ; do
    3113             if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
    3114                     cp --parents -pRdf $k $bigdir
    3115         else
    3116                 ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
    3117                 BIGNO=$(($BIGNO+1))
    3118             fi
    3119             echo "Added failsafe module $k to ramdisk" >> $LOGFILE
    3120         done
    3121     done
    3122     cd $pwd
    3123 else
    3124     ListKernelModulePaths >> $needlist
    3125 fi
    3126 if [ "$res" -ne "0" ] ; then
    3127     Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
    3128 fi
    3129 FindAndAddUserKeyboardMappingFile
    3130 mkdir -p $bigdir/tmp
    3131 if [ "`DidMondoCallMe`" ] ; then
    3132     MakeMondoConfigFile $TMP_ROOT/mondo-restore.cfg
    3133     cp -f $TMP_ROOT/mondo-restore.cfg $bigdir/tmp &> /dev/null
    3134     cp -f $TMP_ROOT/mondo-restore.cfg $CACHEDIR &> /dev/null
    3135 fi
    3136 [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
    3137 DropOptimizedLibraries $needlist $bigdir
    3138 echo -en "Assembling dependency files"
    3139 CopyDependenciesToDirectory < $needlist $bigdir
    3140 
    3141 # also copy io.sys and msdos.sys, if we can find them
    3142 for i in `mount | cut -d' ' -f3` ; do
    3143     for j in io.sys msdos.sys ; do
    3144         [ -e "$i/$j" ] && cp -f $i/$j $bigdir
    3145     done
    3146 done
    3147 
    3148 # master boot record, too
    3149 i=`cat $MONDO_TMP/BOOTLOADER.DEVICE 2> /dev/null`
    3150 if [ "$i" ] ; then
    3151     LogIt "Backing up $i's MBR\n"
    3152     dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
    3153 # < < E O F
    3154     sleep 1
    3155     sync
    3156 #        [ "$?" -ne "0" ] && echo "Failed to save $i's MBR to bigdir" >> $LOGFILE
    3157     j=$i
    3158     [ -h "$j" ] && j=`ResolveSoftlink $j`
    3159     LogIt "Creating /dev/boot_device ($j)\n"
    3160     mkdir -p $bigdir/dev
    3161     cp -pRdf $j $bigdir/dev/boot_device || Die "Unable to create /dev/boot_device on ramdisk"
    3162 fi
    3163 
    3164 # more stuff
    3165 #    cp -f $MINDI_LIB/embleer* $bigdir
    3166 old_pwd=`pwd`
    3167 cd $bigdir
    3168 
    3169 [ -e "$MINDI_LIB/aux-tools" ] || Die "aux-tools not found in Mindi's home dir. Do you have multiple copies of Mindi lying around? Please delete them. No, don't e-mail me and ask how. ;) Use 'rm'."
    3170 cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping aux-tools\n"
    3171 if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
    3172     tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
    3173 fi
    3174 if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
    3175     cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
    3176     [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
    3177 fi
    3178 [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
    3179 cd $old_pwd
    3180 echo -e "$DONE"
    3181 TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
    3182 SplitDirectoryIntoMinidirs $bigdir $minidir_root
     3183rm -f /root/images/mindi/{*img,*gz,*iso}
     3184
     3185PrepareDataDiskImages $imagesdir
    31833186noof_disks=$?
    3184 [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
    3185 MakeMountlist $TMP_ROOT/mountlist.txt
    3186 mkdir -p $minidir_root/$noof_disks/tmp
    3187 cp -f $TMP_ROOT/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $TMP_ROOT to data disk"
    3188 cp -f $TMP_ROOT/mountlist.txt $CACHEDIR
    3189 [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
    3190 [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
    3191 [ -d "/dev/mapper" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
    3192 cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    3193 ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
    3194 CreateDataDiskImagesFromTarballs $tardir $imagesdir $noof_disks
    3195 FRIENDLY_OUTSTRING="Boot and data disk images were created."
    3196 # One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
    3197 rmdir $tardir $bigdir
    3198 rm -f $needlist
    3199 #return $noof_disks
    3200 
    32013187ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
    32023188rds=$(($ramdisk_size-$((ramdisk_size%4096))))
    … …  
    32093195    else
    32103196        if ! PrepareBootDiskImage_LILO $imagesdir 1722 $kernelpath $ramdisk_size ; then
    3211             LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
    3212             LogIt "if you want to make a 1.72MB floppy disk.\n"
    3213         fi
    3214         if ! PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size ;  then
    3215             LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
    3216             LogIt "Please reduce your kernel's size\n"
    3217             LogIt "if you want to make a 2.88MB floppy disk.\n"
    3218             PrepareBootDiskImage_LILO $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    3219         fi
     3197        LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
     3198        LogIt "if you want to make a 1.72MB floppy disk.\n"
     3199        fi
     3200        PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    32203201    fi
    32213202else
    … …  
    32433224    [ ! -e "$boot_dev" ] && mknod $boot_dev b 2 60
    32443225    [ ! -e "$boot_dev" ] && boot_dev=/dev/fd0H1722
    3245     [ ! -e "$boot_dev" ] && Die "Will you PLEASE tell your distribution maker to create the 1.72MB devices in /dev?"
     3226    [ ! -e "$boot_dev" ] && Die "Oh Lord, will you PLEASE tell the vendor to create the 1.72MB devices in /dev?"
    32463227    if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
    3247         echo -en "Would you like to create boot+data floppy disks now (y/n) ?"
    3248         read i
    3249         [ "$i" != "y" ] && [ "$i" != "Y" ] && return
    3250         mount | fgrep /dev/fd > /dev/null && Die "Please unmount your floppies first."
    3251         echo "WARNING! THIS WILL ERASE YOUR FLOPPY DISKS."
    3252         [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
    3253         [ ! -e "$FDDEVICE" ] && Die "Cannot find $FDDEVICE - is your Linux distro broken?"
    3254         i=`find $imagesdir -type f | fgrep "/mindi-root.1" 2> /dev/null`
    3255         j=`find $imagesdir -type f | fgrep "/mindi-boot" | egrep -v '2880|5760'`
    3256         if [ "$i" ] ; then
    3257             CopyImageToDisk $j $FDDEVICE "boot disk"
    3258             CopyImageToDisk $i $FDDEVICE "root disk"
    3259         else
    3260             CopyImageToDisk $j $boot_dev "boot/root disk"
    3261         fi
    3262         count=1
    3263         for i in `find $imagesdir | fgrep mindi-data` ; do
    3264             CopyImageToDisk $i $FDDEVICE "data disk #$count"
    3265             count=$(($count+1))
    3266         done
     3228        OfferToCopyImagesToDisks $imagesdir $boot_dev $FDDEVICE
    32673229    fi
    32683230    OfferToMakeBootableISO $imagesdir
    32693231    LogIt "Finished.\n"
    32703232elif [ "$TAPEDEV" ] ; then
    3271     rm -f $CACHEDIR/{*img,*gz,*iso}
     3233    mkdir -p /root/images/mindi
     3234    rm -f /root/images/mindi/{*img,*gz,*iso}
    32723235    OfferToMakeBootableISO $imagesdir
    32733236    if [ -e "$imagesdir/all.tar.gz" ] ; then
    … …  
    32783241else
    32793242    OfferToMakeBootableISO $imagesdir
     3243fi
     3244if [ "$imagesdir" != "/root/images/mindi" ] ; then
     3245    for i in `find $imagesdir -maxdepth 1 -name "*.iso" -o -name "*.img"` ; do
     3246    cp -f $i /root/images/mindi || LogIt "[line 3260] Cannot copy $i to /root/images/mindi\n"
     3247    done
    32803248fi
    32813249[ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT

  • branches/stable/mondo/ChangeLog

    r497 r541  
    33MONDO CHANGES
    44
    5 v2.2.0 (2006-05-01)
    6 
    7 - Internationalization (A huge thank to rene-marc dolhen
    8 <rmd_at_mecreant.org> who achieved that big task)
    9 - Fixed verify for NFS (Andree Leidenfrost)
    10 - Fix for Bug #6975 (Bruno Cornec)
    11 - Fix a bug when restoring interactively and having file names with blank
    12   (Bruno Cornec)
    13 - Fix options -I and -E of mondoarchive which were not working
    14   (Bruno Cornec)
    15 - Removed 'ax' options from ps call in busybox (Andree Leidenfrost)
    16 
    17 v2.0.7 (2006-02-23)
     5v2.07 (2006-02-23)
    186- useless cat, sort|uniq commands removed
    197  (Bruno Cornec/Sébastien Aperghis-Tramoni)

  • branches/stable/mondo/Makefile.am

    r534 r541  
    11AUTOMAKE_OPTIONS = 1.7
    2 SUBDIRS        = m4 mondo po
     2SUBDIRS        = mondo
    33man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
    4 
    5 ACLOCAL_AMFLAGS = -I m4
    6 
    7 EXTRA_DIST = config.rpath mkinstalldirs

  • branches/stable/mondo/bootstrap

    r502 r541  
    2828make maintainer-clean >/dev/null 2>&1
    2929libtoolize -f -c --automake
    30 cp /usr/bin/gettextize .
    31 perl -pi -e 's~read dummy < /dev/tty~~' gettextize
    32 ./gettextize -c -f --no-changelog < /dev/null
    33 rm -f gettextize
    34 aclocal -I m4
     30aclocal
    3531autoheader
    3632automake

  • branches/stable/mondo/configure.in

    r533 r541  
    3030AC_PROG_MAKE_SET
    3131
    32 AM_GNU_GETTEXT([external])
    33 ALL_LINGUAS="fr"
    3432
    3533dnl --with/--enable stuff
    … …  
    7472        AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
    7573        PTHREAD="-lpthread"
    76         CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
     74        CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    7775        ;;
    7876    *)
    … …  
    123121AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
    124122
    125 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])
     123AC_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])

  • branches/stable/mondo/distributions/gentoo/mondo.ebuild

    r530 r541  
    77DESCRIPTION="The premier GPL disaster recovery solution."
    88HOMEPAGE="http://www.mondorescue.org"
    9 SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tgz"
     9SRC_URI="ftp://ftp.berlios.de/pub/mondorescue/src/${PN/-rescue/}-${PV}.tgz"
    1010
    1111LICENSE="GPL-2"
    … …  
    2222    >=app-arch/bzip2-0.9
    2323    app-cdr/cdrtools
    24     >=sys-apps/mindi-1.0.7
     24    >=sys-apps/mindi-1.06
    2525    >=dev-libs/newt-0.50
    2626    >=sys-libs/slang-1.4.1

  • branches/stable/mondo/distributions/mandriva/spec.m4

    r470 r541  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Archiving/Backup')dnl
    9 dnl OBS is replaced vy what is being obsoleted
    10 define(`OBS', `Obsoletes:   libmondo <= 2.04
    11 Provides:   libmondo')dnl

  • branches/stable/mondo/distributions/redhat/spec.m4

    r529 r541  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
     4define(`SSS', %{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', %{addreqb})dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Applications/Archiving)dnl
    9 dnl OBS is replaced vy what is being obsoleted
    10 define(`OBS', )dnl
     8define(`GRP', Archiving/Archiving)dnl

  • branches/stable/mondo/distributions/rpm/mondo.spec

    r529 r541  
    1010%define src     SSS
    1111%define grp     GRP
    12 %define addreqb mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
     12%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    1313%define addreq  DDD
    1414%define rel     %{mrel}
    1515
    1616Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
    17 Summary(fr):    Un programme pour les utilisateurs de Linux pour créer un CD/tape de sauvegarde/restauration
     17Summary(fr):    Un programme pour les utilisateurs de Linux pour cr�r un CD/tape de sauvegarde/restauration
    1818Summary(it):    Un programma per utenti Linux per creare un CD/tape di rescue
    1919Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
    … …  
    2424License:    GPL
    2525Group:      %{grp}
    26 Url:        http://www.mondorescue.org
     26Url:        http://mondorescue.berlios.de
    2727Source:     %{src}
    28 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
     28BuildRoot:  %{_tmppath}/%{name}-%{version}
    2929BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    30 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
    31 OBS
    3230%ifarch ia64
    3331Requires:   %{addreq}, elilo, parted
    … …  
    6866
    6967%build
    70 %configure --program-prefix=%{?_program_prefix}
     68%configure
    7169%{__make} VERSION=%{version}
    7270
    … …  
    8886%attr(755,root,root) %{_datadir}/%{name}/autorun
    8987%attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
    90 %{_datadir}/locale/*/LC_MESSAGES/mondo.mo
    9188%{_datadir}/%{name}/*
    9289%{_mandir}/man8/*

  • branches/stable/mondo/distributions/suse/spec.m4

    r460 r541  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', Productivity/Archiving/Backup)dnl
    9 dnl OBS is replaced vy what is being obsoleted
    10 define(`OBS', )dnl

  • branches/stable/mondo/mondo/common/Makefile.am

    r538 r541  
    99libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
    1010                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
    11                        libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
     11                       libmondo-mountlist.c libmondo-raid.c \
    1212                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
    1313                       libmondo-verify.c newt-specific.c \
    1414                       libmondo-archive.h libmondo-devices.h \
    1515                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
    16                        libmondo-mountlist.h libmondo-raid.h \
     16                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
    1717                       libmondo-stream.h libmondo-string.h libmondo-tools.h \
    1818                       libmondo-verify.h libmondo-fifo.h \
    … …  
    2020                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
    2121                       libmondo-files-EXT.h libmondo-fork-EXT.h \
    22                        libmondo-filelist-EXT.h \
     22                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
    2323                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
    2424                       libmondo-string-EXT.h libmondo-tools-EXT.h \

  • branches/stable/mondo/mondo/common/libmondo-archive-EXT.h

    r538 r541  
    1515extern int make_slices_and_images(struct s_bkpinfo *bkpinfo,
    1616                                  char *biggielist_fname);
    17 extern int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
     17extern int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
    1818extern int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
    1919extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);
    … …  
    4141                                          char *filelist, char *fname,
    4242                                          int setno);
    43 extern void setenv_mondo_share(void);
     43extern void setenv_mondo_lib(void);

  • branches/stable/mondo/mondo/common/libmondo-archive.c

    r538 r541  
    179179#include "libmondo-devices-EXT.h"
    180180#include "libmondo-tools-EXT.h"
    181 #include "newt-specific-EXT.h"
     181#include "libmondo-gui-EXT.h"
    182182#include "libmondo-fork-EXT.h"
    183183#include "libmondo-files-EXT.h"
    … …  
    186186#include "libmondo-verify-EXT.h"
    187187#include "libmondo-archive.h"
     188#include "lib-common-externs.h"
    188189#include <sys/sem.h>
    189190#include <sys/types.h>
    … …  
    580581 * @ingroup archiveGroup
    581582 */
    582 int backup_data(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
     583int backup_data(struct s_bkpinfo *bkpinfo)
    583584{
    584585    int retval = 0, res = 0;
    … …  
    643644    sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
    644645    run_program_and_log_output(tmp, 1);
    645     retval += make_those_afios_phase(bkpinfo,mrconf);   // backup regular files
     646    retval += make_those_afios_phase(bkpinfo);  // backup regular files
    646647    retval += make_those_slices_phase(bkpinfo); // backup BIG files
    647648    retval += do_that_final_phase(bkpinfo); // clean up
    … …  
    10141015    if (!res) {
    10151016        log_to_screen("Boot+data disks were created OK");
    1016         sprintf(command, "mkdir -p /var/cache/mindi/");
     1017        sprintf(command, "mkdir -p /root/images/mindi/");
    10171018        log_msg(2, command);
    10181019        run_program_and_log_output(command, FALSE);
    10191020        sprintf(command,
    1020                 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
     1021                "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
    10211022                bkpinfo->scratchdir);
    10221023        log_msg(2, command);
    … …  
    12521253 * @ingroup MLarchiveGroup
    12531254 */
    1254 int do_that_final_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
     1255int do_that_final_phase(struct s_bkpinfo *bkpinfo)
    12551256{
    12561257
    … …  
    12731274        /* write final ISO */
    12741275    {
    1275         res = write_final_iso_if_necessary(bkpinfo, mrconf);
     1276        res = write_final_iso_if_necessary(bkpinfo);
    12761277        retval += res;
    12771278        if (res) {
    … …  
    15631564 * @return The number of errors encountered (0 for success)
    15641565 */
    1565 int make_afioballs_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
     1566int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
    15661567{
    15671568
    … …  
    16191620    log_to_screen("Archiving regular files");
    16201621    log_msg(5, "Go, Shorty. It's your birthday.");
    1621     open_progress_form(_("Backing up filesystem"),
    1622                        _("I am backing up your live filesystem now."),
    1623                        _("Please wait. This may take a couple of hours."),
    1624                        _("Working..."),
     1622    open_progress_form("Backing up filesystem",
     1623                       "I am backing up your live filesystem now.",
     1624                       "Please wait. This may take a couple of hours.",
     1625                       "Working...",
    16251626                       get_last_filelist_number(bkpinfo) + 1);
    16261627
    … …  
    17071708            } else {
    17081709                res =
    1709                     move_files_to_cd(bkpinfo, mrconf, storing_filelist_fname,
     1710                    move_files_to_cd(bkpinfo, storing_filelist_fname,
    17101711                                     curr_xattr_list_fname,
    17111712                                     curr_acl_list_fname,
    … …  
    17851786 * @return The number of errors encountered (0 for success)
    17861787 */
    1787 int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile)
     1788int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
    17881789{
    17891790    /*@ int ********************************************** */
    … …  
    18481849    tmp3 = NULL;
    18491850    if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
    1850         popup_and_OK(_("Please insert new media and press Enter."));
     1851        popup_and_OK("Please insert new media and press Enter.");
    18511852    }
    18521853
    … …  
    20052006#ifdef __IA64__
    20062007                log_msg(1, "IA64 --> elilo");
    2007                 asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", mrconf->ia64_boot_size);
    20082008                res = eval_call_to_make_ISO(bkpinfo,
    20092009                                            //-b images/mindi-boot.2880.img
    2010                                             tmp2,
     2010                                            "mkisofs -no-emul-boot -b images/mindi-bootroot."
     2011                                            IA64_BOOT_SIZE
     2012                                            ".img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
    20112013                                            destfile,
    20122014                                            g_current_media_number,
    … …  
    20162018// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
    20172019// and add ' .' at end
    2018                 paranoid_free(tmp2);
    20192020                log_msg(1, "Non-ia64 --> lilo");
    20202021                res =
    … …  
    21502151 */
    21512152int
    2152 make_slices_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggielist_fname)
     2153make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
    21532154{
    21542155
    … …  
    22232224        } else {
    22242225// Call ntfsclone (formerly partimagehack) if it's a /dev entry (i.e. a partition to be imaged)
    2225             log_msg(2, "bigfile_fname = '%s'", bigfile_fname);
     2226            log_msg(2, "bigfile_fname = %s", bigfile_fname);
    22262227            use_ntfsprog = FALSE;
    22272228            if (!strncmp(bigfile_fname, "/dev/", 5)
    … …  
    22692270            }
    22702271            res =
    2271                 slice_up_file_etc(bkpinfo, mrconf, bigfile_fname,
     2272                slice_up_file_etc(bkpinfo, bigfile_fname,
    22722273                                  ntfsprog_fifo, biggie_file_number,
    22732274                                  noof_biggie_files, use_ntfsprog);
    … …  
    23212322 * @see make_afioballs_and_images
    23222323 */
    2323 int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
     2324int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
    23242325{
    23252326
    … …  
    23492350    log_to_screen("Archiving regular files");
    23502351
    2351     open_progress_form(_("Backing up filesystem"),
    2352                        _("I am backing up your live filesystem now."),
    2353                        _("Please wait. This may take a couple of hours."),
    2354                        _("Working..."),
     2352    open_progress_form("Backing up filesystem",
     2353                       "I am backing up your live filesystem now.",
     2354                       "Please wait. This may take a couple of hours.",
     2355                       "Working...",
    23552356                       get_last_filelist_number(bkpinfo) + 1);
    23562357
    … …  
    24032404        } else {
    24042405            res =
    2405                 move_files_to_cd(bkpinfo, mrconf, curr_filelist_fname,
     2406                move_files_to_cd(bkpinfo, curr_filelist_fname,
    24062407                                 curr_xattr_list_fname,
    24072408                                 curr_acl_list_fname, curr_afioball_fname,
    … …  
    24482449 * @ingroup MLarchiveGroup
    24492450 */
    2450 int make_those_afios_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
     2451int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
    24512452{
    24522453    /*@ int ******************************************* */
    … …  
    24652466        log_msg(1,
    24662467                "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
    2467         res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
     2468        res = make_afioballs_and_images_OLD(bkpinfo);
    24682469#else
    2469         res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
     2470        res = make_afioballs_and_images_OLD(bkpinfo);
    24702471#endif
    24712472        write_header_block_to_stream(0, "stop-afioballs",
    24722473                                     BLK_STOP_AFIOBALLS);
    24732474    } else {
    2474         res = make_afioballs_and_images(bkpinfo, mrconf);
     2475        res = make_afioballs_and_images(bkpinfo);
    24752476    }
    24762477
    … …  
    25752576 * transfer files over the network) or leave it as is.
    25762577 */
    2577 int (*move_files_to_cd) (struct s_bkpinfo *, struct s_mrconf *mrconf, char *, ...) =
     2578int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
    25782579    _move_files_to_cd;
    25792580
    … …  
    25962597 * @return The number of errors encountered (0 for success)
    25972598 */
    2598 int _move_files_to_cd(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *files_to_add, ...)
     2599int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
    25992600{
    26002601
    … …  
    26352636    }
    26362637    if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
    2637         res = write_iso_and_go_on(bkpinfo, struct s_mrconf *mrconf, FALSE); /* FALSE because this is not the last CD we'll write */
     2638        res = write_iso_and_go_on(bkpinfo, FALSE);  /* FALSE because this is not the last CD we'll write */
    26382639        retval += res;
    26392640        if (res) {
    … …  
    26852686 * @c backup_media_type field is used in this function.
    26862687 * @param imagesdir The directory containing the floppy images (usually
    2687  * /var/cache/mindi).
     2688 * /root/images/mindi).
    26882689 *
    26892690 * @return The number of errors encountered (0 for success)
    … …  
    28642865    if (!bkpinfo->nonbootable_backup) {
    28652866#ifdef __FreeBSD__
    2866         if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
     2867        if (!does_file_exist("/root/images/mindi/mindi-kern.1722.img"))
    28672868#else
    2868         if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
    2869             && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
    2870             && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
    2871             && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img"))
     2869        if (!does_file_exist("/root/images/mindi/mindi-bootroot.1722.img")
     2870            && !does_file_exist("/root/images/mindi/mindi-boot.1440.img"))
    28722871#endif
    28732872        {
    28742873            mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
    2875             if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
     2874            if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
    28762875                popup_and_OK
    2877                     ("Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
     2876                    ("Boot+data floppy creation failed. However, FYI, you may burn /root/images/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
    28782877                res++;
    28792878            }
    28802879        } else {
    2881             offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
     2880            offer_to_write_floppies(bkpinfo, "/root/images/mindi");
    28822881            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    28832882        }
    … …  
    32793278 */
    32803279int
    3281 slice_up_file_etc(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggie_filename,
     3280slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
    32823281                  char *ntfsprog_fifo, long biggie_file_number,
    32833282                  long noof_biggie_files, bool use_ntfsprog)
    … …  
    34093408    } else {
    34103409        res =
    3411             move_files_to_cd(bkpinfo, mrconf,
     3410            move_files_to_cd(bkpinfo,
    34123411                             slice_fname(biggie_file_number, 0,
    34133412                                         bkpinfo->tmpdir, ""), NULL);
    … …  
    35113510            res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
    35123511        } else {
    3513             res = move_files_to_cd(bkpinfo, mrconf, file_to_archive, NULL);
     3512            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
    35143513        }
    35153514        retval += res;
    … …  
    36033602 * however, this occurs rarely.
    36043603 */
    3605 int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
     3604int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
    36063605{
    36073606    /*@ int ***************************************************** */
    … …  
    36243623    }
    36253624#endif
    3626     res = write_iso_and_go_on(bkpinfo, struct s_mrconf *mrconf, TRUE);
     3625    res = write_iso_and_go_on(bkpinfo, TRUE);
    36273626#ifndef _XWIN
    36283627    if (!g_text_mode) {
    … …  
    36533652 * @see make_iso_fs
    36543653 */
    3655 int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, bool last_cd)
     3654int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
    36563655{
    36573656    /*@ pointers **************************************************** */
    … …  
    37293728            g_current_media_number);
    37303729    for (that_one_was_ok = FALSE; !that_one_was_ok;) {
    3731         res = make_iso_fs(bkpinfo, mrconf, isofile);
     3730        res = make_iso_fs(bkpinfo, isofile);
    37323731        if (g_current_media_number == 1 && !res
    37333732            && (bkpinfo->backup_media_type == cdr
    … …  
    40314030setenv("MONDO_SHARE", MONDO_SHARE, 1);
    40324031}
    4033 
    4034 void mrarchive_init_conf(struct s_mrconf *mrconf) {
    4035     char *command = NULL;
    4036     FILE *conffd = NULL;
    4037     FILE *fin = NULL;
    4038     int n = 0;
    4039     char *param = NULL;
    4040 
    4041     mrconf = (struct s_mrconf *)malloc(sizeof(struct s_mrconf));
    4042     if (mrconf == NULL) {
    4043             fatal_error("Unable to malloc mrconf");
    4044     }
    4045     /* Default for everything int : 0 char * : NULL */
    4046 
    4047     /* mindi conf parameters also needed in mondo */
    4048     mrconf->ia64_boot_size = 0;
    4049 
    4050     asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
    4051     fin = popen(command, "r");
    4052     getline(&param, &n, fin);
    4053     pclose(fin);
    4054     paranoid_free(command);
    4055     mrconf->ia64_boot_size = atoi(param);
    4056     paranoid_free(param);
    4057 
    4058     mrconf->iso_creation_cmd = NULL;
    4059 
    4060     /* Finds mondo conf file */
    4061     mrconf_open(MONDO_CONF_DIR"/mondo.conf");
    4062 
    4063     /* mondo conf parameters needed */
    4064     mrconf->iso_creation_cmd = mrconf_sread(iso_creation_cmd);
    4065 
    4066     mrconf_close();

  • branches/stable/mondo/mondo/common/libmondo-archive.h

    r538 r541  
    1717int make_slices_and_images(struct s_bkpinfo *bkpinfo,
    1818                           char *biggielist_fname);
    19 int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
     19int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
    2020int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
    2121extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);
    … …  
    4242int archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo,
    4343                                   char *filelist, char *fname, int setno);
    44 void setenv_mondo_share(void);
     44void setenv_mondo_lib(void);

  • branches/stable/mondo/mondo/common/libmondo-devices.c

    r501 r541  
    232232#include "libmondo-files-EXT.h"
    233233#include "libmondo-devices.h"
     234#include "lib-common-externs.h"
    234235#include "libmondo-string-EXT.h"
    235236#include "libmondo-tools-EXT.h"
    236 #include "newt-specific-EXT.h"
     237#include "libmondo-gui-EXT.h"
    237238#include "libmondo-fork-EXT.h"
    238239#include "libmondo-stream-EXT.h"
    … …  
    351352            && !does_file_exist("/tmp/mountlist.txt.sample")) {
    352353            log_to_screen
    353                 (_("Using /dev/root is stupid of you but I'll forgive you."));
     354                ("Using /dev/root is stupid of you but I'll forgive you.");
    354355            is_this_a_ramdisk = FALSE;
    355356        }
    … …  
    379380    switch (bt) {
    380381    case none:
    381         strcpy(output, _("none"));
     382        strcpy(output, "none");
    382383        break;
    383384    case iso:
    384         strcpy(output, _("iso"));
     385        strcpy(output, "iso");
    385386        break;
    386387    case cdr:
    387         strcpy(output, _("cdr"));
     388        strcpy(output, "cdr");
    388389        break;
    389390    case cdrw:
    390         strcpy(output, _("cdrw"));
     391        strcpy(output, "cdrw");
    391392        break;
    392393    case cdstream:
    393         strcpy(output, _("cdstream"));
     394        strcpy(output, "cdstream");
    394395        break;
    395396    case nfs:
    396         strcpy(output, _("nfs"));
     397        strcpy(output, "nfs");
    397398        break;
    398399    case tape:
    399         strcpy(output, _("tape"));
     400        strcpy(output, "tape");
    400401        break;
    401402    case udev:
    402         strcpy(output, _("udev"));
     403        strcpy(output, "udev");
    403404        break;
    404405    default:
    405         strcpy(output, _("default"));
     406        strcpy(output, "default");
    406407    }
    407408    return (output);
    … …  
    694695    if (!dev[0] || (res = mount_CDROM_here(dev, mountpoint))) {
    695696        if (!popup_and_get_string
    696             (_("CD-ROM device"), _("Please enter your CD-ROM's /dev device"),
     697            ("CD-ROM device", "Please enter your CD-ROM's /dev device",
    697698             dev, MAX_STR_LEN / 4)) {
    698699            res = 1;
    … …  
    702703    }
    703704    if (res) {
    704         log_msg(1, _("mount failed"));
     705        log_msg(1, "mount failed");
    705706    } else {
    706         log_msg(1, _("mount succeeded with %s"), dev);
     707        log_msg(1, "mount succeeded with %s", dev);
    707708    }
    708709    paranoid_free(dev);
    … …  
    17711772            }
    17721773            if (res) {
    1773                 log_to_screen(_("WARNING - failed to unmount CD-ROM drive"));
     1774                log_to_screen("WARNING - failed to unmount CD-ROM drive");
    17741775            }
    17751776            if (!bkpinfo->please_dont_eject) {
    … …  
    17791780            }
    17801781            if (res) {
    1781                 log_to_screen(_("WARNING - failed to eject CD-ROM disk"));
     1782                log_to_screen("WARNING - failed to eject CD-ROM disk");
    17821783            }
    17831784            popup_and_OK(request);
    … …  
    18401841        which_backup_media_type(bkpinfo->restore_data);
    18411842    if (bkpinfo->backup_media_type == none) {
    1842         log_to_screen(_("User has chosen not to backup the PC"));
     1843        log_to_screen("User has chosen not to backup the PC");
    18431844        finish(1);
    18441845    }
    18451846    if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
    1846         popup_and_OK(_("Please remove CD/floppy from drive(s)"));
     1847        popup_and_OK("Please remove CD/floppy from drive(s)");
    18471848    }
    18481849    log_msg(3, "media type = %s",
    … …  
    18791880        if (archiving_to_media) {
    18801881            if (ask_me_yes_or_no
    1881                 (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
     1882                ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
    18821883            {
    18831884                bkpinfo->manual_cd_tray = TRUE;
    … …  
    18851886            if ((bkpinfo->compression_level =
    18861887                 which_compression_level()) == -1) {
    1887                 log_to_screen(_("User has chosen not to backup the PC"));
     1888                log_to_screen("User has chosen not to backup the PC");
    18881889                finish(1);
    18891890            }
    1890             sprintf(comment, _("What speed is your %s (re)writer?"),
     1891            sprintf(comment, "What speed is your %s (re)writer?",
    18911892                    media_descriptor_string(bkpinfo->backup_media_type));
    18921893            if (bkpinfo->backup_media_type == dvd) {
    … …  
    19021903            }
    19031904            if (bkpinfo->backup_media_type != dvd) {
    1904                 if (!popup_and_get_string(_("Speed"), comment, tmp, 4)) {
    1905                     log_to_screen(_("User has chosen not to backup the PC"));
     1905                if (!popup_and_get_string("Speed", comment, tmp, 4)) {
     1906                    log_to_screen("User has chosen not to backup the PC");
    19061907                    finish(1);
    19071908                }
    … …  
    19091910            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
    19101911            sprintf(comment,
    1911                     _("How much data (in Megabytes) will each %s store?"),
     1912                    "How much data (in Megabytes) will each %s store?",
    19121913                    media_descriptor_string(bkpinfo->backup_media_type));
    19131914            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
    1914                 log_to_screen(_("User has chosen not to backup the PC"));
     1915                log_to_screen("User has chosen not to backup the PC");
    19151916                finish(1);
    19161917            }
    … …  
    19191920            }
    19201921            if (bkpinfo->media_size[0] <= 0) {
    1921                 log_to_screen(_("User has chosen not to backup the PC"));
     1922                log_to_screen("User has chosen not to backup the PC");
    19221923                finish(1);
    19231924            }
    … …  
    19401941                        bkpinfo->media_device);
    19411942                sprintf(comment,
    1942                         _("Please specify your %s drive's /dev entry"),
     1943                        "Please specify your %s drive's /dev entry",
    19431944                        media_descriptor_string(bkpinfo->
    19441945                                                backup_media_type));
    19451946                if (!popup_and_get_string
    1946                     (_("Device?"), comment, bkpinfo->media_device,
     1947                    ("Device?", comment, bkpinfo->media_device,
    19471948                     MAX_STR_LEN / 4)) {
    1948                     log_to_screen(_("User has chosen not to backup the PC"));
     1949                    log_to_screen("User has chosen not to backup the PC");
    19491950                    finish(1);
    19501951                }
    … …  
    19591960            if (bkpinfo->media_device[0]) {
    19601961                sprintf(tmp,
    1961                         _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
     1962                        "I think I've found your %s burner at SCSI node %s; am I right on the money?",
    19621963                        media_descriptor_string(bkpinfo->
    19631964                                                backup_media_type),
    … …  
    19691970            if (!bkpinfo->media_device[0]) {
    19701971                if (g_kernel_version < 2.6) {
    1971                     i = popup_and_get_string(_("Device node?"),
    1972                                              _("What is the SCSI node of your CD (re)writer, please?"),
     1972                    i = popup_and_get_string("Device node?",
     1973                                             "What is the SCSI node of your CD (re)writer, please?",
    19731974                                             bkpinfo->media_device,
    19741975                                             MAX_STR_LEN / 4);
    19751976                } else {
    1976                     i = popup_and_get_string(_("/dev entry?"),
    1977                                              _("What is the /dev entry of your CD (re)writer, please?"),
     1977                    i = popup_and_get_string("/dev entry?",
     1978                                             "What is the /dev entry of your CD (re)writer, please?",
    19781979                                             bkpinfo->media_device,
    19791980                                             MAX_STR_LEN / 4);
    19801981                }
    19811982                if (!i) {
    1982                     log_to_screen(_("User has chosen not to backup the PC"));
     1983                    log_to_screen("User has chosen not to backup the PC");
    19831984                    finish(1);
    19841985                }
    … …  
    19931994    case udev:
    19941995        if (!ask_me_yes_or_no
    1995             (_("This option is for advanced users only. Are you sure?"))) {
    1996             log_to_screen(_("User has chosen not to backup the PC"));
     1996            ("This option is for advanced users only. Are you sure?")) {
     1997            log_to_screen("User has chosen not to backup the PC");
    19971998            finish(1);
    19981999        }
    … …  
    20002001
    20012002        if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
    2002             log_msg(3, _("Ok, using vanilla scsi tape."));
     2003            log_msg(3, "Ok, using vanilla scsi tape.");
    20032004            strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
    20042005            if ((fin = fopen(bkpinfo->media_device, "r"))) {
    … …  
    20182019            }
    20192020            sprintf(tmp,
    2020                     _("I think I've found your tape streamer at %s; am I right on the money?"),
     2021                    "I think I've found your tape streamer at %s; am I right on the money?",
    20212022                    bkpinfo->media_device);
    20222023        }
    20232024        if (bkpinfo->media_device[0]) {
    20242025            sprintf(tmp,
    2025                     _("I think I've found your tape streamer at %s; am I right on the money?"),
     2026                    "I think I've found your tape streamer at %s; am I right on the money?",
    20262027                    bkpinfo->media_device);
    20272028            if (!ask_me_yes_or_no(tmp)) {
    … …  
    20312032        if (!bkpinfo->media_device[0]) {
    20322033            if (!popup_and_get_string
    2033                 (_("Device name?"),
    2034                  _("What is the /dev entry of your tape streamer?"),
     2034                ("Device name?",
     2035                 "What is the /dev entry of your tape streamer?",
    20352036                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
    2036                 log_to_screen(_("User has chosen not to backup the PC"));
     2037                log_to_screen("User has chosen not to backup the PC");
    20372038                finish(1);
    20382039            }
    … …  
    20402041        sprintf(tmp, "ls -l %s", bkpinfo->media_device);
    20412042        if (run_program_and_log_output(tmp, FALSE)) {
    2042             log_to_screen(_("User has not specified a valid /dev entry"));
     2043            log_to_screen("User has not specified a valid /dev entry");
    20432044            finish(1);
    20442045        }
    … …  
    20682069            if ((bkpinfo->compression_level =
    20692070                 which_compression_level()) == -1) {
    2070                 log_to_screen(_("User has chosen not to backup the PC"));
     2071                log_to_screen("User has chosen not to backup the PC");
    20712072                finish(1);
    20722073            }
    … …  
    20892090        {
    20902091            if (!popup_and_get_string
    2091                 (_("NFS dir."),
    2092                  _("Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)"),
     2092                ("NFS dir.",
     2093                 "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
    20932094                 bkpinfo->nfs_mount, MAX_STR_LEN / 4)) {
    2094                 log_to_screen(_("User has chosen not to backup the PC"));
     2095                log_to_screen("User has chosen not to backup the PC");
    20952096                finish(1);
    20962097            }
    … …  
    20982099                if ((bkpinfo->compression_level =
    20992100                     which_compression_level()) == -1) {
    2100                     log_to_screen(_("User has chosen not to backup the PC"));
     2101                    log_to_screen("User has chosen not to backup the PC");
    21012102                    finish(1);
    21022103                }
    … …  
    21132114
    21142115            sprintf(comment,
    2115                     _("How much data (in Megabytes) will each media store?"));
    2116             if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
    2117                 log_to_screen(_("User has chosen not to backup the PC"));
     2116                    "How much data (in Megabytes) will each media store?");
     2117            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
     2118                log_to_screen("User has chosen not to backup the PC");
    21182119                finish(1);
    21192120            }
    … …  
    21222123            }
    21232124            if (bkpinfo->media_size[0] <= 0) {
    2124                 log_to_screen(_("User has chosen not to backup the PC"));
     2125                log_to_screen("User has chosen not to backup the PC");
    21252126                finish(1);
    21262127            }
    … …  
    21292130            system("umount /tmp/isodir 2> /dev/null");
    21302131            if (!popup_and_get_string
    2131                 (_("NFS share"), _("Which remote NFS share should I mount?"),
     2132                ("NFS share", "Which remote NFS share should I mount?",
    21322133                 bkpinfo->nfs_mount, MAX_STR_LEN)) {
    2133                 log_to_screen(_("User has chosen not to backup the PC"));
     2134                log_to_screen("User has chosen not to backup the PC");
    21342135                finish(1);
    21352136            }
    … …  
    21482149        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
    21492150            popup_and_OK
    2150                 (_("Please mount that partition before you try to backup to or restore from it."));
     2151                ("Please mount that partition before you try to backup to or restore from it.");
    21512152            finish(1);
    21522153        }
    21532154        strcpy(tmp, bkpinfo->nfs_remote_dir);
    21542155        if (!popup_and_get_string
    2155             (_("Directory"), _("Which directory within that mountpoint?"), tmp,
     2156            ("Directory", "Which directory within that mountpoint?", tmp,
    21562157             MAX_STR_LEN)) {
    2157             log_to_screen(_("User has chosen not to backup the PC"));
     2158            log_to_screen("User has chosen not to backup the PC");
    21582159            finish(1);
    21592160        }
    … …  
    21662167            strcpy(tmp, bkpinfo->nfs_remote_dir);
    21672168            sprintf(prompt,
    2168                     _("Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup."),
     2169                    "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
    21692170                    bkpinfo->nfs_remote_dir, bkpinfo->isodir);
    21702171            if (!popup_and_get_string
    2171                 (_("Directory"), prompt, tmp, MAX_STR_LEN)) {
    2172                 log_to_screen(_("User has chosen not to backup the PC"));
     2172                ("Directory", prompt, tmp, MAX_STR_LEN)) {
     2173                log_to_screen("User has chosen not to backup the PC");
    21732174                finish(1);
    21742175            }
    … …  
    21802181        }
    21812182        if (!popup_and_get_string
    2182             (_("Prefix."),
    2183              _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
     2183            ("Prefix.",
     2184             "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
    21842185            bkpinfo->prefix, MAX_STR_LEN / 4)) {
    2185             log_to_screen(_("User has chosen not to backup the PC"));
     2186            log_to_screen("User has chosen not to backup the PC");
    21862187            finish(1);
    21872188        }
    … …  
    21992200        if (!bkpinfo->disaster_recovery) {
    22002201            if (!popup_and_get_string
    2201                 (_("Storage dir."),
    2202                  _("Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0"),
     2202                ("Storage dir.",
     2203                 "Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0",
    22032204                 bkpinfo->isodir, MAX_STR_LEN / 4)) {
    2204                 log_to_screen(_("User has chosen not to backup the PC"));
     2205                log_to_screen("User has chosen not to backup the PC");
    22052206                finish(1);
    22062207            }
    … …  
    22082209                if ((bkpinfo->compression_level =
    22092210                     which_compression_level()) == -1) {
    2210                     log_to_screen(_("User has chosen not to backup the PC"));
     2211                    log_to_screen("User has chosen not to backup the PC");
    22112212                    finish(1);
    22122213                }
    22132214                if (!popup_and_get_string
    2214                     (_("ISO size."),
    2215                      _("Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to."),
     2215                    ("ISO size.",
     2216                     "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.",
    22162217                     sz_size, 16)) {
    2217                     log_to_screen(_("User has chosen not to backup the PC"));
     2218                    log_to_screen("User has chosen not to backup the PC");
    22182219                    finish(1);
    22192220                }
    … …  
    22222223                }
    22232224                if (!popup_and_get_string
    2224                     (_("Prefix."),
    2225                      _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
     2225                    ("Prefix.",
     2226                     "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
    22262227                     bkpinfo->prefix, MAX_STR_LEN / 4)) {
    22272228                    log_to_screen("User has chosen not to backup the PC");
    … …  
    22582259#ifdef __FreeBSD__
    22592260            if (!popup_and_get_string
    2260                 (_("Boot device"),
    2261                  _("What is your boot device? (e.g. /dev/ad0)"),
     2261                ("Boot device",
     2262                 "What is your boot device? (e.g. /dev/ad0)",
    22622263                 bkpinfo->boot_device, MAX_STR_LEN / 4)) {
    2263                 log_to_screen(_("User has chosen not to backup the PC"));
     2264                log_to_screen("User has chosen not to backup the PC");
    22642265                finish(1);
    22652266            }
    … …  
    22672268#else
    22682269            if (!popup_and_get_string
    2269                 (_("Boot device"),
    2270                  _("What is your boot device? (e.g. /dev/hda)"),
     2270                ("Boot device",
     2271                 "What is your boot device? (e.g. /dev/hda)",
    22712272                 bkpinfo->boot_device, MAX_STR_LEN / 4)) {
    2272                 log_to_screen(_("User has chosen not to backup the PC"));
     2273                log_to_screen("User has chosen not to backup the PC");
    22732274                finish(1);
    22742275            }
    … …  
    22902291            if (i == 'U') {
    22912292                if (ask_me_yes_or_no
    2292                     (_("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")))
     2293                    ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
    22932294                {
    22942295                    i = 'R';    // raw
    22952296                } else {
    22962297                    log_to_screen
    2297                         (_("I cannot find your boot loader. Please run mondoarchive with parameters."));
     2298                        ("I cannot find your boot loader. Please run mondoarchive with parameters.");
    22982299                    finish(1);
    22992300                }
    … …  
    23032304        strcpy(bkpinfo->include_paths, "/");
    23042305        if (!popup_and_get_string
    2305             (_("Backup paths"),
    2306              _("Please enter paths which you want me to backup. The default is '/' (i.e. everything)."),
     2306            ("Backup paths",
     2307             "Please enter paths which you want me to backup. The default is '/' (i.e. everything).",
    23072308             bkpinfo->include_paths, MAX_STR_LEN)) {
    2308             log_to_screen(_("User has chosen not to backup the PC"));
     2309            log_to_screen("User has chosen not to backup the PC");
    23092310            finish(1);
    23102311        }
    … …  
    23222323        if (strlen(tmp) > 2) {
    23232324            if (!popup_and_get_string
    2324                 (_("NTFS partitions"),
    2325                  _("Please enter/confirm the NTFS partitions you wish to backup as well."),
     2325                ("NTFS partitions",
     2326                 "Please enter/confirm the NTFS partitions you wish to backup as well.",
    23262327                 tmp, MAX_STR_LEN / 4)) {
    2327                 log_to_screen(_("User has chosen not to backup the PC"));
     2328                log_to_screen("User has chosen not to backup the PC");
    23282329                finish(1);
    23292330            }
    … …  
    23332334
    23342335        if (!popup_and_get_string
    2335             (_("Exclude paths"),
    2336              _("Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup."),
     2336            ("Exclude paths",
     2337             "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.",
    23372338             bkpinfo->exclude_paths, MAX_STR_LEN)) {
    2338             log_to_screen(_("User has chosen not to backup the PC"));
     2339            log_to_screen("User has chosen not to backup the PC");
    23392340            finish(1);
    23402341        }
    … …  
    23432344        bkpinfo->verify_data =
    23442345            ask_me_yes_or_no
    2345             (_("Will you want to verify your backups after Mondo has created them?"));
     2346            ("Will you want to verify your backups after Mondo has created them?");
    23462347
    23472348#ifndef __FreeBSD__
    23482349        if (!ask_me_yes_or_no
    2349             (_("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please.")))
     2350            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
    23502351#endif
    23512352        {
    … …  
    23542355
    23552356        if (!ask_me_yes_or_no
    2356             (_("Are you sure you want to proceed? Hit 'no' to abort."))) {
    2357             log_to_screen(_("User has chosen not to backup the PC"));
     2357            ("Are you sure you want to proceed? Hit 'no' to abort.")) {
     2358            log_to_screen("User has chosen not to backup the PC");
    23582359            finish(1);
    23592360        }

  • branches/stable/mondo/mondo/common/libmondo-fifo.c

    r501 r541  
    178178    if (!res) {
    179179        bufsize++;
    180         sprintf(tmp, _("Negotiated max buffer of %d MB "), bufsize);
     180        sprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
    181181        log_to_screen(tmp);
    182182    } else {
    … …  
    184184        res = 0;
    185185        log_to_screen
    186             (_("Cannot negotiate a buffer of ANY size. Using dd instead."));
     186            ("Cannot negotiate a buffer of ANY size. Using dd instead.");
    187187    }
    188188    if (direction == 'r') {
    … …  
    220220    if (run_program_and_log_output(command, 1)) {
    221221        fres = NULL;
    222         log_to_screen(_("Failed to open tape streamer. Buffer error."));
    223     } else {
    224         log_to_screen(_("Buffer successfully started."));
     222        log_to_screen("Failed to open tape streamer. Buffer error.");
     223    } else {
     224        log_to_screen("Buffer successfully started.");
    225225    }
    226226

  • branches/stable/mondo/mondo/common/libmondo-filelist.c

    r538 r541  
    110110#include "my-stuff.h"
    111111#include "mondostructures.h"
     112#include "lib-common-externs.h"
    112113#include "libmondo-filelist.h"
    113114#include "libmondo-string-EXT.h"
    114115#include "libmondo-files-EXT.h"
    115116#include "libmondo-fork-EXT.h"
    116 #include "newt-specific-EXT.h"
     117#include "libmondo-gui-EXT.h"
    117118#include "libmondo-tools-EXT.h"
    118119
    … …  
    202203    malloc_string(cksumlist);
    203204    malloc_string(tmp);
    204     mvaddstr_and_log_it(g_currentY, 0, _("Dividing filelist into sets"));
    205 
    206     log_to_screen(_("Dividing filelist into sets. Please wait."));
     205    mvaddstr_and_log_it(g_currentY, 0, "Dividing filelist into sets");
     206
     207    log_to_screen("Dividing filelist into sets. Please wait.");
    207208    i = 0;
    208209/*
    … …  
    502503    if (depth == 0) {
    503504        open_evalcall_form("Freeing memory");
    504         log_to_screen(_("Freeing memory formerly occupied by filelist"));
     505        log_to_screen("Freeing memory formerly occupied by filelist");
    505506    }
    506507    depth++;
    … …  
    940941/* add here */
    941942    if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
    942         log_to_screen(_("failed to malloc"));
     943        log_to_screen("failed to malloc");
    943944        depth--;
    944945        return (1);
    … …  
    972973            (node->down =
    973974             (struct s_node *) malloc(sizeof(struct s_node)))) {
    974             log_to_screen(_("%s - failed to malloc"), string_to_add);
     975            log_to_screen("%s - failed to malloc", string_to_add);
    975976            return (1);
    976977        }
    … …  
    10251026        fatal_error("filelist does not exist -- cannot load it");
    10261027    }
    1027     log_to_screen(_("Loading filelist"));
     1028    log_to_screen("Loading filelist");
    10281029    sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
    10291030    sprintf(tmp, "zcat %s | wc -l", filelist_fname);
    … …  
    10321033        atol(call_program_and_get_last_line_of_output(tmp));
    10331034    if (lines_in_filelist < 3) {
    1034         log_to_screen(_("Warning - surprisingly short filelist."));
     1035        log_to_screen("Warning - surprisingly short filelist.");
    10351036    }
    10361037    g_original_noof_lines_in_filelist = lines_in_filelist;
    … …  
    10491050        return (NULL);
    10501051    }
    1051     open_evalcall_form(_("Loading filelist from disk"));
     1052    open_evalcall_form("Loading filelist from disk");
    10521053    for (fgets(fname, MAX_STR_LEN, pin); !feof(pin);
    10531054         fgets(fname, MAX_STR_LEN, pin)) {
    … …  
    11661167    assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
    11671168    if (depth == 0) {
    1168         log_to_screen(_("Saving filelist"));
     1169        log_to_screen("Saving filelist");
    11691170        if (!(fout = fopen(outfname, "w"))) {
    11701171            fatal_error("Cannot openout/save filelist");
    11711172        }
    11721173        lines_in_filelist = g_original_noof_lines_in_filelist;  /* set by load_filelist() */
    1173         open_evalcall_form(_("Saving selection to disk"));
     1174        open_evalcall_form("Saving selection to disk");
    11741175    }
    11751176    for (node = filelist; node != NULL; node = node->right) {
    … …  
    14511452    if (bkpinfo->make_filelist) {
    14521453        mvaddstr_and_log_it(g_currentY, 0,
    1453                             _("Making catalog of files to be backed up"));
     1454                            "Making catalog of files to be backed up");
    14541455    } else {
    14551456        mvaddstr_and_log_it(g_currentY, 0,
    1456                             _("Using supplied catalog of files to be backed up"));
     1457                            "Using supplied catalog of files to be backed up");
    14571458    }
    14581459
    … …  
    14751476        log_OS_error("Call to mondo-makefilelist failed");
    14761477        *p_res++;
    1477         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1478        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    14781479    } else {
    1479         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1480        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    14801481    }
    14811482    return (res);
    … …  
    15711572#ifndef _XWIN
    15721573                if (!g_text_mode) {
    1573                     sprintf(tmp, _("Reading %-68s"), dir);
     1574                    sprintf(tmp, "Reading %-68s", dir);
    15741575                    newtDrawRootText(0, g_noof_rows - 3, tmp);
    15751576                }
    … …  
    17051706                       char *userdef_filelist)
    17061707{
    1707     char sz_datefile_wildcard[] = "/var/cache/mondo/difflevel.%d";
     1708    char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
    17081709    char *p, *q;
    17091710    char sz_datefile[80];
    … …  
    17741775        sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
    17751776" MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
    1776 /proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
     1777/proc /sys /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
    17771778
    17781779        log_msg(2, "Excluding paths = '%s'", exclude_paths);

  • branches/stable/mondo/mondo/common/libmondo-files.c

    r501 r541  
    8888#include "libmondo-files.h"
    8989
     90#include "lib-common-externs.h"
     91
    9092#include "libmondo-tools-EXT.h"
    91 #include "newt-specific-EXT.h"
     93#include "libmondo-gui-EXT.h"
    9294#include "libmondo-devices-EXT.h"
    9395#include "libmondo-fork-EXT.h"
    … …  
    360362    while (!kernel[0]) {
    361363        if (!ask_me_yes_or_no
    362             (_("Kernel not found or invalid. Choose another?"))) {
     364            ("Kernel not found or invalid. Choose another?")) {
    363365            return (1);
    364366        }
    365367        if (!popup_and_get_string
    366             (_("Kernel path"),
    367              _("What is the full path and filename of your kernel, please?"),
     368            ("Kernel path",
     369             "What is the full path and filename of your kernel, please?",
    368370             kernel, MAX_STR_LEN / 4)) {
    369371            fatal_error
    … …  
    573575
    574576    if (!does_file_exist(filename)) {
    575         sprintf(tmp, "Trying to get last line of nonexistent file (%s)",
     577        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
    576578                filename);
    577579        log_it(tmp);
    … …  
    662664        log_OS_error("Unable to openout cksumlist");
    663665        paranoid_fclose(fin);
    664         log_to_screen(_("Can't open checksum list"));
     666        log_to_screen("Can't open checksum list");
    665667        return (1);
    666668    }
    … …  
    687689                    time_taken * 100 / (long) (percentage) - time_taken;
    688690                sprintf(tmp,
    689                         _("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s"),
     691                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
    690692                        percentage, (int) (time_taken / 60),
    691693                        (int) (time_taken % 60),
    … …  
    10271029    sprintf(command, "which %s > /dev/null 2> /dev/null", fname);
    10281030    sprintf(errorstr,
    1029             _("Please install '%s'. I cannot find it on your system."),
     1031            "Please install '%s'. I cannot find it on your system.",
    10301032            fname);
    10311033    if (system(command)) {
    10321034        log_to_screen(errorstr);
    10331035        log_to_screen
    1034             (_("There may be hyperlink at http://www.mondorescue.com which"));
    1035         log_to_screen(_("will take you to the relevant (missing) package."));
     1036            ("There may be hyperlink at http://www.mondorescue.com which");
     1037        log_to_screen("will take you to the relevant (missing) package.");
    10361038        return (1);
    10371039    } else {
    … …  
    11481150        fatal_error("Failed to copy Mondo's stuff to scratchdir");
    11491151    }
    1150 
    1151     /* i18n */
    1152     sprintf(command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
    1153     log_msg(4, "command = %s", command);
    1154     run_program_and_log_output(command, 1);
    11551152
    11561153    sprintf(tmp, "%s/payload.tgz", g_mondo_home);
    … …  
    13871384    if (scratchLL <= 1) {
    13881385        sprintf(tmp,
    1389                 _("Your backup will probably occupy a single %s. Maybe two."),
     1386                "Your backup will probably occupy a single %s. Maybe two.",
    13901387                media_descriptor_string(bkpinfo->backup_media_type));
    13911388    } else if (scratchLL > 4) {
    13921389        sprintf(tmp,
    1393                 _("Your backup will occupy one meeeeellion media! (maybe %s)"),
     1390                "Your backup will occupy one meeeeellion media! (maybe %s)",
    13941391                number_to_text((int) (scratchLL + 1)));
    13951392    } else {
    1396         sprintf(tmp, _("Your backup will occupy approximately %s media."),
     1393        sprintf(tmp, "Your backup will occupy approximately %s media.",
    13971394                number_to_text((int) (scratchLL + 1)));
    13981395    }

  • branches/stable/mondo/mondo/common/libmondo-fork.c

    r501 r541  
    106106#include "libmondo-fork.h"
    107107#include "libmondo-string-EXT.h"
    108 #include "newt-specific-EXT.h"
     108#include "libmondo-gui-EXT.h"
    109109#include "libmondo-files-EXT.h"
    110110#include "libmondo-tools-EXT.h"
     111#include "lib-common-externs.h"
    111112
    112113/*@unused@*/
    … …  
    162163
    163164
    164 #define MONDO_POPMSG  _("Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag.")
     165#define MONDO_POPMSG  "Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
    165166
    166167/**
    … …  
    233234
    234235    log_to_screen
    235         (_("Please be patient. Do not be alarmed by on-screen inactivity."));
     236        ("Please be patient. Do not be alarmed by on-screen inactivity.");
    236237    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
    237238            what_i_am_doing);
    … …  
    261262        if (retval) {
    262263            log_msg(2, "Basic call '%s' returned an error.", basic_call);
    263             popup_and_OK(_("Press ENTER to continue."));
     264            popup_and_OK("Press ENTER to continue.");
    264265            popup_and_OK
    265                 (_("mkisofs and/or cdrecord returned an error. CD was not created"));
     266                ("mkisofs and/or cdrecord returned an error. CD was not created");
    266267        }
    267268    }
    … …  
    447448    if (!(fin = popen(command, "r"))) {
    448449        log_OS_error("Unable to popen-in command");
    449         sprintf(tmp, _("Failed utterly to call '%s'"), command);
     450        sprintf(tmp, "Failed utterly to call '%s'", command);
    450451        log_to_screen(tmp);
    451452        return (1);
    452453    }
    453454    if (!does_file_exist(lockfile)) {
    454         log_to_screen(_("Waiting for external binary to start"));
     455        log_to_screen("Waiting for external binary to start");
    455456        for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
    456457            log_msg(3, "Waiting for lockfile %s to exist", lockfile);
    … …  
    711712        if (pcno <= 5 && last_pcno > 40) {
    712713            close_evalcall_form();
    713             strcpy(title, _("Verifying..."));
     714            strcpy(title, "Verifying...");
    714715            open_evalcall_form(title);
    715716        }
    … …  
    799800        if (pcno <= 5 && last_pcno >= 40) {
    800801            close_evalcall_form();
    801             strcpy(title, _("Verifying..."));
     802            strcpy(title, "Verifying...");
    802803            open_evalcall_form(title);
    803804        }

  • branches/stable/mondo/mondo/common/libmondo-mountlist.c

    r501 r541  
    5353#include "mondostructures.h"
    5454#include "libmondo-mountlist.h"
     55#include "lib-common-externs.h"
    5556#include "libmondo-raid-EXT.h"
    5657#include "libmondo-devices-EXT.h"
    5758#include "libmondo-tools-EXT.h"
    5859#include "libmondo-string-EXT.h"
    59 #include "newt-specific-EXT.h"
     60#include "libmondo-gui-EXT.h"
    6061
    6162/*@unused@*/
    … …  
    950951    if (!(fin = fopen(fname, "r"))) {
    951952        log_it("Unable to open mountlist - '%s'", fname);
    952         log_to_screen(_("Cannot open mountlist"));
     953        log_to_screen("Cannot open mountlist");
    953954        paranoid_free(incoming);
    954955        paranoid_free(siz);
    … …  
    993994            && mountlist->el[items].device[0] != '#') {
    994995            if (items >= ARBITRARY_MAXIMUM) {
    995                 log_to_screen(_("Too many lines in mountlist.. ABORTING"));
     996                log_to_screen("Too many lines in mountlist.. ABORTING");
    996997                finish(1);
    997998            }

  • branches/stable/mondo/mondo/common/libmondo-raid.c

    r501 r541  
    4242#include "my-stuff.h"
    4343#include "mondostructures.h"
    44 #include "newt-specific-EXT.h"
     44#include "libmondo-gui-EXT.h"
    4545#include "libmondo-files-EXT.h"
    4646#include "libmondo-tools-EXT.h"
    4747#include "libmondo-string-EXT.h"
     48#include "lib-common-externs.h"
    4849#include "libmondo-raid.h"
    4950
    … …  
    957958                    ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes?!?!");
    958959                popup_and_OK
    959                     (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
     960                    ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
    960961                return size * sign * 1024 * 1024 * 1024 * 1024 * 1024 *
    961962                    1024 * 1024 * 1024;
    … …  
    11121113        // FIXME --- the above line does not allow for spare disks
    11131114        log_to_screen
    1114             (_("FIXME - create_raidtab_from_mdstat does not allow for spare disks"));
     1115            ("FIXME - create_raidtab_from_mdstat does not allow for spare disks");
    11151116    }
    11161117    raidlist->entries = i;

  • branches/stable/mondo/mondo/common/libmondo-stream.c

    r501 r541  
    100100#include "mondostructures.h"
    101101#include "libmondo-devices.h"
     102#include "lib-common-externs.h"
    102103#include "libmondo-stream.h"
    103104#include "libmondo-string-EXT.h"
    104105#include "libmondo-files-EXT.h"
    105 #include "newt-specific-EXT.h"
     106#include "libmondo-gui-EXT.h"
    106107#include "libmondo-fork-EXT.h"
    107108#include "libmondo-tools-EXT.h"
    … …  
    518519        //      log_it("g_current_media_number = %d", g_current_media_number);
    519520        sprintf(tmp,
    520                 _("When the tape drive goes quiet, please insert volume %d in this series."),
     521                "When the tape drive goes quiet, please insert volume %d in this series.",
    521522                tapeno);
    522523        popup_and_OK(tmp);
    523         open_evalcall_form(_("Waiting while the tape drive settles"));
    524     } else {
    525         open_evalcall_form(_("Waiting while the tape drive rewinds"));
     524        open_evalcall_form("Waiting while the tape drive settles");
     525    } else {
     526        open_evalcall_form("Waiting while the tape drive rewinds");
    526527    }
    527528
    … …  
    730731                                bkpinfo->internal_tape_block_size))) {
    731732        log_OS_error(g_tape_fifo);
    732         log_to_screen(_("Cannot openin stream device"));
     733        log_to_screen("Cannot openin stream device");
    733734        return (1);
    734735    }
    735     log_to_screen(_("Reading stream"));
     736    log_to_screen("Reading stream");
    736737    log_it("stream device = '%s'", bkpinfo->media_device);
    737738/* skip data disks */
    738739    open_evalcall_form("Skipping data disks on stream");
    739     log_to_screen(_("Skipping data disks on stream"));
     740    log_to_screen("Skipping data disks on stream");
    740741    if (!(fout = fopen(outfname, "w"))) {
    741742        log_OS_error(outfname);
    742         log_to_screen(_("Cannot openout datadisk all.tar.gz file"));
     743        log_to_screen("Cannot openout datadisk all.tar.gz file");
    743744        return (-1);
    744745    }
    745746    if (!(datablock = (char *) malloc(256 * 1024))) {
    746         log_to_screen(_("Unable to malloc 256*1024"));
     747        log_to_screen("Unable to malloc 256*1024");
    747748        exit(1);
    748749    }
    … …  
    821822        return (0);
    822823    } else {
    823         log_to_screen(_("Failed to openout to cdstream (fifo)"));
     824        log_to_screen("Failed to openout to cdstream (fifo)");
    824825        return (1);
    825826    }
    … …  
    854855         open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
    855856        log_OS_error(g_tape_fifo);
    856         log_to_screen(_("Cannot openin stream device"));
     857        log_to_screen("Cannot openin stream device");
    857858        return (1);
    858859    }
    … …  
    997998    if (!fout) {
    998999        log_OS_error(outfname);
    999         log_to_screen(_("Cannot openout file"));
     1000        log_to_screen("Cannot openout file");
    10001001        return (1);
    10011002    }
    … …  
    10551056    }
    10561057    if (strcmp(temp_cksum, actual_cksum)) {
    1057         sprintf(tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
     1058        sprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
    10581059                temp_cksum);
    10591060        log_to_screen(tmp);
    1060         sprintf(tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
     1061        sprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
    10611062                (long) orig_size >> 10);
    10621063        log_to_screen(tmp);
    … …  
    12101211        log_it("mediasize = %ld", mediasize);
    12111212        we_need_a_new_tape = TRUE;
    1212         log_to_screen(_("Should have started a new tape/CD already"));
     1213        log_to_screen("Should have started a new tape/CD already");
    12131214    }
    12141215    if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
    … …  
    13671368                                bkpinfo->internal_tape_block_size))) {
    13681369        log_OS_error(g_tape_fifo);
    1369         log_to_screen(_("Cannot openin stream device"));
     1370        log_to_screen("Cannot openin stream device");
    13701371        return (1);
    13711372    }
    … …  
    14051406    if (g_current_media_number > MAX_NOOF_MEDIA) {
    14061407        res++;
    1407         log_to_screen(_("Too many tapes. Man, you need to use nfs!"));
     1408        log_to_screen("Too many tapes. Man, you need to use nfs!");
    14081409    }
    14091410    if (bkpinfo->backup_media_type == cdstream) {
    … …  
    14171418        g_tape_stream = popen(command, "w");
    14181419        if (!g_tape_stream) {
    1419             log_to_screen(_("Failed to openout to cdstream (fifo)"));
     1420            log_to_screen("Failed to openout to cdstream (fifo)");
    14201421            return (1);
    14211422        }
    … …  
    14271428                                    bkpinfo->internal_tape_block_size))) {
    14281429            log_OS_error(g_tape_fifo);
    1429             log_to_screen(_("Cannot openin stream device"));
     1430            log_to_screen("Cannot openin stream device");
    14301431            return (1);
    14311432        }
    … …  
    15121513    /*@ end vars *************************************************** */
    15131514
    1514     open_evalcall_form(_("Writing data disks to tape"));
    1515     log_to_screen(_("Writing data disks to tape"));
     1515    open_evalcall_form("Writing data disks to tape");
     1516    log_to_screen("Writing data disks to tape");
    15161517    log_it("Data disks = %s", fname);
    15171518    if (!does_file_exist(fname)) {
    1518         sprintf(tmp, _("Cannot find %s"), fname);
     1519        sprintf(tmp, "Cannot find %s", fname);
    15191520        log_to_screen(tmp);
    15201521        return (1);
    … …  
    17051706    if (!g_tape_stream) {
    17061707        log_to_screen
    1707             (_("You're not backing up to tape. Why write a tape header?"));
     1708            ("You're not backing up to tape. Why write a tape header?");
    17081709        return (1);
    17091710    }
    … …  
    17501751
    17511752    /*@ end vars *************************************************** */
    1752     sprintf(tmp, _("Wrong marker! (Should be %s, "),
     1753    sprintf(tmp, "Wrong marker! (Should be %s, ",
    17531754            marker_to_string(should_be));
    1754     sprintf(tmp + strlen(tmp), _("is actually %s)"), marker_to_string(it_is));
     1755    sprintf(tmp + strlen(tmp), "is actually %s)", marker_to_string(it_is));
    17551756    log_to_screen(tmp);
    17561757}

  • branches/stable/mondo/mondo/common/libmondo-string.c

    r501 r541  
    6565#include "mondostructures.h"
    6666#include "libmondo-string.h"
     67#include "lib-common-externs.h"
    6768#include "libmondo-files-EXT.h"
    68 #include "newt-specific-EXT.h"
     69#include "libmondo-gui-EXT.h"
    6970#include "libmondo-tools-EXT.h"
    7071
    … …  
    296297            ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes of data?!?!");
    297298        popup_and_OK
    298             (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
     299            ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
    299300        fatal_error("Integer overflow.");
    300301    } else if (ch != 'm' && ch != 'M') {
    … …  
    983984    sev = 3;
    984985    sprintf(reason,
    985             _("Changed since backup. Consider running a differential backup in a day or two."));
     986            "Changed since backup. Consider running a differential backup in a day or two.");
    986987    if (!strncmp(filename, "/var/", 5)) {
    987988        sev = 2;
    988989        sprintf(reason,
    989                 _("/var's contents will change regularly, inevitably."));
     990                "/var's contents will change regularly, inevitably.");
    990991    }
    991992    if (!strncmp(filename, "/home", 5)) {
    992993        sev = 2;
    993994        sprintf(reason,
    994                 _("It's in your /home partiton. Therefore, it is important."));
     995                "It's in your /home partiton. Therefore, it is important.");
    995996    }
    996997    if (!strncmp(filename, "/usr/", 5)) {
    997998        sev = 3;
    998999        sprintf(reason,
    999                 _("You may have installed/removed software during the backup."));
     1000                "You may have installed/removed software during the backup.");
    10001001    }
    10011002    if (!strncmp(filename, "/etc/", 5)) {
    10021003        sev = 3;
    10031004        sprintf(reason,
    1004                 _("Do not edit config files while backing up your PC."));
     1005                "Do not edit config files while backing up your PC.");
    10051006    }
    10061007    if (!strcmp(filename, "/etc/adjtime")
    10071008        || !strcmp(filename, "/etc/mtab")) {
    10081009        sev = 1;
    1009         sprintf(reason, _("This file changes all the time. It's OK."));
     1010        sprintf(reason, "This file changes all the time. It's OK.");
    10101011    }
    10111012    if (!strncmp(filename, "/root/", 6)) {
    10121013        sev = 3;
    1013         sprintf(reason, _("Were you compiling/editing something in /root?"));
     1014        sprintf(reason, "Were you compiling/editing something in /root?");
    10141015    }
    10151016    if (!strncmp(filename, "/root/.", 7)) {
    10161017        sev = 2;
    1017         sprintf(reason, _("Temp or 'dot' files changed in /root."));
     1018        sprintf(reason, "Temp or 'dot' files changed in /root.");
    10181019    }
    10191020    if (!strncmp(filename, "/var/lib/", 9)) {
    10201021        sev = 2;
    1021         sprintf(reason, _("Did you add/remove software during backing?"));
     1022        sprintf(reason, "Did you add/remove software during backing?");
    10221023    }
    10231024    if (!strncmp(filename, "/var/lib/rpm", 12)) {
    10241025        sev = 3;
    1025         sprintf(reason, _("Did you add/remove software during backing?"));
     1026        sprintf(reason, "Did you add/remove software during backing?");
    10261027    }
    10271028    if (!strncmp(filename, "/var/lib/slocate", 16)) {
    10281029        sev = 1;
    10291030        sprintf(reason,
    1030                 _("The 'update' daemon ran during backup. This does not affect the integrity of your backup."));
     1031                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
    10311032    }
    10321033    if (!strncmp(filename, "/var/log/", 9)
    … …  
    10351036        sev = 1;
    10361037        sprintf(reason,
    1037                 _("Log files change frequently as the computer runs. Fret not."));
     1038                "Log files change frequently as the computer runs. Fret not.");
    10381039    }
    10391040    if (!strncmp(filename, "/var/spool", 10)) {
    10401041        sev = 1;
    10411042        sprintf(reason,
    1042                 _("Background processes or printers were active. This does not affect the integrity of your backup."));
     1043                "Background processes or printers were active. This does not affect the integrity of your backup.");
    10431044    }
    10441045    if (!strncmp(filename, "/var/spool/mail", 10)) {
    10451046        sev = 2;
    1046         sprintf(reason, _("Mail was sent/received during backup."));
     1047        sprintf(reason, "Mail was sent/received during backup.");
    10471048    }
    10481049    if (filename[strlen(filename) - 1] == '~') {
    10491050        sev = 1;
    10501051        sprintf(reason,
    1051                 _("Backup copy of another file which was modified recently."));
     1052                "Backup copy of another file which was modified recently.");
    10521053    }
    10531054    if (strstr(filename, "cache")) {
    10541055        sev = 1;
    10551056        sprintf(reason,
    1056                 _("Part of a cache of data. Caches change from time to time. Don't worry."));
     1057                "Part of a cache of data. Caches change from time to time. Don't worry.");
    10571058    }
    10581059    if (!strncmp(filename, "/var/run/", 9)
    … …  
    11311132//    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
    11321133    {
    1133         sprintf(outstr, _("Volume %d: %s kilobytes archived so far"),
     1134        sprintf(outstr, "Volume %d: %s kilobytes archived so far",
    11341135                g_current_media_number, pos_w_commas);
    11351136        return (outstr);
    … …  
    11441145            percentage = 100;
    11451146        }
    1146         sprintf(outstr, _("Volume %d: ["), g_current_media_number);
     1147        sprintf(outstr, "Volume %d: [", g_current_media_number);
    11471148    } else {
    11481149        percentage =
    … …  
    11601161    }
    11611162    j = (int) strlen(outstr);
    1162     sprintf(outstr + j, _("] %d%% used"), percentage);
     1163    sprintf(outstr + j, "] %d%% used", percentage);
    11631164    paranoid_free(pos_w_commas);
    11641165    paranoid_free(tmp);

  • branches/stable/mondo/mondo/common/libmondo-tools.c

    r538 r541  
    174174#include "my-stuff.h"
    175175#include "mondostructures.h"
     176#include "lib-common-externs.h"
    176177#include "libmondo-tools.h"
    177 #include "newt-specific-EXT.h"
     178#include "libmondo-gui-EXT.h"
    178179#include "libmondo-files-EXT.h"
    179180#include "libmondo-fork-EXT.h"
    … …  
    270271        newtSuspend();
    271272#endif
    272     printf(_("ASSERTION FAILED: `%s'\n"), exp);
    273     printf(_("\tat %s:%d in %s\n\n"), file, line, function);
    274     printf(_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
     273    printf("ASSERTION FAILED: `%s'\n", exp);
     274    printf("\tat %s:%d in %s\n\n", file, line, function);
     275    printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
    275276    do {
    276277        is_valid = TRUE;
    … …  
    299300        case '\n':
    300301            printf
    301                 (_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
     302                ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
    302303            break;
    303304        default:
    304305            is_valid = FALSE;
    305             printf(_("Invalid choice.\n"));
     306            printf("Invalid choice.\n");
    306307            break;
    307308        }
    … …  
    472473#endif
    473474}
     475
     476
     477/**
     478 * Log a trace message to the trace file.
     479 * @bug This function seems orphaned. Please remove.
     480 */
     481void log_trace(char *o)
     482{
     483    /*@ pointers **************************************************** */
     484    FILE *fout;
     485
     486    /*@ buffers ***************************************************** */
     487    char output[MAX_STR_LEN];
     488
     489    /*@ int    ****************************************************** */
     490    int i;
     491
     492    /*@ end vars *************************************************** */
     493
     494    if (o[0] == '\0') {
     495        return;
     496    }
     497    strcpy(output, o);
     498    i = (int) strlen(output);
     499    if (i <= 0) {
     500        return;
     501    }
     502    if (output[i - 1] < 32) {
     503        output[i - 1] = '\0';
     504    }
     505    if (g_text_mode
     506        /* && !strstr(last_line_of_file(MONDO_LOGFILE),output) */ ) {
     507        printf("%s\n", output);
     508    }
     509
     510    fout = fopen(MONDO_TRACEFILE, "a");
     511    if (fout) {
     512        fprintf(fout, "%s\n", output);
     513        paranoid_fclose(fout);
     514    } else {
     515        log_OS_error("Cannot write to tracefile");
     516    }
     517}
     518
     519
     520
    474521
    475522
    … …  
    923970        strcpy(bkpinfo->isodir, "/");
    924971    } else {
    925         strcpy(bkpinfo->isodir, "/var/cache/mondo/iso");
     972        strcpy(bkpinfo->isodir, "/root/images/mondo");
    926973    }
    927974    strcpy(bkpinfo->prefix, STD_PREFIX);
    … …  
    10221069    if (atol(tmp) < 35000) {
    10231070        retval++;
    1024         log_to_screen(_("You must have at least 32MB of RAM to use Mondo."));
     1071        log_to_screen("You must have at least 32MB of RAM to use Mondo.");
    10251072    }
    10261073    if (atol(tmp) < 66000) {
    10271074        log_to_screen
    1028             (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
    1029     }
    1030 #endif
    1031 
    1032     if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -1) /* {
     1075            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     1076    }
     1077#endif
     1078
     1079    if ((Lres = free_space_on_given_partition("/root")) == -1) {
    10331080        Lres = free_space_on_given_partition("/");
    10341081    }
    1035     */
    10361082    log_it("Free space on given partition = %ld MB", Lres);
    10371083
    10381084    if (Lres < 50) {
    1039         fatal_error("Your /var/cache/mondo partition has <50MB free. Please adjust your partition table to something saner.");
     1085        run_program_and_log_output
     1086            ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi",
     1087             3);
     1088        //      fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner.");
    10401089    }
    10411090
    … …  
    10511100        ("grep ramdisk /proc/devices", FALSE)) {
    10521101        if (!ask_me_yes_or_no
    1053             (_("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?")))
     1102            ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
    10541103        {
    10551104            //          retval++;
    10561105            log_to_screen
    1057                 (_("It looks as if your kernel lacks ramdisk and initrd support."));
     1106                ("It looks as if your kernel lacks ramdisk and initrd support.");
    10581107            log_to_screen
    1059                 (_("I'll allow you to proceed but FYI, if I'm right, your kernel is broken."));
     1108                ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
    10601109        }
    10611110    }
    … …  
    10791128        !run_program_and_log_output
    10801129        ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
    1081         log_to_screen(_("I think you have a Windows 9x partition."));
     1130        log_to_screen("I think you have a Windows 9x partition.");
    10821131        retval += whine_if_not_found("parted");
    10831132#ifndef __IA64__
    … …  
    10851134        // retval +=
    10861135        if (!find_home_of_exe("ms-sys")) {
    1087             log_to_screen(_("Please install ms-sys just in case."));
     1136            log_to_screen("Please install ms-sys just in case.");
    10881137        }
    10891138#endif
    … …  
    10951144        } else {
    10961145            log_to_screen
    1097                 (_("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you."));
     1146                ("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
    10981147            if (run_program_and_log_output
    10991148                ("cp -f `which true` /usr/bin/cmp", 0)) {
    … …  
    11101159        if (strstr(tmp, "autofs")) {
    11111160            log_to_screen
    1112                 (_("Your CD-ROM is mounted via autofs. I therefore cannot tell"));
     1161                ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
    11131162            log_to_screen
    1114                 (_("if a CD actually is inserted. If a CD is inserted, please"));
    1115             log_to_screen(_("eject it. Thank you."));
     1163                ("if a CD actually is inserted. If a CD is inserted, please");
     1164            log_to_screen("eject it. Thank you.");
    11161165            log_it
    11171166                ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
    … …  
    11391188            retval++;
    11401189            log_to_screen
    1141                 (_("Please find out what happened to /etc/modules.conf"));
     1190                ("Please find out what happened to /etc/modules.conf");
    11421191        }
    11431192    }
    … …  
    11521201
    11531202    if (run_program_and_log_output("mindi -V", 1)) {
    1154         log_to_screen(_("Could not ascertain mindi's version number."));
     1203        log_to_screen("Could not ascertain mindi's version number.");
    11551204        log_to_screen
    1156             (_("You have not installed Mondo and/or Mindi properly."));
    1157         log_to_screen(_("Please uninstall and reinstall them both."));
     1205            ("You have not installed Mondo and/or Mindi properly.");
     1206        log_to_screen("Please uninstall and reinstall them both.");
    11581207        fatal_error("Please reinstall Mondo and Mindi.");
    11591208    }
    … …  
    11611210        ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
    11621211        log_to_screen
    1163             (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
     1212            ("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason.");
    11641213        log_to_screen
    1165             (_("Please run that command by hand and examine /var/log/mindi.log"));
     1214            ("Please run that command by hand and examine /var/log/mindi.log");
    11661215        log_to_screen
    1167             (_("for more information. Perhaps your /etc/fstab file is insane."));
     1216            ("for more information. Perhaps your /etc/fstab file is insane.");
    11681217        log_to_screen
    1169             (_("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see."));
     1218            ("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");
    11701219        retval++;
    11711220    }
    … …  
    11741223        && !does_file_exist("/etc/raidtab")) {
    11751224        log_to_screen
    1176             (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
     1225            ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
    11771226        create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
    11781227    }
    11791228
    11801229    if (retval) {
    1181         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1230        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    11821231    } else {
    1183         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1232        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    11841233    }
    11851234    return (retval);
    … …  
    14431492}
    14441493
     1494
     1495/**
     1496 * The standard log_debug_msg() (log_msg() also due to a macro). Writes some describing
     1497 * information to the logfile.
     1498 */
     1499void standard_log_debug_msg(int debug_level, const char *szFile,
     1500                            const char *szFunction, int nLine,
     1501                            const char *fmt, ...)
     1502{
     1503    va_list args;
     1504    int i;
     1505    static int depth = 0;
     1506    char *tmp;
     1507    FILE *fout;
     1508
     1509    if (depth > 5) {
     1510        depth--;
     1511        return;
     1512    }
     1513    depth++;
     1514
     1515    malloc_string(tmp);
     1516
     1517    if (debug_level <= g_loglevel) {
     1518        va_start(args, fmt);
     1519        if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
     1520            return;
     1521        }                       // fatal_error("Failed to openout to logfile - sheesh..."); }
     1522
     1523        // add tabs to distinguish log levels
     1524        if (debug_level > 0) {
     1525            for (i = 1; i < debug_level; i++)
     1526                fprintf(fout, "\t");
     1527            if (getpid() == g_main_pid)
     1528                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction,
     1529                        nLine);
     1530            else if (getpid() == g_buffer_pid && g_buffer_pid > 0)
     1531                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction,
     1532                        nLine);
     1533            else
     1534                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile,
     1535                        szFunction, nLine);
     1536        }
     1537        vfprintf(fout, fmt, args);
     1538
     1539        // do not slow down the progran if standard debug level
     1540        // must be enabled: if no flush, the log won't be up-to-date if there
     1541        // is a segfault
     1542        //if (g_dwDebugLevel != 1)
     1543
     1544        va_end(args);
     1545        fprintf(fout, "\n");
     1546        paranoid_fclose(fout);
     1547    }
     1548    depth--;
     1549    paranoid_free(tmp);
     1550}
     1551
     1552/**
     1553 * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
     1554 */
     1555void (*log_debug_msg) (int, const char *, const char *, int, const char *,
     1556                       ...) = standard_log_debug_msg;
     1557
     1558
    14451559/**
    14461560 * If @p y, malloc @p x, else free @p x.
    … …  
    14721586        paranoid_free(g_magicdev_command);
    14731587    }
     1588
     1589    /*
     1590       char**list_of_arrays[] = {
     1591       &g_boot_mountpt,
     1592       &g_mondo_home,
     1593       &g_tmpfs_mountpt,
     1594       &g_erase_tmpdir_and_scratchdir,
     1595       &g_serial_string,
     1596       &g_magicdev_command,
     1597       NULL};
     1598
     1599       char**ppcurr;
     1600       int i;
     1601
     1602       for(i=0;list_of_arrays[i];i++)
     1603       {
     1604       log_msg(5, "Allocating %d", i);
     1605       ppcurr = list_of_arrays[i];
     1606       if (mal)
     1607       { *ppcurr = malloc(MAX_STR_LEN); }
     1608       else
     1609       {
     1610       if (*ppcurr)
     1611       {
     1612       free(*ppcurr);
     1613       }
     1614       }
     1615       }
     1616       log_msg(5, "Returning");
     1617     */
    14741618}
    14751619

  • branches/stable/mondo/mondo/common/libmondo-verify.c

    r501 r541  
    103103#include "mondostructures.h"
    104104#include "libmondo-verify.h"
    105 #include "newt-specific-EXT.h"
     105#include "libmondo-gui-EXT.h"
    106106#include "libmondo-files-EXT.h"
    107107#include "libmondo-fork-EXT.h"
    … …  
    110110#include "libmondo-devices-EXT.h"
    111111#include "libmondo-tools-EXT.h"
     112#include "lib-common-externs.h"
    112113
    113114/*@unused@*/
    … …  
    757758                    orig_cksum);
    758759            log_msg(2, tmp);
    759             sprintf(tmp, _("%s has changed on live filesystem"),
     760            sprintf(tmp, "%s has changed on live filesystem",
    760761                    biggie_fname);
    761762            log_to_screen(tmp);
    … …  
    810811    sprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
    811812            bkpinfo->tmpdir);
    812     log_to_screen(_("Verifying regular archives on tape"));
     813    log_to_screen("Verifying regular archives on tape");
    813814    total_afioballs = get_last_filelist_number(bkpinfo) + 1;
    814     open_progress_form(_("Verifying filesystem"),
    815                        _("I am verifying archives against your live filesystem now."),
    816                        _("Please wait. This may take a couple of hours."), "",
     815    open_progress_form("Verifying filesystem",
     816                       "I am verifying archives against your live filesystem now.",
     817                       "Please wait. This may take a couple of hours.", "",
    817818                       total_afioballs);
    818819    res = read_header_block_from_stream(&size, fname, &ctrl_chr);
    … …  
    853854        res = verify_an_afioball_from_stream(bkpinfo, fname, size);
    854855        if (res) {
    855             sprintf(tmp, _("Afioball %ld differs from live filesystem"),
     856            sprintf(tmp, "Afioball %ld differs from live filesystem",
    856857                    current_afioball_number);
    857858            log_to_screen(tmp);
    … …  
    937938    noof_biggiefiles = (long) size;
    938939    log_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
    939     open_progress_form(_("Verifying big files"), comment,
    940                        _("Please wait. This may take some time."), "",
     940    open_progress_form("Verifying big files", comment,
     941                       "Please wait. This may take some time.", "",
    941942                       noof_biggiefiles);
    942943    for (res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
    … …  
    954955            p++;
    955956        }
    956         sprintf(comment, _("Verifying bigfile #%ld (%ld K)"),
     957        sprintf(comment, "Verifying bigfile #%ld (%ld K)",
    957958                current_biggiefile_number, (long) size >> 10);
    958959        update_progress_form(comment);
    … …  
    10191020
    10201021    sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
    1021     sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
    1022             bkpinfo->prefix, g_current_media_number);
     1022    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->nfs_remote_dir,
     1023            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
    10231024
    10241025    mkdir(mountpoint, 1777);
    … …  
    10301031        log_msg(2, tmp);
    10311032        if (bkpinfo->manual_cd_tray) {
    1032             popup_and_OK(_("Please push CD tray closed."));
     1033            popup_and_OK("Please push CD tray closed.");
    10331034        }
    10341035        if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
    1035             log_to_screen(_("failed to mount actual CD"));
     1036            log_to_screen("failed to mount actual CD");
    10361037            return (1);
    10371038        }
    … …  
    10431044        mddevice = make_vn(fname);
    10441045        if (ret) {
    1045             sprintf(tmp, _("make_vn of %s failed; unable to verify ISO\n"),
     1046            sprintf(tmp, "make_vn of %s failed; unable to verify ISO\n",
    10461047                    fname);
    10471048            log_to_screen(tmp);
    … …  
    10541055#endif
    10551056        if (run_program_and_log_output(command, FALSE)) {
    1056             sprintf(tmp, _("%s failed; unable to mount ISO image\n"),
     1057            sprintf(tmp, "%s failed; unable to mount ISO image\n",
    10571058                    command);
    10581059            log_to_screen(tmp);
    … …  
    11321133
    11331134    log_msg(3, "verify_tape_backups --- starting");
    1134     log_to_screen(_("Verifying backups"));
     1135    log_to_screen("Verifying backups");
    11351136    openin_tape(bkpinfo);
    11361137/* verify archives themselves */
    … …  
    11571158            && length_of_file(changed_files_fname) > 2) {
    11581159            log_to_screen
    1159                 (_("Warning - unable to check logfile to derive list of changed files"));
     1160                ("Warning - unable to check logfile to derive list of changed files");
    11601161        } else {
    11611162            log_to_screen
    1162                 (_("No differences found. Therefore, no 'changed.files' text file."));
     1163                ("No differences found. Therefore, no 'changed.files' text file.");
    11631164        }
    11641165    }
    … …  
    11761177        log_msg(0, tmp);
    11771178        log_to_screen
    1178             (_("See /tmp/changed.files for a list of nonmatching files."));
     1179            ("See /tmp/changed.files for a list of nonmatching files.");
    11791180        log_to_screen
    1180             (_("The files probably changed on filesystem, not on backup media."));
     1181            ("The files probably changed on filesystem, not on backup media.");
    11811182        //      retval++;
    11821183    }

  • branches/stable/mondo/mondo/common/libmondo.h

    r501 r541  
    99#include "libmondo-files-EXT.h"
    1010#include "libmondo-fork-EXT.h"
    11 #include "newt-specific-EXT.h"
     11#include "libmondo-gui-EXT.h"
    1212#include "libmondo-mountlist-EXT.h"
    1313#include "libmondo-raid-EXT.h"

  • branches/stable/mondo/mondo/common/mondostructures.h

    r538 r541  
    477477   * If you do nothing, "/" will be used.
    478478   */
    479     char include_paths[MAX_STR_LEN*4];
     479    char include_paths[MAX_STR_LEN];
    480480
    481481  /**
    … …  
    484484   * the scratchdir, and the tempdir are automatically excluded.
    485485   */
    486     char exclude_paths[MAX_STR_LEN*4];
     486    char exclude_paths[MAX_STR_LEN];
    487487
    488488  /**
    … …  
    801801    struct s_mdrec el[MAXIMUM_RAID_DEVS];
    802802};
    803 
    804 struct s_mrconf {
    805     int ia64_boot_size;
    806     char *iso_creation_cmd;
    807 };

  • branches/stable/mondo/mondo/common/my-stuff.h

    r538 r541  
    1 /*
    2  * Common defines across the project
    3  *
    4  *  $Id$
    5  */
    6 
    7 #ifndef _MY_STUFF_H_
    8 #define _MY_STUFF_H_
    9 
    10 /* BERLIOS
     1/* my-stuff.h
     2   $Id$
     3.
     4
     5
     607/14
     7- ARCH_THREADS is now 2; buffers, 4
     8
     907/10
     10- added acl, xattr stuff
     11
     1206/19
     13- added AUX_VER
     14
     1506/14
     16- added DO_MBR_PLEASE
     17
     1804/17
     19- replaced INTERNAL_TAPE_BLK_SIZE with g_internal_tape_block_size
     20  and DEFAULT_INTERNAL_TAPE_BLOCK_SIZE
     21
     2204/13
     23- log_msg is now calling standard_log_debug_msg, not the alias (log_debug_msg)
     24
     2504/03/2004
     26- added star and SELINUX support
     27
     2811/20/2003
     29- boot from isolinux.bin, not mindi-boot.2880.img
     30
     3111/15
     32- reduced SLICE_SIZE from 8192 to 4096
     33
     3410/08
     35- set p-i-h volsize to 1GB
     36
     3710/21
     38- added MNT_CDROM and FREELOADER
     39
     4010/11
     41- added DEFAULT_DVD_DISK_SIZE
     42- added PARTIMAGE_DEBUG_LEVEL
     43
     4409/27
     45- better logging
     46
     4709/24
     48- added MR_LOGFILE="/tmp/mondo-restore.log"
     49
     5009/22
     51- added bool, FALSE, TRUE
     52
     5309/20
     54- increasd PPCFG_RAMDISK_SIZE to 150
     55
     5609/12
     57- reduced MAX_STR_LEN from 512 to 460
     58
     5909/10
     60- moved PPCFG_RAMDISK_SIZE here
     61
     6209/05
     63- better config.h stuff
     64
     6506/05
     66- changed fgrep to grep
     67
     6805/19
     69- added CP_BIN
     70
     7105/05
     72- added #include <sys/param.h> and sys/sem.h and ioctl.h
     73
     7405/03
     75- added kill_anything_like_this()
     76
     7704/24/2003
     78- added *STUB #define's
     79
     8011/22/2002
     81- added INTERNAL_TAPE_BLK_SIZE
     82
     8310/10
     84- use #define to create XMondo-friendly log file name if appropriate
     85
     8608/30
     87- changed ARBITRARY_MAXIMUM to 512
     88
     8908/26
     90- set MAX_STR_LEN at 512 but halved it within many _structures_
     91- changed ARBITRARY_MAXIMUM to 128
     92
     9308/08
     94- added '#include <signal.h>'
     95- added WELCOME_STRING
     96
     9706/19
     98- changed tape block size from 8192 to 65536
     99
     10004/08
     101- added manual_cd_tray flag to bkpinfo
     102
     10303/31
     104- added restore_path to struct s_bkpinfo
     105
     10603/21
     107- updated version# to 1.42
     108
     10902/20
     110- added bkpinfo->using_cdstream
     111
     11202/06
     113- added MONDO_VERSION
     114
     11502/02
     116- added MONDO_CFG_FILE
     117- added SLICE_SIZE
     118
     11901/31
     120- removed MINDI_HOME: it is unnecessary
     121- replaced MONDO_HOME with variable g_mondo_home
     122
     12301/25
     124- added MONDO_HOME, MINDI_HOME
     125
     12601/21
     127- added s_node{} structure
     128
     12901/17
     130- added sys/shm.h, types.h, ipc.h
     131
     13201/02/2002
     133- added that groovy bkpinfo{} stuff
     134
     13511/29/2001
     136- added raidlist{} struct
     137
     13808/27
     139- stuff
     140*/
     141
    11142#define HAVE_MALLOC 1
    12 */
     143
    13144
    14145// Extra info for ACLs and SELINUX users
    … …  
    27158 * Create the illusion of a Boolean type.
    28159 */
    29 #define bool unsigned char
     160#define bool int
    30161#define TRUE 1
    31162#define FALSE 0
    32163#endif
    33164
    34 /* BERLIOS
     165#ifndef _MY_STUFF_H_
     166#define _MY_STUFF_H_
     167
    35168#ifdef HAVE_CONFIG_H
    36169#include <config.h>
    37170#endif
    38 */
    39171
    40172#ifndef __FreeBSD__
    … …  
    49181#include <stdio.h>
    50182#include <stdlib.h>
    51 /* BERLIOS
    52183#ifndef  __USE_FILE_OFFSET64
    53184#define  __USE_FILE_OFFSET64
    … …  
    56187#define  __USE_LARGEFILE64
    57188#endif
    58 */
    59189#include <sys/stat.h>
    60190#include <fcntl.h>
    … …  
    66196#include <unistd.h>
    67197#include <signal.h>
     198//#include <curses.h>
    68199#include <newt.h>
    69200#include <ctype.h>
    … …  
    72203#include <assert.h>
    73204
    74 /*
    75205#if defined(DEBUG) && !__cplusplus
    76206int count;
    77 char trace_log[255];
     207char trace_log[255];            /*buffer for logging */
    78208char *trace_log_ptr;
    79 #endif
    80 */
    81 
    82 #define STD_PREFIX "mondorescue"
     209#endif                          /* DEBUG */
     210
     211#define IA64_BOOT_SIZE "8192"   /* Should be coherent with mindi */
     212#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
    83213
    84214/**
    … …  
    123253#define CRC_M16 0xA001          ///< Mask for crc16.
    124254#define CRC_MTT 0x1021          ///< Mask for crc-ccitt.
     255
     256#define FALSE 0                 ///< The ubiquitous FALSE macro.
     257#define TRUE 1                  ///< The even more ubiquitous TRUE macro.
    125258
    126259#define SCREEN_LENGTH 25        ///< The default size of the screen.
    … …  
    212345 * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
    213346 */
    214 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
     347#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -speed=1 -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
    215348
    216349/**
    217350 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    218351     */// -b images/mindi-boot.2880.img
    219 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     352#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -speed=1 -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    220353
    221354/**
    222355 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    223356     */// -b images/mindi-boot.2880.img
    224 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     357#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -speed=1 -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    225358
    226359/**
    227360 * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
    228361 */
    229 #define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     362#define MONDO_GROWISOFS_NONBOOT          "growisofs -speed=1 -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    230363
    231364/**
    232365 * Welcome string displayed at the top of the newt interface.
    233366 */
    234 #define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
     367#define WELCOME_STRING "W E L C O M E   T O   M O N D O   R E S C U E"
    235368
    236369/**
    … …  
    393526#define DEFAULT_MR_LOGLEVEL 4
    394527
    395 #ifdef ENABLE_NLS 
    396 # include <libintl.h> 
    397 # undef _ 
    398 # define _(String) dgettext (PACKAGE, String)
    399 # ifdef gettext_noop 
    400 #  define N_(String) gettext_noop (String) 
    401 # else 
    402 #  define N_(String) (String) 
    403 # endif 
    404 #else 
    405 # define textdomain(String) (String) 
    406 # define gettext(String) (String) 
    407 # define dgettext(Domain,Message) (Message) 
    408 # define dcgettext(Domain,Message,Type) (Message) 
    409 # define bindtextdomain(Domain,Directory) (Domain) 
    410 # define _(String) (String) 
    411 # define N_(String) (String) 
    412 
    413 #endif
    414 
    415 
    416 
    417528#endif                          /* _MY_STUFF_H_ */

  • branches/stable/mondo/mondo/common/newt-specific.c

    r502 r541  
    118118#include "libmondo-tools-EXT.h"
    119119#include "libmondo-fork-EXT.h"
    120 #include "newt-specific-EXT.h"
     120#include "libmondo-gui-EXT.h"
     121#include "lib-common-externs.h"
    121122
    122123/*@unused@*/
    … …  
    226227                    tmp[i - 1] = '\0';
    227228                }
    228                 if (strstr(_("yesYES"), tmp)) {
     229                if (strstr("yesYES", tmp)) {
    229230                    paranoid_free(tmp);
    230231                    return (TRUE);
    231                 } else if (strstr(_("NOno"), tmp)) {
     232                } else if (strstr("NOno", tmp)) {
    232233                    paranoid_free(tmp);
    233234                    return (FALSE);
    … …  
    235236                    system("sync");
    236237                    printf
    237                         (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
     238                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
    238239                }
    239240            }
    240241        } else {
    241242            paranoid_free(tmp);
    242             return (popup_with_buttons(prompt, _("Yes"), _("No")));
     243            return (popup_with_buttons(prompt, "Yes", "No"));
    243244        }
    244245    }
    … …  
    272273                tmp[i - 1] = '\0';
    273274            }
    274             if (strstr(_("okOKOkYESyes"), tmp)) {
     275            if (strstr("okOKOkYESyes", tmp)) {
    275276                paranoid_free(tmp);
    276277                return (TRUE);
    … …  
    281282        } else {
    282283            paranoid_free(tmp);
    283             return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
     284            return (popup_with_buttons(prompt, " Okay ", "Cancel"));
    284285        }
    285286    }
    … …  
    425426            ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
    426427        printf
    427                 (_("If you require technical support, please contact the mailing list.\n"));
    428         printf(_("See http://www.mondorescue.org for details.\n"));
     428                ("If you require technical support, please contact the mailing list.\n");
     429        printf("See http://www.mondorescue.org for details.\n");
    429430        printf
    430                 (_("The list's members can help you, if you attach that file to your e-mail.\n"));
    431         printf(_("Log file: %s\n"), MONDO_LOGFILE);
     431                ("The list's members can help you, if you attach that file to your e-mail.\n");
     432        printf("Log file: %s\n", MONDO_LOGFILE);
    432433        if (does_file_exist("/tmp/MA.log.gz")) {
    433434            printf
    434                 (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
    435         }
    436         printf(_("Mondo has aborted.\n"));
     435                ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
     436        }
     437        printf("Mondo has aborted.\n");
    437438        register_pid(0, "mondo");   // finish() does this too, FYI
    438439        if (!g_main_pid) {
    … …  
    489490//  system("clear");
    490491//  iamhere("Finished calling newtFinished");
    491         printf(_("Execution run ended; result=%d\n"), signal);
    492         printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
     492        printf("Execution run ended; result=%d\n", signal);
     493        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
    493494        free_libmondo_global_strings();
    494495        exit(signal);
    … …  
    782783            while (((ch = getchar()) != '\n') && (ch != EOF));
    783784        } else {
    784             (void) popup_with_buttons(prompt, _(" OK "), "");
     785            (void) popup_with_buttons(prompt, " OK ", "");
    785786        }
    786787    }
    … …  
    842843#endif
    843844            );
    844         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
    845         b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
     845        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
     846        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
    846847        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
    847848        newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
    … …  
    930931        }
    931932        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
    932         newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
     933        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
    933934        myForm = newtForm(NULL, NULL, 0);
    934935        newtFormAddComponents(myForm, text, b_1, b_2, NULL);
    … …  
    996997            newtCls();
    997998            newtPushHelpLine
    998                 (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
     999                ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
    9991000            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
    10001001            newtDrawRootText(18, 0, WELCOME_STRING);
    … …  
    10741075            g_isoform_old_progress = percentage;
    10751076            sprintf(timeline_str,
    1076                     _("%2ld:%02ld taken            %2ld:%02ld remaining"),
     1077                    "%2ld:%02ld taken            %2ld:%02ld remaining",
    10771078                    time_taken / 60, time_taken % 60, time_remaining / 60,
    10781079                    time_remaining % 60);
    10791080            if (percentage < 3) {
    1080                 sprintf(pcline_str, _(" Working"));
     1081                sprintf(pcline_str, " Working");
    10811082                for (j = 0; j < g_mysterious_dot_counter; j++) {
    10821083                    strcat(pcline_str, ".");
    … …  
    10881089                        special_dot_char(g_mysterious_dot_counter));
    10891090            } else {
    1090                 sprintf(pcline_str, _(" %3d%% done              %3d%% to go"),
     1091                sprintf(pcline_str, " %3d%% done              %3d%% to go",
    10911092                        percentage, 100 - percentage);
    10921093            }
    … …  
    12341235
    12351236        if (g_text_mode) {
    1236             printf(_("---progress-form---1--- %s%s"), blurb1, "\r\n");
    1237             printf(_("---progress-form---2--- %s%s"), blurb2, "\r\n");
    1238             printf(_("---progress-form---3--- %s%s"), blurb3, "\r\n");
    1239             printf(_("---progress-form---E---\n"));
     1237            printf("---progress-form---1--- %s\r\n", blurb1);
     1238            printf("---progress-form---2--- %s\r\n", blurb2);
     1239            printf("---progress-form---3--- %s\r\n", blurb3);
     1240            printf("---progress-form---E---\n");
    12401241            sprintf(taskprogress, "TASK:  [");
    12411242            for (i = 0; i < percentage; i += 5) {
    … …  
    12461247            }
    12471248            if (percentage > 100) {
    1248                 log_msg(2, _("percentage = %d"), percentage);
     1249                log_msg(2, "percentage = %d", percentage);
    12491250            }
    12501251            sprintf(taskprogress + strlen(taskprogress),
    12511252                    "] %3d%c", percentage, '%');
    12521253            sprintf(taskprogress + strlen(taskprogress),
    1253                     _(" done; %2ld:%02ld to go"),
     1254                    " done; %2ld:%02ld to go",
    12541255                    time_remaining / 60, time_remaining % 60);
    1255             printf(_("---progress-form---4--- %s\r\n"), taskprogress);
     1256            printf("---progress-form---4--- %s\r\n", taskprogress);
    12561257        } else {
    12571258            center_string(blurb1, 54);
    … …  
    13291330        if (g_text_mode) {
    13301331            for (backup_type = none; backup_type == none;) {
    1331                 printf(_("Backup type ("));
     1332                printf("Backup type (");
    13321333                for (i = 0; possible_responses[i]; i++) {
    13331334                    printf("%c%s", (i == 0) ? '\0' : ' ',
    … …  
    13511352        if (restoring) {
    13521353            strcpy(title_sz,
    1353                    _("Please choose the backup media from which you want to read data."));
    1354             strcpy(minimsg_sz, _("Read from:"));
     1354                   "Please choose the backup media from which you want to read data.");
     1355            strcpy(minimsg_sz, "Read from:");
    13551356        } else {
    13561357            strcpy(title_sz,
    1357                    _("Please choose the backup media to which you want to archive data."));
    1358             strcpy(minimsg_sz, _("Backup to:"));
     1358                   "Please choose the backup media to which you want to archive data.");
     1359            strcpy(minimsg_sz, "Backup to:");
    13591360        }
    13601361        newtPushHelpLine(title_sz);
    13611362        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
    13621363        newtCenteredWindow(34, 17, minimsg_sz);
    1363         b1 = newtButton(1, 1, _("CD-R disks "));
    1364         b2 = newtButton(17, 1, _("CD-RW disks"));
    1365         b3 = newtButton(1, 9, _("Tape drive "));
    1366         b4 = newtButton(17, 5, _("CD streamer"));
    1367         b5 = newtButton(1, 5, _(" DVD disks "));
    1368         b6 = newtButton(17, 9, _(" NFS mount "));
    1369         b7 = newtButton(1, 13, _(" Hard disk "));
    1370         b8 = newtButton(17, 13, _("    Exit   "));
     1364        b1 = newtButton(1, 1, "CD-R disks ");
     1365        b2 = newtButton(17, 1, "CD-RW disks");
     1366        b3 = newtButton(1, 9, "Tape drive ");
     1367        b4 = newtButton(17, 5, "CD streamer");
     1368        b5 = newtButton(1, 5, " DVD disks ");
     1369        b6 = newtButton(17, 9, " NFS mount ");
     1370        b7 = newtButton(1, 13, " Hard disk ");
     1371        b8 = newtButton(17, 13, "    Exit   ");
    13711372        myForm = newtForm(NULL, NULL, 0);
    13721373        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
    … …  
    14261427        newtDrawRootText(18, 0, WELCOME_STRING);
    14271428        newtPushHelpLine
    1428             (_("   Please specify the level of compression that you want."));
     1429            ("   Please specify the level of compression that you want.");
    14291430        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
    1430         newtCenteredWindow(34, 13, _("How much compression?"));
    1431         b1 = newtButton(4, 1, _("Maximum"));
    1432         b2 = newtButton(18, 1, _("Average"));
    1433         b3 = newtButton(4, 5, _("Minimum"));
    1434         b4 = newtButton(18, 5, _(" None  "));
    1435         b5 = newtButton(4, 9, _("         Exit        "));
     1431        newtCenteredWindow(34, 13, "How much compression?");
     1432        b1 = newtButton(4, 1, "Maximum");
     1433        b2 = newtButton(18, 1, "Average");
     1434        b3 = newtButton(4, 5, "Minumum");
     1435        b4 = newtButton(18, 5, " None  ");
     1436        b5 = newtButton(4, 9, "         Exit        ");
    14361437        myForm = newtForm(NULL, NULL, 0);
    14371438        newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
    … …  
    15141515        paranoid_fclose(fin);
    15151516        if (filelist->entries >= ARBITRARY_MAXIMUM) {
    1516             log_to_screen(_("Arbitrary limits suck, man!"));
     1517            log_to_screen("Arbitrary limits suck, man!");
    15171518            paranoid_free(tmp);
    15181519            return (1);
    … …  
    16561657        }
    16571658        sprintf(differ_sz,
    1658                 _("  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
     1659                "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
    16591660                i);
    16601661        newtPushHelpLine(differ_sz);
    1661         bClose = newtCompactButton(10, 15, _(" Close  "));
    1662         bSelect = newtCompactButton(30, 15, _(" Select "));
    1663         sprintf(tmp, "%-10s               %-20s", _("Priority"), _("Filename"));
     1662        bClose = newtCompactButton(10, 15, " Close  ");
     1663        bSelect = newtCompactButton(30, 15, " Select ");
     1664        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
    16641665        headerMsg = newtLabel(2, 1, tmp);
    1665         newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
     1666        newtOpenWindow(5, 4, 70, 16, "Non-matching files");
    16661667        myForm = newtForm(NULL, NULL, 0);
    16671668        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
    … …  
    16771678                     i++);
    16781679                if (i == filelist->entries && filelist->entries > 0) {
    1679                     log_to_screen(_("I don't know what that button does!"));
     1680                    log_to_screen("I don't know what that button does!");
    16801681                } else {
    16811682                    currline = i;

  • branches/stable/mondo/mondo/mondoarchive/Makefile.am

    r532 r541  
    22## Process with Automake to generate Makefile.in
    33##
    4 AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\"
    54
    65## Headers

  • branches/stable/mondo/mondo/mondoarchive/main.c

    r538 r541  
    247247{
    248248    struct s_bkpinfo *bkpinfo;
    249     struct s_mrconf *mrconf;
    250249    char *tmp;
    251250    int res, retval;
    252251    char *say_at_end;
    253252
    254 #ifdef ENABLE_NLS
    255     setlocale(LC_ALL, "");
    256     (void) textdomain("mondo");
    257 #endif
    258253/* Make sure I'm root; abort if not */
    259254    if (getuid() != 0) {
    260         fprintf(stderr, _("Please run as root.\n"));
     255        fprintf(stderr, "Please run as root.\r\n");
    261256        exit(127);
    262257    }
    … …  
    266261        && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
    267262            || !strcmp(argv[argc - 1], "--version"))) {
    268         printf(_("mondoarchive v%s\nSee man page for help\n"), PACKAGE_VERSION);
     263        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
    269264        exit(0);
    270265    }
    … …  
    275270    malloc_string(tmp);
    276271    malloc_string(say_at_end);
    277 
    278     /* Initialize Configuration Structure */
    279     mrarchive_init_conf(mrconf);
    280272
    281273    res = 0;
    … …  
    283275    diffs = 0;
    284276    say_at_end[0] = '\0';
    285     printf(_("Initializing...\n"));
     277    printf("Initializing...\n");
    286278    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
    287279        fatal_error("Cannot malloc bkpinfo");
    … …  
    329321        setup_newt_stuff();
    330322        if (!strstr(argv[2], "filelist")) {
    331             printf(_("Sorry - filelist goes first\n"));
     323            printf("Sorry - filelist goes first\n");
    332324            finish(1);
    333325        } else {
    … …  
    358350        setup_newt_stuff();
    359351        if (!strstr(argv[2], "filelist")) {
    360             printf(_("Sorry - filelist goes first\n"));
     352            printf("Sorry - filelist goes first\n");
    361353            finish(1);
    362354        } else {
    … …  
    378370        setup_newt_stuff();
    379371        if (find_cdrw_device(tmp)) {
    380             printf(_("Failed to find CDR-RW drive\n"));
    381         } else {
    382             printf(_("CD-RW is at %s\n"), tmp);
     372            printf("Failed to find CDR-RW drive\n");
     373        } else {
     374            printf("CD-RW is at %s\n", tmp);
    383375        }
    384376        tmp[0] = '\0';
    385377        if (find_cdrom_device(tmp, atoi(argv[2]))) {
    386             printf(_("Failed to find CD-ROM drive\n"));
    387         } else {
    388             printf(_("CD-ROM is at %s\n"), tmp);
     378            printf("Failed to find CD-ROM drive\n");
     379        } else {
     380            printf("CD-ROM is at %s\n", tmp);
    389381        }
    390382        finish(0);
    … …  
    396388        setup_newt_stuff();
    397389        if (find_dvd_device(tmp, atoi(argv[2]))) {
    398             printf(_("Failed to find DVD drive\n"));
    399         } else {
    400             printf(_("DVD is at %s\n"), tmp);
     390            printf("Failed to find DVD drive\n");
     391        } else {
     392            printf("DVD is at %s\n", tmp);
    401393        }
    402394        finish(0);
    … …  
    409401    if (argc > 2 && !strcmp(argv[1], "test-dev")) {
    410402        if (is_dev_an_NTFS_dev(argv[2])) {
    411             printf(_("%s is indeed an NTFS dev\n"), argv[2]);
    412         } else {
    413             printf(_("%s is _not_ an NTFS dev\n"), argv[2]);
     403            printf("%s is indeed an NTFS dev\n", argv[2]);
     404        } else {
     405            printf("%s is _not_ an NTFS dev\n", argv[2]);
    414406        }
    415407        finish(0);
    … …  
    434426        if (res) {
    435427            printf
    436                 (_("Errors were detected in the command line you supplied.\n"));
    437             printf(_("Please review the log file - %s \n"),MONDO_LOGFILE);
     428                ("Errors were detected in the command line you supplied.\n");
     429            printf("Please review the log file - " MONDO_LOGFILE "\n");
    438430            log_msg(1, "Mondoarchive will now exit.");
    439431            finish(1);
    … …  
    449441
    450442    log_to_screen
    451         (_("BusyBox's sources are available from http://www.busybox.net"));
     443        ("BusyBox's sources are available from http://www.busybox.net");
    452444    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
    453445            bkpinfo->scratchdir);
    … …  
    461453      finish(0);
    462454*/
    463         res = backup_data(bkpinfo, mrconf);
     455        res = backup_data(bkpinfo);
    464456        retval += res;
    465457        if (res) {
    466458            strcat(say_at_end,
    467                    _("Data archived. Please check the logs, just as a precaution. "));
    468         } else {
    469             strcat(say_at_end, _("Data archived OK. "));
     459                   "Data archived. Please check the logs, just as a precaution. ");
     460        } else {
     461            strcat(say_at_end, "Data archived OK. ");
    470462        }
    471463    }
    … …  
    475467        res = verify_data(bkpinfo);
    476468        if (res < 0) {
    477             sprintf(tmp, _("%d difference%c found."), -res,
     469            sprintf(tmp, "%d difference%c found.", -res,
    478470                    (-res != 1) ? 's' : ' ');
    479471            strcat(say_at_end, tmp);
    … …  
    495487    if (!retval) {
    496488        mvaddstr_and_log_it(g_currentY++, 0,
    497                             _("Backup and/or verify ran to completion. Everything appears to be fine."));
     489                            "Backup and/or verify ran to completion. Everything appears to be fine.");
    498490    } else {
    499491        mvaddstr_and_log_it(g_currentY++, 0,
    500                             _("Backup and/or verify ran to completion. However, errors did occur."));
    501     }
    502 
    503     if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
     492                            "Backup and/or verify ran to completion. However, errors did occur.");
     493    }
     494
     495    if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
    504496        log_to_screen
    505             (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
     497            ("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
    506498    }
    507499
    … …  
    510502        if (g_text_mode) {
    511503            log_to_screen
    512                 (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
     504                ("Type 'less /tmp/changed.files' to see which files don't match the archives");
    513505        } else {
    514506            log_msg(1,
    515                     _("Type 'less /tmp/changed.files' to see which files don't match the archives"));
     507                    "Type 'less /tmp/changed.files' to see which files don't match the archives");
    516508            log_msg(2, "Calling popup_changelist_from_file()");
    517509            popup_changelist_from_file("/tmp/changed.files");
    … …  
    531523    system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
    532524    if (!retval) {
    533         printf(_("Mondoarchive ran OK.\n"));
     525        printf("Mondoarchive ran OK.\n");
    534526    } else {
    535         printf(_("Errors occurred during backup. Please check logfile.\n"));
     527        printf("Errors occurred during backup. Please check logfile.\n");
    536528    }
    537529    distro_specific_kludges_at_end_of_mondoarchive();
    … …  
    557549    if (!g_text_mode) {
    558550        popup_and_OK
    559             (_("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt."));
    560         log_to_screen(_("See %s for details of backup run."), MONDO_LOGFILE);
     551            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
     552        log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
    561553        finish(retval);
    562554    } else {
    563         printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
     555        printf("See %s for details of backup run.\n", MONDO_LOGFILE);
    564556        exit(retval);
    565557    }

  • branches/stable/mondo/mondo/mondoarchive/mondo-cli.c

    r538 r541  
    247247        flag_set[i] = FALSE;
    248248    }
     249    //  strcpy (bkpinfo->tmpdir, "/root/images/mondo");
     250    //  strcpy (bkpinfo->scratchdir, "/home");
    249251    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
    250252        bkpinfo->media_size[j] = 650;
    … …  
    354356    /*@ buffers ** */
    355357    char *tmp;
    356     char *tmp1;
    357358    char *psz;
    358359
    … …  
    376377    if (i == 0) {
    377378        retval++;
    378         log_to_screen(_("You must specify the media type\n"));
     379        log_to_screen("You must specify the media type\n");
    379380    }
    380381    if (i > 1) {
    381382        retval++;
    382         log_to_screen(_("Please specify only one media type\n"));
     383        log_to_screen("Please specify only one media type\n");
    383384    }
    384385    if (flag_set['K']) {
    … …  
    390391    if (flag_set['L'] && flag_set['0']) {
    391392        retval++;
    392         log_to_screen(_("You cannot have 'no compression' _and_ LZOP.\n"));
     393        log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
    393394    }
    394395    bkpinfo->backup_data = flag_set['O'];
    395396    bkpinfo->verify_data = flag_set['V'];
    396397    if (flag_set['I'] && !bkpinfo->backup_data) {
    397         log_to_screen(_("-I switch is ignored if just verifying"));
     398        log_to_screen("-I switch is ignored if just verifying");
    398399    }
    399400    if (flag_set['E'] && !bkpinfo->backup_data) {
    400         log_to_screen(_("-E switch is ignored if just verifying"));
     401        log_to_screen("-E switch is ignored if just verifying");
    401402    }
    402403
    … …  
    426427        if (flag_set['f'] || flag_set['l']) {
    427428            log_to_screen
    428                 (_("You don't need to specify bootloader or bootdevice"));
     429                ("You don't need to specify bootloader or bootdevice");
    429430        }
    430431    }
    … …  
    441442            strcat(bkpinfo->include_paths, " ");
    442443        }
    443         asprintf(&tmp1, flag_val['I']);
    444         char *p = tmp1;
    445         char *q = tmp1;
    446 
    447         /* Cut the flag_val['I'] in parts containing all paths to test them */
    448         while (p != NULL) {
    449             q = strchr(p, ' ');
    450             if (q != NULL) {
    451                 *q = '\0';
    452                 p = q+1 ;
    453                 if (stat(p, &buf) != 0) {
    454                     log_msg(1, "ERROR ! %s doesn't exist", p);
    455                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
    456                 }
    457             } else {
    458                 if (stat(p, &buf) != 0) {
    459                     log_msg(1, "ERROR ! %s doesn't exist", p);
    460                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
    461                 }
    462                 p = NULL;
    463             }
    464         }
    465         paranoid_free(tmp1);
    466 
     444        if (stat(flag_val['I'], &buf) != 0) {
     445            log_msg(1, "ERROR ! %s doesn't exist", flag_val['I']);
     446            fatal_error("ERROR ! You specified a directory to include which doesn't exist");
     447        }
    467448        strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
    468449                flag_val['I'],
    469                 4*MAX_STR_LEN - strlen(bkpinfo->include_paths));
     450                MAX_STR_LEN - strlen(bkpinfo->include_paths));
    470451        log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
    471452        if (bkpinfo->include_paths[0] == '-') {
    472453            retval++;
    473             log_to_screen(_("Please supply a sensible value with '-I'\n"));
     454            log_to_screen("Please supply a sensible value with '-I'\n");
    474455        }
    475456    }
    … …  
    486467            retval++;
    487468            log_to_screen
    488                 (_("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't combine -J with -I. Thanks. :-)"));
     469                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
    489470        }
    490471        bkpinfo->make_filelist = FALSE;
    … …  
    504485        if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
    505486            log_to_screen
    506                 (_("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk..."));
     487                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
    507488        }
    508489
    … …  
    520501            if (!flag_set['L']) {
    521502                log_to_screen
    522                     (_("You must use -L with -C. Therefore I am setting it for you."));
     503                    ("You must use -L with -C. Therefore I am setting it for you.");
    523504                flag_set['L'] = 1;
    524505                flag_val['L'][0] = '\0';
    … …  
    550531        flag_set['d'] = TRUE;
    551532        sprintf(tmp,
    552                 _("You didn't specify a tape streamer device. I'm assuming %s"),
     533                "You didn't specify a tape streamer device. I'm assuming %s",
    553534                flag_val['d']);
    554535        log_to_screen(tmp);
    … …  
    565546            if (!find_dvd_device(flag_val['d'], FALSE)) {
    566547                flag_set['d'] = TRUE;
    567                 log_to_screen(_("I guess DVD drive is at %s"), flag_val['d']);
     548                log_to_screen("I guess DVD drive is at %s", flag_val['d']);
    568549            }
    569550        }
    … …  
    584565            strcat(flag_val['s'], "m");
    585566            log_to_screen
    586                 (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
     567                ("You did not specify a size (-s) for DVD. I'm guessing %s.",
    587568                 flag_val['s']);
    588569            flag_set['s'] = 1;
    … …  
    640621        if (strlen(bkpinfo->isodir) < 3) {
    641622            retval++;
    642             log_to_screen(_("NFS share is not mounted. Please mount it.\n"));
     623            log_to_screen("NFS share is not mounted. Please mount it.\n");
    643624        }
    644625        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
    … …  
    678659            strcat(bkpinfo->exclude_paths, " ");
    679660        }
    680         asprintf(&tmp1, flag_val['E']);
    681         char *p = tmp1;
    682         char *q = tmp1;
    683 
    684         /* Cut the flag_val['E'] in parts containing all paths to test them */
    685         while (p != NULL) {
    686             q = strchr(p, ' ');
    687             if (q != NULL) {
    688                 *q = '\0';
    689                 p = q+1 ;
    690                 if (stat(p, &buf) != 0) {
    691                     log_msg(1, "WARNING ! %s doesn't exist", p);
    692                 }
    693             } else {
    694                 if (stat(p, &buf) != 0) {
    695                     log_msg(1, "WARNING ! %s doesn't exist", p);
    696                 }
    697                 p = NULL;
    698             }
    699         }
    700         paranoid_free(tmp1);
    701 
     661        if (stat(flag_val['E'], &buf) != 0) {
     662            log_msg(1, "WARNING ! %s doesn't exist", flag_val['E']);
     663        }
    702664        strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
    703665                flag_val['E'],
    704                 4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
     666                MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
    705667    }
    706668    if (flag_set['e']) {
    … …  
    765727            retval++;
    766728            sprintf(tmp,
    767                     _("You specified kernel '%s', which does not exist\n"),
     729                    "You specified kernel '%s', which does not exist\n",
    768730                    bkpinfo->kernel_path);
    769731            log_to_screen(tmp);
    … …  
    797759            retval++;
    798760            sprintf(tmp,
    799                     _("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n"),
     761                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
    800762                    bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
    801763            log_to_screen(tmp);
    … …  
    807769        if (g_kernel_version >= 2.6) {
    808770            if (popup_and_get_string
    809                 (_("Device"), _("Please specify the device"),
     771                ("Device", "Please specify the device",
    810772                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
    811773                retval++;
    812                 log_to_screen(_("User opted to cancel."));
     774                log_to_screen("User opted to cancel.");
    813775            }
    814776        } else if (find_cdrw_device(bkpinfo->media_device)) {
    815777            retval++;
    816778            log_to_screen
    817                 (_("Tried and failed to find CD-R[W] drive automatically.\n"));
     779                ("Tried and failed to find CD-R[W] drive automatically.\n");
    818780        } else {
    819781            flag_set['d'] = TRUE;
    … …  
    824786    if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
    825787        retval++;
    826         log_to_screen(_("Please specify the backup device/directory.\n"));
     788        log_to_screen("Please specify the backup device/directory.\n");
    827789        fatal_error
    828790            ("You didn't use -d to specify the backup device/directory.");
    … …  
    845807            retval++;
    846808            log_to_screen
    847                 (_("Please specify a tempdir which I can write to. :)"));
     809                ("Please specify a tempdir which I can write to. :)");
    848810            fatal_error("I cannot write to the tempdir you specified.");
    849811        }
    … …  
    853815            retval++;
    854816            log_to_screen
    855                 (_("Please don't specify a SAMBA or VFAT or NFS tmpdir."));
     817                ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
    856818            fatal_error("I cannot write to the tempdir you specified.");
    857819        }
    … …  
    901863        i = which_boot_loader(tmp);
    902864        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
    903         printf(_("boot loader is %c, residing at %s\n"), i, tmp);
     865        printf("boot loader is %c, residing at %s\n", i, tmp);
    904866        finish(0);
    905867    }
    … …  
    909871            retval++;
    910872            log_to_screen
    911                 (_("Please install LZOP. You can't use '-L' until you do.\n"));
     873                ("Please install LZOP. You can't use '-L' until you do.\n");
    912874        }
    913875    }
    … …  
    916878        &&
    917879        !run_program_and_log_output
    918         ("egrep -i suse /etc/issue.net | egrep '9.0' | grep 64", TRUE)) {
     880        ("grep -i suse /etc/issue.net | grep 64", TRUE)) {
    919881        bkpinfo->make_cd_use_lilo = TRUE;
    920882        log_to_screen
    921             (_("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary."));
     883            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
    922884    }
    923885    if (flag_set['o']) {
    … …  
    929891            bkpinfo->make_cd_use_lilo = TRUE;
    930892            log_to_screen
    931                 (_("Your kernel appears not to support vfat filesystems. I am therefore"));
    932             log_to_screen
    933                 (_("using LILO instead of SYSLINUX as the CD/floppy's boot loader."));
     893                ("Your kernel appears not to support vfat filesystems. I am therefore");
     894            log_to_screen
     895                ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
    934896        }
    935897        if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
    … …  
    937899#ifdef __IA32__
    938900            log_to_screen
    939                 (_("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as"));
    940             log_to_screen
    941                 (_("your boot loader. I shall therefore use LILO instead."));
     901                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
     902            log_to_screen
     903                ("your boot loader. I shall therefore use LILO instead.");
    942904#endif
    943905#ifdef __IA64__
    944906            log_to_screen
    945                 (_("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI"));
    946             log_to_screen(_("environment correctly. Please install it."));
     907                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
     908            log_to_screen("environment correctly. Please install it.");
    947909            fatal_error("Aborting");
    948910#endif
    … …  
    962924    if (i == 0) {
    963925        retval++;
    964         log_to_screen(_("Specify backup (-O), verify (-V) or both (-OV).\n"));
     926        log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
    965927    }
    966928
    … …  
    1016978            if (flag_set[optopt]) {
    1017979                bad_switches = TRUE;
    1018                 sprintf(tmp, _("Switch -%c previously defined as %s\n"), opt,
     980                sprintf(tmp, "Switch -%c previously defined as %s\n", opt,
    1019981                        flag_val[i]);
    1020982                log_to_screen(tmp);
    … …  
    1026988                        optarg[--len] = '\0';
    1027989                        log_to_screen
    1028                             (_("Warning - param '%s' should not have trailing slash!"),
     990                            ("Warning - param '%s' should not have trailing slash!",
    1029991                             optarg);
    1030992                    }
    … …  
    1033995                            && flag_val[opt][0] != '/') {
    1034996                            sprintf(tmp,
    1035                                     _("-%c flag --- must be absolute path --- '%s' isn't absolute"),
     997                                    "-%c flag --- must be absolute path --- '%s' isn't absolute",
    1036998                                    opt, flag_val[opt]);
    1037999                            log_to_screen(tmp);
    … …  
    10461008    for (i = optind; i < argc; i++) {
    10471009        bad_switches = TRUE;
    1048         sprintf(tmp, _("Invalid arg -- %s\n"), argv[i]);
     1010        sprintf(tmp, "Invalid arg -- %s\n", argv[i]);
    10491011        log_to_screen(tmp);
    10501012    }
    … …  
    10791041    case SIGINT:
    10801042        sprintf(tmp, "SIGINT");
    1081         strcpy(tmp2, _("You interrupted me :-)"));
     1043        strcpy(tmp2, "You interrupted me :-)");
    10821044        break;
    10831045    case SIGKILL:
    10841046        sprintf(tmp, "SIGKILL");
    10851047        strcpy(tmp2,
    1086                _("I seriously have no clue how this signal even got to me. Something's wrong with your system."));
     1048               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
    10871049        break;
    10881050    case SIGTERM:
    10891051        sprintf(tmp, "SIGTERM");
    1090         strcpy(tmp2, _("Got terminate signal"));
     1052        strcpy(tmp2, "Got terminate signal");
    10911053        break;
    10921054    case SIGHUP:
    10931055        sprintf(tmp, "SIGHUP");
    1094         strcpy(tmp2, _("Hangup on line"));
     1056        strcpy(tmp2, "Hangup on line");
    10951057        break;
    10961058    case SIGSEGV:
    10971059        sprintf(tmp, "SIGSEGV");
    10981060        strcpy(tmp2,
    1099                _("Internal programming error. Please send a backtrace as well as your log."));
     1061               "Internal programming error. Please send a backtrace as well as your log.");
    11001062        break;
    11011063    case SIGPIPE:
    11021064        sprintf(tmp, "SIGPIPE");
    1103         strcpy(tmp2, _("Pipe was broken"));
     1065        strcpy(tmp2, "Pipe was broken");
    11041066        break;
    11051067    case SIGABRT:
    11061068        sprintf(tmp, "SIGABRT");
    11071069        sprintf(tmp2,
    1108                 _("Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message."));
     1070                "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
    11091071        break;
    11101072    default:
    1111         sprintf(tmp, _("(Unknown)"));
    1112     }
    1113 
    1114     strcat(tmp, _(" signal received from OS"));
     1073        sprintf(tmp, "(Unknown)");
     1074    }
     1075
     1076    strcat(tmp, " signal received from OS");
    11151077    log_to_screen(tmp);
    11161078    log_to_screen(tmp2);

  • branches/stable/mondo/mondo/mondorestore/mondo-prep.c

    r497 r541  
    239239// zero & reboot
    240240            log_to_screen
    241                 (_("I am sorry for the inconvenience but I must ask you to reboot."));
     241                ("I am sorry for the inconvenience but I must ask you to reboot.");
    242242            log_to_screen
    243                 (_("I need to reset the Master Boot Record; in order to be"));
     243                ("I need to reset the Master Boot Record; in order to be");
    244244            log_to_screen
    245                 (_("sure the kernel notices, I must reboot after doing it."));
     245                ("sure the kernel notices, I must reboot after doing it.");
    246246            log_to_screen("Please hit 'Enter' to reboot.");
    247247            for (lino = 0; lino < drivelist->entries; lino++) {
    … …  
    269269            system("sync");
    270270            popup_and_OK
    271                 (_("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine."));
     271                ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
    272272            system("reboot");
    273273        }
    … …  
    615615#ifdef __FreeBSD__
    616616    log_to_screen
    617         (_("I don't know how to extrapolate the mountlist on FreeBSD. Sorry."));
     617        ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
    618618    return (1);
    619619#endif
    … …  
    624624            if (!does_file_exist("/etc/raidtab")) {
    625625                log_to_screen
    626                     (_("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries"));
     626                    ("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries");
    627627                finish(1);
    628628            }
    … …  
    749749    }
    750750    if (is_this_device_mounted(device)) {
    751         sprintf(tmp, _("%s is mounted - cannot format it       "), device);
     751        sprintf(tmp, "%s is mounted - cannot format it       ", device);
    752752        log_to_screen(tmp);
    753753        paranoid_free(program);
    … …  
    761761            if (!does_file_exist("/tmp/raidconf.txt")) {
    762762                log_to_screen
    763                     (_("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum."));
     763                    ("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum.");
    764764            } else {
    765765                int res;
    … …  
    769769                if (res) {
    770770                    log_to_screen
    771                         (_("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore."));
     771                        ("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore.");
    772772                    finish(1);
    773773                }
    … …  
    780780            char line[MAX_STR_LEN];
    781781            sprintf(tmp,
    782                     _("Initializing Vinum device %s (this may take a *long* time)"),
     782                    "Initializing Vinum device %s (this may take a *long* time)",
    783783                    device);
    784784            log_to_screen(tmp);
    … …  
    823823        }
    824824#else
    825         sprintf(tmp, _("Initializing RAID device %s"), device);
     825        sprintf(tmp, "Initializing RAID device %s", device);
    826826        log_to_screen(tmp);
    827827
    828828// Shouldn't be necessary.
    829         log_to_screen(_("Stopping %s"), device);
     829        log_to_screen("Stopping %s", device);
    830830        stop_raid_device(device);
    831831        system("sync");
    … …  
    900900    retval += res;
    901901    if (retval) {
    902         strcat(tmp, _("...failed"));
     902        strcat(tmp, "...failed");
    903903    } else {
    904         strcat(tmp, _("...OK"));
     904        strcat(tmp, "...OK");
    905905    }
    906906
    … …  
    951951            (interactively) ? "true" : "false");
    952952    log_it(tmp);
    953     mvaddstr_and_log_it(g_currentY, 0, _("Formatting partitions     "));
    954     open_progress_form(_("Formatting partitions"),
    955                        _("I am now formatting your hard disk partitions."),
    956                        _("This may take up to five minutes."), "",
     953    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
     954    open_progress_form("Formatting partitions",
     955                       "I am now formatting your hard disk partitions.",
     956                       "This may take up to five minutes.", "",
    957957                       mountlist->entries + 1);
    958958
    … …  
    10011001    if (does_file_exist("/tmp/i-want-my-lvm")) {
    10021002        wait_until_software_raids_are_prepped("/proc/mdstat", 10);
    1003         log_to_screen(_("Configuring LVM"));
     1003        log_to_screen("Configuring LVM");
    10041004        if (!g_text_mode) {
    10051005            newtSuspend();
    … …  
    10921092
    10931093    if (retval) {
    1094         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1094        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    10951095        log_to_screen
    1096             (_("Errors occurred during the formatting of your hard drives."));
     1096            ("Errors occurred during the formatting of your hard drives.");
    10971097    } else {
    1098         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1098        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    10991099    }
    11001100
    … …  
    11071107//123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
    11081108            log_to_screen
    1109                 (_("Partition table locked up %d times. At least one 'mkfs' (format) command"),
     1109                ("Partition table locked up %d times. At least one 'mkfs' (format) command",
    11101110                 g_partition_table_locked_up);
    11111111            log_to_screen
    1112                 (_("failed. I think these two events are related. Sometimes, fdisk's ioctl() call"));
     1112                ("failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
    11131113            log_to_screen
    1114                 (_("to refresh its copy of the partition table causes the kernel to lock the "));
     1114                ("to refresh its copy of the partition table causes the kernel to lock the ");
    11151115            log_to_screen
    1116                 (_("partition table. I believe this has just happened."));
     1116                ("partition table. I believe this has just happened.");
    11171117            if (ask_me_yes_or_no
    1118                 (_("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue.")))
     1118                ("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue."))
    11191119            {
    11201120                system("sync");
    … …  
    11251125        } else {
    11261126            log_to_screen
    1127                 (_("Partition table locked up %d time%c. However, disk formatting succeeded."),
     1127                ("Partition table locked up %d time%c. However, disk formatting succeeded.",
    11281128                 g_partition_table_locked_up,
    11291129                 (g_partition_table_locked_up == 1) ? '.' : 's');
    … …  
    15281528    pout_to_fdisk = popen(tmp, "w");
    15291529    if (!pout_to_fdisk) {
    1530         log_to_screen(_("Cannot call parted2fdisk to configure %s"), drivename);
     1530        log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
    15311531        paranoid_free(device_str);
    15321532        paranoid_free(format);
    … …  
    15641564                    if (system(command)) {
    15651565                        log_to_screen
    1566                             (_("Warning! Unable to make the drive bootable."));
     1566                            ("Warning! Unable to make the drive bootable.");
    15671567                    }
    15681568                    paranoid_free(device_str);
    … …  
    16141614            if (!file) {
    16151615                sprintf(tmp,
    1616                         _("Warning - unable to open %s for wiping it's partition table"),
     1616                        "Warning - unable to open %s for wiping it's partition table",
    16171617                        drivename);
    16181618                log_to_screen(tmp);
    … …  
    16211621            for (i = 0; i < 512; i++) {
    16221622                if (!write(file, "\0", 1)) {
    1623                     sprintf(tmp, _("Warning - unable to write to %s"),
     1623                    sprintf(tmp, "Warning - unable to write to %s",
    16241624                            drivename);
    16251625                    log_to_screen(tmp);
    … …  
    16561656        if (current_devno == 5 && previous_devno == 4) {
    16571657            log_to_screen
    1658                 (_("You must leave at least one partition spare as the Extended partition."));
     1658                ("You must leave at least one partition spare as the Extended partition.");
    16591659            paranoid_free(device_str);
    16601660            paranoid_free(format);
    … …  
    16741674            if (system(tmp)) {
    16751675                log_to_screen
    1676                     (_("Warning! Unable to make the slice bootable."));
     1676                    ("Warning! Unable to make the slice bootable.");
    16771677            }
    16781678        }
    … …  
    17021702            g_partition_table_locked_up++;
    17031703            log_to_screen
    1704                 (_("A flaw in the Linux kernel has locked the partition table."));
     1704                ("A flaw in the Linux kernel has locked the partition table.");
    17051705        }
    17061706    }
    … …  
    17751775
    17761776    if (is_this_device_mounted(partition_name)) {
    1777         sprintf(tmp, _("%s is mounted, and should not be partitioned"),
     1777        sprintf(tmp, "%s is mounted, and should not be partitioned",
    17781778                partition_name);
    17791779        log_to_screen(tmp);
    … …  
    18121812                if (prev_partno >= 4) {
    18131813                    log_to_screen
    1814                         (_("You need to leave at least one partition free, for 'extended/logical'"));
     1814                        ("You need to leave at least one partition free, for 'extended/logical'");
    18151815                    paranoid_free(program);
    18161816                    paranoid_free(partition_name);
    … …  
    20022002*/
    20032003
    2004     open_progress_form(_("Partitioning devices"),
    2005                        _("I am now going to partition all your drives."),
    2006                        _("This should not take more than five minutes."), "",
     2004    open_progress_form("Partitioning devices",
     2005                       "I am now going to partition all your drives.",
     2006                       "This should not take more than five minutes.", "",
    20072007                       mountlist->entries);
    20082008
    … …  
    20162016    close_progress_form();
    20172017    if (retval) {
    2018         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     2018        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    20192019        log_to_screen
    2020             (_("Errors occurred during the partitioning of your hard drives."));
     2020            ("Errors occurred during the partitioning of your hard drives.");
    20212021    } else {
    2022         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2022        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    20232023        paranoid_system("rm -f /tmp/fdisk*.log 2> /dev/null");
    20242024    }
    … …  
    25322532        return;
    25332533    }
    2534     sprintf(tmp, _("Expanding entries to suit drive %s (%ld MB)"), drive_name,
     2534    sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name,
    25352535            current_size_of_drive);
    25362536    log_to_screen(tmp);
    … …  
    25512551
    25522552    if (original_size_of_drive <= 0) {
    2553         sprintf(tmp, _("Cannot resize %s's entries. Drive not found."),
     2553        sprintf(tmp, "Cannot resize %s's entries. Drive not found.",
    25542554                drive_name);
    25552555        log_to_screen(tmp);
    … …  
    25812581            newsizL = (long) new_size;
    25822582        }
    2583         sprintf(tmp, _("Changing %s from %lld KB to %ld KB"),
     2583        sprintf(tmp, "Changing %s from %lld KB to %ld KB",
    25842584                drivemntlist->el[partno]->device,
    25852585                drivemntlist->el[partno]->size, newsizL);
    … …  
    25882588    }
    25892589    final_size = get_phys_size_of_drive(drive_name);
    2590     sprintf(tmp, _("final_size = %ld MB"), final_size);
     2590    sprintf(tmp, "final_size = %ld MB", final_size);
    25912591    paranoid_free(tmp);
    25922592    log_to_screen(tmp);
    … …  
    26292629                                                        device);
    26302630    }
    2631     log_to_screen(_("Mountlist adjusted to suit current hard drive(s)"));
     2631    log_to_screen("Mountlist adjusted to suit current hard drive(s)");
    26322632    paranoid_free(drivelist);
    26332633}

  • branches/stable/mondo/mondo/mondorestore/mondo-restore.c

    r497 r541  
    505505 * The message to display if we detect that the user is using a Compaq Proliant.
    506506 */
    507 #define COMPAQ_PROLIANTS_SUCK _("Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode.")
     507#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode."
    508508
    509509
    … …  
    535535    if (!does_file_exist(g_mountlist_fname)) {
    536536        log_to_screen(g_mountlist_fname);
    537         log_to_screen(_("does not exist"));
     537        log_to_screen("does not exist");
    538538        return (1);
    539539    }
    … …  
    543543    if (retval) {
    544544        log_to_screen
    545             (_("Warning - load_raidtab_into_raidlist returned an error"));
     545            ("Warning - load_raidtab_into_raidlist returned an error");
    546546    }
    547547    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
    … …  
    553553    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
    554554
    555     log_to_screen(_("I have finished editing the mountlist for you."));
     555    log_to_screen("I have finished editing the mountlist for you.");
    556556
    557557    return (retval);
    … …  
    602602    popup_and_OK(COMPAQ_PROLIANTS_SUCK);
    603603    if (ask_me_yes_or_no
    604         (_("Would you like to reboot and use your Compaq CD to prep your hard drive?")))
     604        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
    605605    {
    606606        fatal_error
    607             (_("Aborting. Please reboot and prep your hard drive with your Compaq CD."));
     607            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
    608608    }
    609609}
    … …  
    642642        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
    643643    } else {
    644         popup_and_OK(_("No restoring or comparing will take place today."));
     644        popup_and_OK("No restoring or comparing will take place today.");
    645645        if (is_this_device_mounted("/mnt/cdrom")) {
    646646            run_program_and_log_output("umount /mnt/cdrom", FALSE);
    … …  
    774774    if (g_text_mode) {
    775775        if (!ask_me_yes_or_no
    776             (_("Interactive Mode + textonly = experimental! Proceed anyway?")))
     776            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
    777777        {
    778778            fatal_error("Wise move.");
    … …  
    815815        save_mountlist_to_disk(mountlist, g_mountlist_fname);
    816816        save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
    817         mvaddstr_and_log_it(1, 30, _("Restoring Interactively"));
     817        mvaddstr_and_log_it(1, 30, "Restoring Interactively");
    818818        if (bkpinfo->differential) {
    819             log_to_screen(_("Because this is a differential backup, disk"));
     819            log_to_screen("Because this is a differential backup, disk");
    820820            log_to_screen
    821                 (_(" partitioning and formatting will not take place."));
     821                (" partitioning and formatting will not take place.");
    822822            done = TRUE;
    823823        } else {
    824824            if (ask_me_yes_or_no
    825                 (_("Do you want to erase and partition your hard drives?"))) {
     825                ("Do you want to erase and partition your hard drives?")) {
    826826                if (partition_table_contains_Compaq_diagnostic_partition
    827827                    (mountlist)) {
    … …  
    834834                    if (ptn_errs) {
    835835                        log_to_screen
    836                             (_("Warning. Errors occurred during disk partitioning."));
     836                            ("Warning. Errors occurred during disk partitioning.");
    837837                    }
    838838
    … …  
    840840                    if (!fmt_errs) {
    841841                        log_to_screen
    842                             (_("Errors during disk partitioning were handled OK."));
     842                            ("Errors during disk partitioning were handled OK.");
    843843                        log_to_screen
    844                             (_("Partitions were formatted OK despite those errors."));
     844                            ("Partitions were formatted OK despite those errors.");
    845845                        ptn_errs = 0;
    846846                    }
    … …  
    852852            } else {
    853853                mvaddstr_and_log_it(g_currentY++, 0,
    854                                     _("User opted not to partition the devices"));
     854                                    "User opted not to partition the devices");
    855855                if (ask_me_yes_or_no
    856                     (_("Do you want to format your hard drives?"))) {
     856                    ("Do you want to format your hard drives?")) {
    857857                    fmt_errs = format_everything(mountlist, TRUE);
    858858                    if (!fmt_errs) {
    … …  
    867867                mvaddstr_and_log_it(g_currentY++,
    868868                                    0,
    869                                     _("Errors occurred. Please repartition and format drives manually."));
     869                                    "Errors occurred. Please repartition and format drives manually.");
    870870                done = FALSE;
    871871            }
    … …  
    873873                mvaddstr_and_log_it(g_currentY++,
    874874                                    0,
    875                                     _("Errors occurred during partitioning. Formatting, however, went OK."));
     875                                    "Errors occurred during partitioning. Formatting, however, went OK.");
    876876                done = TRUE;
    877877            }
    878878            if (!done) {
    879                 if (!ask_me_yes_or_no(_("Re-edit the mountlist?"))) {
     879                if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
    880880                    retval++;
    881881                    goto end_of_func;
    … …  
    893893    /* restore */
    894894    if ((restore_all =
    895          ask_me_yes_or_no(_("Do you want me to restore all of your data?"))))
     895         ask_me_yes_or_no("Do you want me to restore all of your data?")))
    896896    {
    897897        log_msg(1, "Restoring all data");
    … …  
    900900        if ((restore_all =
    901901             ask_me_yes_or_no
    902              (_("Do you want me to restore _some_ of your data?")))) {
     902             ("Do you want me to restore _some_ of your data?"))) {
    903903        strcpy(old_restpath, bkpinfo->restore_path);
    904904        for (done = FALSE; !done;) {
    … …  
    913913// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
    914914                if (popup_and_get_string
    915                     (_("Restore path"), _("Restore files to where?"), tmp,
     915                    ("Restore path", "Restore files to where?", tmp,
    916916                     MAX_STR_LEN / 4)) {
    917917                    if (!strcmp(tmp, "/")) {
    918                         if (!ask_me_yes_or_no(_("Are you sure?"))) {
     918                        if (!ask_me_yes_or_no("Are you sure?")) {
    919919                            goto gotos_suck;
    920920                        }
    … …  
    930930                }
    931931                if (!ask_me_yes_or_no
    932                     (_("Restore another subset of your backup?"))) {
     932                    ("Restore another subset of your backup?")) {
    933933                    done = TRUE;
    934934                }
    … …  
    941941        mvaddstr_and_log_it(g_currentY++,
    942942                            0,
    943                             _("User opted not to restore any data.                                  "));
     943                            "User opted not to restore any data.                                  ");
    944944    }
    945945    if (retval) {
    946946        mvaddstr_and_log_it(g_currentY++,
    947947                            0,
    948                             _("Errors occurred during the restore phase.            "));
    949     }
    950 
    951     if (ask_me_yes_or_no(_("Initialize the boot loader?"))) {
     948                            "Errors occurred during the restore phase.            ");
     949    }
     950
     951    if (ask_me_yes_or_no("Initialize the boot loader?")) {
    952952        run_boot_loader(TRUE);
    953953    } else {
    954954        mvaddstr_and_log_it(g_currentY++,
    955955                            0,
    956                             _("User opted not to initialize the boot loader."));
     956                            "User opted not to initialize the boot loader.");
    957957    }
    958958
    … …  
    963963    /*  if (restore_some || restore_all || */
    964964    if (ask_me_yes_or_no
    965         (_("Label your ext2 and ext3 partitions if necessary?"))) {
     965        ("Label your ext2 and ext3 partitions if necessary?")) {
    966966        mvaddstr_and_log_it(g_currentY, 0,
    967                             _("Using e2label to label your ext2,3 partitions"));
     967                            "Using e2label to label your ext2,3 partitions");
    968968        if (does_file_exist("/tmp/fstab.new")) {
    969969            strcpy(fstab_fname, "/tmp/fstab.new");
    … …  
    978978        if (res) {
    979979            log_to_screen
    980                 (_("label-partitions-as-necessary returned an error"));
    981             mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     980                ("label-partitions-as-necessary returned an error");
     981            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    982982        } else {
    983983            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    … …  
    990990        mvaddstr_and_log_it(g_currentY++,
    991991                            0,
    992                             _("Warning - errors occurred during the restore phase."));
     992                            "Warning - errors occurred during the restore phase.");
    993993    }
    994994  end_of_func:
    … …  
    10421042            retval += compare_mode(bkpinfo, mountlist, raidlist);
    10431043        } else {
    1044             log_to_screen(_("OK, I shan't restore/compare any files."));
     1044            log_to_screen("OK, I shan't restore/compare any files.");
    10451045        }
    10461046    }
    … …  
    10521052    if (system("umount /tmp/isodir 2> /dev/null")) {
    10531053        log_to_screen
    1054             (_("WARNING - unable to unmount device where the ISO files are stored."));
     1054            ("WARNING - unable to unmount device where the ISO files are stored.");
    10551055    }
    10561056//    }
    … …  
    11131113    if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
    11141114        sprintf(tmp,
    1115                 _("Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?"),
     1115                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
    11161116                tmpA, tmpB, tmpC);
    11171117        if (ask_me_yes_or_no(tmp)) {
    … …  
    11231123    }
    11241124    save_mountlist_to_disk(mountlist, g_mountlist_fname);
    1125     mvaddstr_and_log_it(1, 30, _("Restoring Automatically"));
     1125    mvaddstr_and_log_it(1, 30, "Restoring Automatically");
    11261126    if (bkpinfo->differential) {
    1127         log_to_screen(_("Because this is a differential backup, disk"));
    1128         log_to_screen(_("partitioning and formatting will not take place."));
     1127        log_to_screen("Because this is a differential backup, disk");
     1128        log_to_screen("partitioning and formatting will not take place.");
    11291129        res = 0;
    11301130    } else {
    … …  
    11521152                if (res) {
    11531153                    log_to_screen
    1154                         (_("Warning. Errors occurred during partitioning."));
     1154                        ("Warning. Errors occurred during partitioning.");
    11551155                    res = 0;
    11561156                }
    … …  
    11581158            retval += res;
    11591159            if (!res) {
    1160                 log_to_screen(_("Preparing to format your disk(s)"));
     1160                log_to_screen("Preparing to format your disk(s)");
    11611161                sleep(1);
    11621162                system("sync");
    1163                 log_to_screen(_("Please wait. This may take a few minutes."));
     1163                log_to_screen("Please wait. This may take a few minutes.");
    11641164                res += format_everything(mountlist, FALSE);
    11651165            }
    … …  
    11711171        mvaddstr_and_log_it(g_currentY++,
    11721172                            0,
    1173                             _("Failed to partition and/or format your hard drives."));
    1174 
    1175         if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) {
     1173                            "Failed to partition and/or format your hard drives.");
     1174
     1175        if (ask_me_yes_or_no("Try in interactive mode instead?")) {
    11761176            retval = interactive_mode(bkpinfo, mountlist, raidlist);
    11771177            goto after_the_nuke;
    11781178        } else
    11791179            if (!ask_me_yes_or_no
    1180                 (_("Would you like to try to proceed anyway?"))) {
     1180                ("Would you like to try to proceed anyway?")) {
    11811181            return (retval);
    11821182        }
    … …  
    11861186        unmount_all_devices(mountlist);
    11871187        log_to_screen
    1188             (_("Unable to mount all partitions. Sorry, I cannot proceed."));
     1188            ("Unable to mount all partitions. Sorry, I cannot proceed.");
    11891189        return (retval);
    11901190    }
    … …  
    12021202    mvaddstr_and_log_it(g_currentY,
    12031203                        0,
    1204                         _("Using e2label to label your ext2,3 partitions"));
     1204                        "Using e2label to label your ext2,3 partitions");
    12051205
    12061206    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
    … …  
    12081208    res = run_program_and_log_output(tmp, TRUE);
    12091209    if (res) {
    1210         log_to_screen(_("label-partitions-as-necessary returned an error"));
    1211         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1210        log_to_screen("label-partitions-as-necessary returned an error");
     1211        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    12121212    } else {
    1213         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1213        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    12141214    }
    12151215    retval += res;
    … …  
    12171217  after_the_nuke:
    12181218    if (retval) {
    1219         log_to_screen(_("Errors occurred during the nuke phase."));
     1219        log_to_screen("Errors occurred during the nuke phase.");
    12201220    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
    12211221    {
    12221222        log_to_screen
    1223             (_("PC was restored successfully. Thank you for using Mondo Rescue."));
     1223            ("PC was restored successfully. Thank you for using Mondo Rescue.");
    12241224        log_to_screen
    1225             (_("Please visit our website at http://www.mondorescue.org for more information."));
     1225            ("Please visit our website at http://www.mondorescue.org for more information.");
    12261226    } else {
    1227         strcpy(tmp,_(" Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information."));
     1227        strcpy(tmp," Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
    12281228        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
    12291229            popup_and_OK(tmp);
    12301230        }
    12311231        log_to_screen
    1232             (_("Mondo has restored your system. Please remove the backup media and reboot."));
     1232            ("Mondo has restored your system. Please remove the backup media and reboot.");
    12331233        log_to_screen
    1234             (_("Please visit our website at http://www.mondorescue.org for more information."));
     1234            ("Please visit our website at http://www.mondorescue.org for more information.");
    12351235    }
    12361236    g_I_have_just_nuked = TRUE;
    … …  
    12811281    if (!g_restoring_live_from_cd) {
    12821282        popup_and_OK
    1283             (_("Please insert tape/CD/boot floppy, then hit 'OK' to continue."));
     1283            ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
    12841284        sleep(1);
    12851285    }
    … …  
    12931293    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
    12941294
    1295     open_evalcall_form(_("Thinking..."));
     1295    open_evalcall_form("Thinking...");
    12961296
    12971297    get_cfg_file_from_archive_or_bust(bkpinfo);
    … …  
    13061306        save_filelist(filelist, "/tmp/selected-files.txt");
    13071307        strcpy(old_restpath, bkpinfo->restore_path);
    1308         if (popup_and_get_string(_("Restore path"),
    1309                                  _("Restore files to where? )"),
     1308        if (popup_and_get_string("Restore path",
     1309                                 "Restore files to where? )",
    13101310                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
    13111311            iamhere("Restoring everything");
    … …  
    14031403
    14041404    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
    1405         log_to_screen(_("Cannot even open bigfile's info file"));
     1405        log_to_screen("Cannot even open bigfile's info file");
    14061406        return (1);
    14071407    }
    … …  
    15161516    log_msg(3, "file_to_openout = %s", file_to_openout);
    15171517    if (!(fout = fopen(file_to_openout, "w"))) {
    1518         log_to_screen(_("Cannot openout outfile_fname - hard disk full?"));
     1518        log_to_screen("Cannot openout outfile_fname - hard disk full?");
    15191519        return (1);
    15201520    }
    … …  
    15391539                    g_current_media_number, sliceno);
    15401540            log_msg(2, tmp);
    1541             sprintf(tmp, _("Restoring from %s #%d"),
     1541            sprintf(tmp, "Restoring from %s #%d",
    15421542                    media_descriptor_string(bkpinfo->backup_media_type),
    15431543                    g_current_media_number);
    15441544            log_to_screen(tmp);
    15451545            insist_on_this_cd_number(bkpinfo, g_current_media_number);
    1546             log_to_screen(_("Continuing to restore."));
     1546            log_to_screen("Continuing to restore.");
    15471547        } else {
    15481548            strcpy(tmp,
    … …  
    15731573                    strcpy(suffix, "");
    15741574                } else {
    1575                     log_to_screen(_("OK, that's pretty fsck0red..."));
     1575                    log_to_screen("OK, that's pretty fsck0red...");
    15761576                    return (1);
    15771577                }
    … …  
    19771977                filelist_name);
    19781978        log_msg(2,
    1979                 "This is a bit silly (ask dev-team to fix mondo-makefilelist, please)");
     1979                "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
    19801980        log_msg(2,
    19811981                "but it's non-critical. It's cosmetic. Don't worry about it.");
    … …  
    20312031            if (run_program_and_log_output(tmp, FALSE)) {
    20322032                log_to_screen
    2033                     (_("(compare_a_tarball) Compression program not found - oh no!"));
     2033                    ("(compare_a_tarball) Compression program not found - oh no!");
    20342034                paranoid_MR_finish(1);
    20352035            }
    … …  
    20542054            if (filelist_subset_fname[0] != '\0') {
    20552055                sprintf(command,
    2056                         "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
     2056                        "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
    20572057                        TAPE_BLOCK_SIZE,
    20582058                        BUFSIZE, executable, filelist_subset_fname,
    … …  
    20892089            if (res) {
    20902090                log_to_screen
    2091                     (_("Errors occurred while setting extended attributes"));
     2091                    ("Errors occurred while setting extended attributes");
    20922092            } else {
    20932093                log_msg(1, "I set xattr OK");
    … …  
    21002100            if (res) {
    21012101                log_to_screen
    2102                     (_("Errors occurred while setting access control lists"));
     2102                    ("Errors occurred while setting access control lists");
    21032103            } else {
    21042104                log_msg(1, "I set ACL OK");
    … …  
    21172117    if (does_file_exist("/PAUSE")) {
    21182118        popup_and_OK
    2119             (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     2119            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
    21202120    }
    21212121    unlink(filelist_subset_fname);
    … …  
    23142314
    23152315    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
    2316         log_to_screen(_("Paused after set %ld"), current_tarball_number);
    2317         popup_and_OK(_("Pausing. Press ENTER to continue."));
     2316        log_to_screen("Paused after set %ld", current_tarball_number);
     2317        popup_and_OK("Pausing. Press ENTER to continue.");
    23182318    }
    23192319
    … …  
    23782378    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
    23792379    total_slices = atol(tmp);
    2380     sprintf(tmp, _("Reassembling large files      "));
     2380    sprintf(tmp, "Reassembling large files      ");
    23812381    mvaddstr_and_log_it(g_currentY, 0, tmp);
    23822382    if (length_of_file(BIGGIELIST) < 6) {
    … …  
    23942394    log_msg(2, tmp);
    23952395
    2396     open_progress_form(_("Reassembling large files"),
    2397                        _("I am now reassembling all the large files."),
    2398                        _("Please wait. This may take some time."),
     2396    open_progress_form("Reassembling large files",
     2397                       "I am now reassembling all the large files.",
     2398                       "Please wait. This may take some time.",
    23992399                       "", total_slices);
    24002400    for (bigfileno = 0, finished = FALSE; !finished;) {
    … …  
    24172417                insist_on_this_cd_number(bkpinfo,
    24182418                                         ++g_current_media_number);
    2419                 sprintf(tmp, _("Restoring from %s #%d"),
     2419                sprintf(tmp, "Restoring from %s #%d",
    24202420                        media_descriptor_string(bkpinfo->
    24212421                                                backup_media_type),
    … …  
    24312431        } else {
    24322432            just_changed_cds = FALSE;
    2433             sprintf(tmp, _("Restoring big file %ld"), bigfileno + 1);
     2433            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
    24342434            update_progress_form(tmp);
    24352435            res =
    … …  
    24602460    if (does_file_exist("/PAUSE")) {
    24612461        popup_and_OK
    2462             (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     2462            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
    24632463    }
    24642464    close_progress_form();
    24652465    if (retval) {
    2466         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2466        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    24672467    } else {
    2468         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2468        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    24692469    }
    24702470    paranoid_free(xattr_fname);
    … …  
    25142514    assert(bkpinfo != NULL);
    25152515
    2516     mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     2516    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
    25172517    log_msg(2,
    25182518            "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
    … …  
    25242524    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    25252525    max_val = atol(tmp) + 1;
    2526     sprintf(progress_str, _("Restoring from %s #%d"),
     2526    sprintf(progress_str, "Restoring from %s #%d",
    25272527            media_descriptor_string(bkpinfo->backup_media_type),
    25282528            g_current_media_number);
    25292529    log_to_screen(progress_str);
    2530     open_progress_form(_("Restoring from archives"),
    2531                        _("Restoring data from the archives."),
    2532                        _("Please wait. This may take some time."),
     2530    open_progress_form("Restoring from archives",
     2531                       "Restoring data from the archives.",
     2532                       "Please wait. This may take some time.",
    25332533                       progress_str, max_val);
    25342534    for (;;) {
    … …  
    25562556            if (current_tarball_number == 0) {
    25572557                log_to_screen
    2558                     (_("No tarballs. Strange. Maybe you only backed up freakin' big files?"));
     2558                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
    25592559                return (0);
    25602560            }
    … …  
    25662566            }
    25672567            g_current_media_number++;
    2568             sprintf(progress_str, _("Restoring from %s #%d"),
     2568            sprintf(progress_str, "Restoring from %s #%d",
    25692569                    media_descriptor_string(bkpinfo->backup_media_type),
    25702570                    g_current_media_number);
    25712571            log_to_screen(progress_str);
    25722572        } else {
    2573             sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
     2573            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
    25742574                    current_tarball_number,
    25752575                    media_descriptor_string(bkpinfo->backup_media_type),
    … …  
    25832583                                              filelist);
    25842584            }
    2585             sprintf(tmp, _("%s #%d, fileset #%ld - restore "),
     2585            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
    25862586                    media_descriptor_string(bkpinfo->backup_media_type),
    25872587                    g_current_media_number, current_tarball_number);
    25882588            if (res) {
    2589                 strcat(tmp, _("reported errors"));
     2589                strcat(tmp, "reported errors");
    25902590            } else if (attempts > 1) {
    2591                 strcat(tmp, _("succeeded"));
     2591                strcat(tmp, "succeeded");
    25922592            } else {
    2593                 strcat(tmp, _("succeeded"));
     2593                strcat(tmp, "succeeded");
    25942594            }
    25952595            if (attempts > 1) {
    2596                 sprintf(tmp + strlen(tmp), _(" (%d attempts) - review logs"),
     2596                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
    25972597                        attempts);
    25982598            }
    … …  
    26092609    close_progress_form();
    26102610    if (retval) {
    2611         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2611        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    26122612    } else {
    2613         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2613        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    26142614    }
    26152615    paranoid_free(tmp);
    … …  
    26942694            noof_biggiefiles);
    26952695    log_msg(2, tmp);
    2696     open_progress_form(_("Reassembling large files"),
    2697                        _("I am now reassembling all the large files."),
    2698                        _("Please wait. This may take some time."),
     2696    open_progress_form("Reassembling large files",
     2697                       "I am now reassembling all the large files.",
     2698                       "Please wait. This may take some time.",
    26992699                       "", total_slices);
    27002700
    … …  
    27162716            p++;
    27172717        }
    2718         sprintf(tmp, _("Restoring big file %ld (%lld K)"),
     2718        sprintf(tmp, "Restoring big file %ld (%lld K)",
    27192719                current_bigfile_number + 1, biggie_size / 1024);
    27202720        update_progress_form(tmp);
    … …  
    27672767    if (does_file_exist("/PAUSE")) {
    27682768        popup_and_OK
    2769             (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     2769            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
    27702770    }
    27712771
    27722772    close_progress_form();
    27732773    if (retval) {
    2774         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2774        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    27752775    } else {
    2776         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2776        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    27772777    }
    27782778    paranoid_free(biggies_whose_EXATs_we_should_set);
    … …  
    28302830    malloc_string(xattr_fname);
    28312831    malloc_string(acl_fname);
    2832     mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     2832    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
    28332833    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    28342834    max_val = atol(tmp) + 1;
    … …  
    28382838    run_program_and_log_output("pwd", 5);
    28392839
    2840     sprintf(progress_str, _("Restoring from media #%d"),
     2840    sprintf(progress_str, "Restoring from media #%d",
    28412841            g_current_media_number);
    28422842    log_to_screen(progress_str);
    2843     open_progress_form(_("Restoring from archives"),
    2844                        _("Restoring data from the archives."),
    2845                        _("Please wait. This may take some time."),
     2843    open_progress_form("Restoring from archives",
     2844                       "Restoring data from the archives.",
     2845                       "Please wait. This may take some time.",
    28462846                       progress_str, max_val);
    28472847
    … …  
    28772877        }
    28782878        sprintf(tmp,
    2879                 _("Restoring from fileset #%ld (name=%s, size=%ld K)"),
     2879                "Restoring from fileset #%ld (name=%s, size=%ld K)",
    28802880                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
    28812881        res =
    … …  
    28862886        retval += res;
    28872887        if (res) {
    2888             sprintf(tmp, _("Fileset %ld - errors occurred"),
     2888            sprintf(tmp, "Fileset %ld - errors occurred",
    28892889                    current_afioball_number);
    28902890            log_to_screen(tmp);
    … …  
    28982898        current_afioball_number++;
    28992899        g_current_progress++;
    2900         sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
     2900        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
    29012901                current_afioball_number,
    29022902                media_descriptor_string(bkpinfo->backup_media_type),
    … …  
    29102910    close_progress_form();
    29112911    if (retval) {
    2912         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2912        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    29132913    } else {
    2914         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2914        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    29152915    }
    29162916    paranoid_free(tmp);
    … …  
    29632963    if (!find_home_of_exe("petris") && !g_text_mode) {
    29642964        newtDrawRootText(0, g_noof_rows - 2,
    2965                          _("Press ALT-<left cursor> twice to play Petris :-) "));
     2965                         "Press ALT-<left cursor> twice to play Petris :-) ");
    29662966        newtRefresh();
    29672967    }
    2968     mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
     2968    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
    29692969    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    29702970        mount_cdrom(bkpinfo);
    29712971        mvaddstr_and_log_it(g_currentY++, 0,
    2972                             _("Restoring OS and data from streaming media"));
     2972                            "Restoring OS and data from streaming media");
    29732973        if (bkpinfo->backup_media_type == cdstream) {
    29742974            openin_cdstream(bkpinfo);
    … …  
    29872987    } else {
    29882988        mvaddstr_and_log_it(g_currentY++, 0,
    2989                             _("Restoring OS and data from CD       "));
     2989                            "Restoring OS and data from CD       ");
    29902990        mount_cdrom(bkpinfo);
    29912991        resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
    … …  
    29942994    chdir(cwd);
    29952995    if (resA + resB) {
    2996         log_to_screen(_("Errors occurred while data was being restored."));
     2996        log_to_screen("Errors occurred while data was being restored.");
    29972997    }
    29982998    if (length_of_file("/etc/raidtab") > 0) {
    … …  
    31053105        retval++;
    31063106        log_to_screen
    3107             (_("Error(s) occurred while processing filelist and wildcard"));
     3107            ("Error(s) occurred while processing filelist and wildcard");
    31083108    }
    31093109    iamhere("FIXME");
    … …  
    32003200   *                                                                        *
    32013201   **************************************************************************/
    3202 
    3203 #ifdef ENABLE_NLS
    3204     setlocale(LC_ALL, "");
    3205     (void) textdomain("mondo");
    3206 #endif
    3207 
    32083202    if (getuid() != 0) {
    3209         fprintf(stderr, _("Please run as root.\n"));
     3203        fprintf(stderr, "Please run as root.\r\n");
    32103204        exit(127);
    32113205    }
    … …  
    33513345        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
    33523346        bkpinfo->backup_media_type = dvd;
    3353         open_progress_form(_("Reassembling /dev/hda1"),
    3354                            _("Shark is a bit of a silly person."),
    3355                            _("Please wait. This may take some time."),
     3347        open_progress_form("Reassembling /dev/hda1",
     3348                           "Shark is a bit of a silly person.",
     3349                           "Please wait. This may take some time.",
    33563350                           "", 1999);
    33573351        system("rm -Rf /tmp/*pih*");
    … …  
    34293423        retval = run_grub(FALSE, "/dev/hda");
    34303424        if (retval) {
    3431             log_to_screen(_("Failed to write Master Boot Record"));
     3425            log_to_screen("Failed to write Master Boot Record");
    34323426        }
    34333427        paranoid_MR_finish(0);
    … …  
    34403434        if (argc != 1) {
    34413435            popup_and_OK
    3442                 (_("Live mode doesn't support command-line parameters yet."));
     3436                ("Live mode doesn't support command-line parameters yet.");
    34433437            paranoid_MR_finish(1);
    34443438//    return(1);
    … …  
    34723466        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
    34733467        if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
    3474             log_to_screen(_("Uh, that hasn't been implemented yet."));
     3468            log_to_screen("Uh, that hasn't been implemented yet.");
    34753469            paranoid_MR_finish(1);
    34763470        }
    … …  
    35013495        if (retval) {
    35023496            log_to_screen
    3503                 (_("Warning - load_raidtab_into_raidlist returned an error"));
     3497                ("Warning - load_raidtab_into_raidlist returned an error");
    35043498        }
    35053499
    … …  
    35553549            }
    35563550            if (retval) {
    3557                 log_to_screen(_("Failed to write Master Boot Record"));
     3551                log_to_screen("Failed to write Master Boot Record");
    35583552            }
    35593553        } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
    … …  
    35613555            retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
    35623556        } else if (argc != 1) {
    3563             log_to_screen(_("Invalid paremeters"));
     3557            log_to_screen("Invalid paremeters");
    35643558            paranoid_MR_finish(1);
    35653559        } else {
    … …  
    35733567        if (does_file_exist("/tmp/changed.files")) {
    35743568            log_to_screen
    3575                 (_("See /tmp/changed.files for list of files that have changed."));
     3569                ("See /tmp/changed.files for list of files that have changed.");
    35763570        }
    35773571        mvaddstr_and_log_it(g_currentY++,
    35783572                            0,
    3579                             _("Run complete. Errors were reported. Please review the logfile."));
     3573                            "Run complete. Errors were reported. Please review the logfile.");
    35803574    } else {
    35813575        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    35823576            mvaddstr_and_log_it(g_currentY++,
    35833577                                0,
    3584                                 _("Run complete. Please remove floppy/CD/media and reboot."));
     3578                                "Run complete. Please remove floppy/CD/media and reboot.");
    35853579        } else {
    35863580            run_program_and_log_output("sync", FALSE);
    … …  
    36033597            mvaddstr_and_log_it(g_currentY++,
    36043598                                0,
    3605                                 _("Run complete. Please remove media and reboot."));
     3599                                "Run complete. Please remove media and reboot.");
    36063600        }
    36073601    }
    … …  
    36133607            if (mount_all_devices(mountlist, TRUE)) {
    36143608                log_to_screen
    3615                     (_("Unable to re-mount partitions for post-nuke stuff"));
     3609                    ("Unable to re-mount partitions for post-nuke stuff");
    36163610            } else {
    36173611                log_msg(1, "Re-mounted partitions for post-nuke stuff");
    … …  
    36463640    run_program_and_log_output(tmp, FALSE);
    36473641    log_to_screen
    3648         (_("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
     3642        ("Restore log copied to /tmp/mondo-restore.log on your hard disk");
    36493643    sprintf(tmp,
    3650             _("Mondo-restore is exiting (retval=%d)                                      "),
     3644            "Mondo-restore is exiting (retval=%d)                                      ",
    36513645            retval);
    36523646    log_to_screen(tmp);

  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-compare.c

    r522 r541  
    135135    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
    136136        sprintf(tmp_ptr,
    137                 _("Cannot open bigfile %ld (%s)'s info file"),
     137                "Cannot open bigfile %ld (%s)'s info file",
    138138                bigfileno + 1, bigfile_fname_ptr);
    139139        log_to_screen(tmp_ptr);
    … …  
    149149    log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
    150150
    151     sprintf(tmp_ptr, _("Comparing %s"), bigfile_fname_ptr);
     151    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
    152152
    153153    if (!g_text_mode) {
    … …  
    252252    }
    253253    mvaddstr_and_log_it(g_currentY, 0,
    254                         _("Comparing large files                                                  "));
    255     open_progress_form(_("Comparing large files"),
    256                        _("I am now comparing the large files"),
    257                        _("against the filesystem. Please wait."), "",
     254                        "Comparing large files                                                  ");
     255    open_progress_form("Comparing large files",
     256                       "I am now comparing the large files",
     257                       "against the filesystem. Please wait.", "",
    258258                       noof_biggiefiles);
    259259    for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
    … …  
    268268    return (0);
    269269    if (retval) {
    270         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
    271     } else {
    272         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     270        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     271    } else {
     272        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    273273    }
    274274    return (retval);
    … …  
    428428
    429429    assert(bkpinfo != NULL);
    430     mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives"));
     430    mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
    431431    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    432432
    433433    max_val = atol(tmp);
    434     sprintf(progress_str, _("Comparing with %s #%d "),
     434    sprintf(progress_str, "Comparing with %s #%d ",
    435435            media_descriptor_string(bkpinfo->backup_media_type),
    436436            g_current_media_number);
    437437
    438     open_progress_form(_("Comparing files"),
    439                        _("Comparing tarballs against filesystem."),
    440                        _("Please wait. This may take some time."),
     438    open_progress_form("Comparing files",
     439                       "Comparing tarballs against filesystem.",
     440                       "Please wait. This may take some time.",
    441441                       progress_str, max_val);
    442442
    … …  
    475475            log_msg(2, "OK, I think it's time for another CD...");
    476476            g_current_media_number++;
    477             sprintf(progress_str, _("Comparing with %s #%d "),
     477            sprintf(progress_str, "Comparing with %s #%d ",
    478478                    media_descriptor_string(bkpinfo->backup_media_type),
    479479                    g_current_media_number);
    … …  
    488488    close_progress_form();
    489489    if (retval) {
    490         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
    491     } else {
    492         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     490        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     491    } else {
     492        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    493493    }
    494494    paranoid_free(tarball_fname);
    … …  
    541541    noof_changed_files = count_lines_in_file("/tmp/changed.txt");
    542542    if (noof_changed_files) {
    543         sprintf(tmp, _("%ld files do not match the backup            "),
     543        sprintf(tmp, "%ld files do not match the backup            ",
    544544                noof_changed_files);
    545545        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
    … …  
    548548        paranoid_system(command);
    549549    } else {
    550         sprintf(tmp, _("All files match the backup                     "));
     550        sprintf(tmp, "All files match the backup                     ");
    551551        mvaddstr_and_log_it(g_currentY++, 0, tmp);
    552552        log_to_screen(tmp);
    … …  
    598598    while (get_cfg_file_from_archive(bkpinfo)) {
    599599        if (!ask_me_yes_or_no
    600             (_("Failed to find config file/archives. Choose another source?")))
     600            ("Failed to find config file/archives. Choose another source?"))
    601601        {
    602602            fatal_error("Unable to find config file/archives. Aborting.");
    … …  
    607607    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
    608608    g_current_media_number = 1;
    609     mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
     609    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
    610610    iamhere("Pre-MAD");
    611611    retval = mount_all_devices(mountlist, FALSE);
    … …  
    626626        mvaddstr_and_log_it(g_currentY++,
    627627                            0,
    628                             _("Warning - differences found during the compare phase"));
     628                            "Warning - differences found during the compare phase");
    629629    }
    630630
    … …  
    633633    if (count_lines_in_file("/tmp/changed.txt") > 0) {
    634634        mvaddstr_and_log_it(g_currentY++, 0,
    635                             _("Differences found while files were being compared."));
     635                            "Differences found while files were being compared.");
    636636        streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
    637637        if (count_lines_in_file("/tmp/changed.files") <= 0) {
    638638            mvaddstr_and_log_it(g_currentY++, 0,
    639                                 _("...but they were logfiles and temporary files. Your archives are fine."));
     639                                "...but they were logfiles and temporary files. Your archives are fine.");
    640640            log_to_screen
    641                 (_("The differences were logfiles and temporary files. Your archives are fine."));
     641                ("The differences were logfiles and temporary files. Your archives are fine.");
    642642        } else {
    643643            q = count_lines_in_file("/tmp/changed.files");
    644             sprintf(tmp, _("%ld significant difference%s found."), q,
     644            sprintf(tmp, "%ld significant difference%s found.", q,
    645645                    (q != 1) ? "s" : "");
    646646            mvaddstr_and_log_it(g_currentY++, 0, tmp);
    … …  
    648648
    649649            strcpy(tmp,
    650                    _("Type 'less /tmp/changed.files' for a list of non-matching files"));
     650                   "Type 'less /tmp/changed.files' for a list of non-matching files");
    651651            mvaddstr_and_log_it(g_currentY++, 0, tmp);
    652652            log_to_screen(tmp);
    … …  
    658658    } else {
    659659        log_to_screen
    660             (_("No significant differences were found. Your backup is perfect."));
     660            ("No significant differences were found. Your backup is perfect.");
    661661    }
    662662    kill_petris();
    … …  
    694694    run_program_and_log_output(command, FALSE);
    695695    mvaddstr_and_log_it(g_currentY,
    696                         0, _("Verifying archives against filesystem"));
     696                        0, "Verifying archives against filesystem");
    697697
    698698    if (bkpinfo->disaster_recovery
    … …  
    714714    }
    715715
    716     mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     716    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    717717    paranoid_free(dir);
    718718    paranoid_free(command);
    … …  
    751751    run_program_and_log_output(command, FALSE);
    752752    mvaddstr_and_log_it(g_currentY,
    753                         0, _("Verifying archives against filesystem"));
     753                        0, "Verifying archives against filesystem");
    754754    res = verify_tape_backups(bkpinfo);
    755755    chdir(dir);
    756756    if (res) {
    757         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    758     } else {
    759         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     757        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     758    } else {
     759        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    760760    }
    761761    paranoid_free(dir);

  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-newt.c

    r538 r541  
    156156
    157157    newtPushHelpLine
    158         (_("   Add one of the following unallocated RAID partitions to this RAID device."));
    159     sprintf(tmp, "%-26s %s", _("Device"), _("Size"));
     158        ("   Add one of the following unallocated RAID partitions to this RAID device.");
     159    sprintf(tmp, "%-26s %s", "Device", "Size");
    160160    headerMsg = newtLabel(1, 1, tmp);
    161161    partitionsListbox =
    … …  
    164164                             partitionsListbox);
    165165    i = 7;
    166     bOK = newtCompactButton(i, 9, _("  OK  "));
    167     bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
    168     newtOpenWindow(22, 6, 36, 10, _("Unallocated RAID partitions"));
     166    bOK = newtCompactButton(i, 9, "  OK  ");
     167    bCancel = newtCompactButton(i += 9, 9, "Cancel");
     168    newtOpenWindow(22, 6, 36, 10, "Unallocated RAID partitions");
    169169    myForm = newtForm(NULL, NULL, 0);
    170170    newtFormAddComponents(myForm, headerMsg, partitionsListbox, bOK,
    … …  
    258258    size_str[0] = '\0';
    259259    /* sprintf(size_str,""); */
    260     newtOpenWindow(20, 5, 48, 10, _("Add entry"));
    261     label0 = newtLabel(2, 1, _("Device:    "));
    262     label1 = newtLabel(2, 2, _("Mountpoint:"));
    263     label2 = newtLabel(2, 3, _("Size (MB): "));
    264     label3 = newtLabel(2, 4, _("Format:    "));
     260    newtOpenWindow(20, 5, 48, 10, "Add entry");
     261    label0 = newtLabel(2, 1, "Device:    ");
     262    label1 = newtLabel(2, 2, "Mountpoint:");
     263    label2 = newtLabel(2, 3, "Size (MB): ");
     264    label3 = newtLabel(2, 4, "Format:    ");
    265265    deviceComp =
    266266        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
    … …  
    270270        newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
    271271    sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
    272     bOK = newtButton(5, 6, _("  OK  "));
    273     bCancel = newtButton(17, 6, _("Cancel"));
     272    bOK = newtButton(5, 6, "  OK  ");
     273    bCancel = newtButton(17, 6, "Cancel");
    274274    newtPushHelpLine
    275         (_("To add an entry to the mountlist, please fill in these fields and then hit 'OK'"));
     275        ("To add an entry to the mountlist, please fill in these fields and then hit 'OK'");
    276276    myForm = newtForm(NULL, NULL, 0);
    277277    newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
    … …  
    292292        if (b_res == bOK) {
    293293            if (device_str[strlen(device_str) - 1] == '/') {
    294                 popup_and_OK(_("You left the device nearly blank!"));
     294                popup_and_OK("You left the device nearly blank!");
    295295                b_res = NULL;
    296296            }
    297297            if (size_of_specific_device_in_mountlist(mountlist, device_str)
    298298                >= 0) {
    299                 popup_and_OK(_("Can't add this - you've got one already!"));
     299                popup_and_OK("Can't add this - you've got one already!");
    300300                b_res = NULL;
    301301            }
    … …  
    346346    sz_out[0] = '\0';
    347347    if (popup_and_get_string
    348         ("Add variable", _("Enter the name of the variable to add"), sz_out,
     348        ("Add variable", "Enter the name of the variable to add", sz_out,
    349349         MAX_STR_LEN)) {
    350350        strip_spaces(sz_out);
    … …  
    355355        if (i < items) {
    356356            popup_and_OK
    357                 (_("No need to add that variable. It is already listed here."));
     357                ("No need to add that variable. It is already listed here.");
    358358        } else {
    359359            strcpy(raidrec->additional_vars.el[items].label, sz_out);
    … …  
    555555
    556556    sprintf(prompt,
    557             _("Please enter the RAID level you want. (concat, striped, raid5)"));
     557            "Please enter the RAID level you want. (concat, striped, raid5)");
    558558    if (raidrec->raidlevel == -1) {
    559559        strcpy(tmp, "concat");
    … …  
    608608    strcpy(personalities,
    609609           last_line_of_file("/tmp/raid-personalities.txt"));
    610     sprintf(prompt, _("Please enter the RAID level you want. %s"),
     610    sprintf(prompt, "Please enter the RAID level you want. %s",
    611611            personalities);
    612612    if (raidrec->raid_level == -1) {
    … …  
    618618         out != -1 && out != 0 && out != 1 && out != 4 && out != 5
    619619         && out != 10;) {
    620         res = popup_and_get_string(_("Specify RAID level"), prompt, tmp, 10);
     620        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
    621621        if (!res) {
    622622            return;
    … …  
    641641        } else {
    642642            if (ask_me_yes_or_no
    643                 (_("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")))
     643                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
    644644            {
    645645                out = 999;
    … …  
    720720    assert_string_is_neither_NULL_nor_zerolength(raid_device);
    721721
    722     sprintf(tmp, _("Delete %s from RAID device %s - are you sure?"),
     722    sprintf(tmp, "Delete %s from RAID device %s - are you sure?",
    723723            disklist->el[currline].device, raid_device);
    724724    if (!ask_me_yes_or_no(tmp)) {
    … …  
    768768                                                  device);
    769769    if (pos >= 0) {
    770         sprintf(tmp, _("Cannot delete %s: it is in use by RAID device %s"),
     770        sprintf(tmp, "Cannot delete %s: it is in use by RAID device %s",
    771771                mountlist->el[currline].device,
    772772                raidlist->el[pos].OSSWAP(raid_device, volname));
    … …  
    774774        return;
    775775    }
    776     sprintf(tmp, _("Delete %s - are you sure?"),
     776    sprintf(tmp, "Delete %s - are you sure?",
    777777            mountlist->el[currline].device);
    778778    if (!ask_me_yes_or_no(tmp)) {
    … …  
    829829        return;
    830830    }
    831     sprintf(tmp, _("Do you want me to delete %s's partitions, too?"), device);
     831    sprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
    832832    delete_partitions_too = ask_me_yes_or_no(tmp);
    833833    if (delete_partitions_too) {
    … …  
    896896
    897897    av = &raidrec->additional_vars;
    898     sprintf(tmp, _("Delete %s - are you sure?"), av->el[lino].label);
     898    sprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
    899899    if (ask_me_yes_or_no(tmp)) {
    900900        if (!strcmp(av->el[lino].label, "persistent-superblock")
    901901            || !strcmp(av->el[lino].label, "chunk-size")) {
    902             sprintf(tmp, _("%s must not be deleted. It would be bad."),
     902            sprintf(tmp, "%s must not be deleted. It would be bad.",
    903903                    av->el[lino].label);
    904904            popup_and_OK(tmp);
    … …  
    967967                    warned_already = TRUE;
    968968                    sprintf(tmp,
    969                             _("Too many lines. Displaying first %d entries only. Close a directory to see more."),
     969                            "Too many lines. Displaying first %d entries only. Close a directory to see more.",
    970970                            ARBITRARY_MAXIMUM);
    971971                    popup_and_OK(tmp);
    … …  
    11051105    assert(filelist != NULL);
    11061106
    1107     log_to_screen(_("Editing filelist"));
     1107    log_to_screen("Editing filelist");
    11081108    newtPushHelpLine
    1109         (_("   Please edit the filelist to your satisfaction, then click OK or Cancel."));
     1109        ("   Please edit the filelist to your satisfaction, then click OK or Cancel.");
    11101110    j = 4;
    1111     bLess = newtCompactButton(j, 17, _(" Less "));
    1112     bMore = newtCompactButton(j += 12, 17, _(" More "));
    1113     bToggle = newtCompactButton(j += 12, 17, _("Toggle"));
    1114     bRegex = newtCompactButton(j += 12, 17, _("RegEx"));
    1115     bCancel = newtCompactButton(j += 12, 17, _("Cancel"));
    1116     bOK = newtCompactButton(j += 12, 17, _("  OK  "));
     1111    bLess = newtCompactButton(j, 17, " Less ");
     1112    bMore = newtCompactButton(j += 12, 17, " More ");
     1113    bToggle = newtCompactButton(j += 12, 17, "Toggle");
     1114    bRegex = newtCompactButton(j += 12, 17, "RegEx");
     1115    bCancel = newtCompactButton(j += 12, 17, "Cancel");
     1116    bOK = newtCompactButton(j += 12, 17, "  OK  ");
    11171117    filelistListbox =
    11181118        newtListbox(2, 1, 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
    … …  
    11201120    lines_in_flist_window =
    11211121        redraw_filelist(filelist, keylist, filelistListbox);
    1122     newtOpenWindow(1, 3, 77, 18, _("Editing filelist"));
     1122    newtOpenWindow(1, 3, 77, 18, "Editing filelist");
    11231123    myForm = newtForm(NULL, NULL, 0);
    11241124    newtFormAddComponents(myForm, filelistListbox, bLess, bMore, bToggle,
    … …  
    11291129            finished =
    11301130                ask_me_yes_or_no
    1131                 (_("Are you happy with your file selection?"));
     1131                ("Are you happy with your file selection?");
    11321132        } else if (b_res == bCancel) {
    11331133            finished = TRUE;
    11341134        } else if (b_res == bRegex) {
    1135             popup_and_OK(_("I haven't implemented this yet..."));
     1135            popup_and_OK("I haven't implemented this yet...");
    11361136        } else {
    11371137            curr_choice = newtListboxGetCurrent(filelistListbox);
    … …  
    12691269    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
    12701270    newtOpenWindow(20, 5, 48, 10, "Edit entry");
    1271     label0 = newtLabel(2, 1, _("Device:"));
    1272     label1 = newtLabel(2, 2, _("Mountpoint:"));
    1273     label2 = newtLabel(2, 3, _("Size (MB): "));
    1274     label3 = newtLabel(2, 4, _("Format:    "));
     1271    label0 = newtLabel(2, 1, "Device:");
     1272    label1 = newtLabel(2, 2, "Mountpoint:");
     1273    label2 = newtLabel(2, 3, "Size (MB): ");
     1274    label3 = newtLabel(2, 4, "Format:    ");
    12751275    deviceComp =
    12761276        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
    … …  
    12851285        sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
    12861286    }
    1287     bOK = newtButton(2, 6, _("  OK  "));
    1288     bCancel = newtButton(14, 6, _("Cancel"));
     1287    bOK = newtButton(2, 6, "  OK  ");
     1288    bCancel = newtButton(14, 6, "Cancel");
    12891289    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
    12901290        b_raid = newtButton(26, 6, "RAID..");
    12911291    }
    12921292    newtPushHelpLine
    1293         (_("       Edit this partition's mountpoint, size and format; then click 'OK'."));
     1293        ("       Edit this partition's mountpoint, size and format; then click 'OK'.");
    12941294    myForm = newtForm(NULL, NULL, 0);
    12951295    newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
    … …  
    13071307            && strstr(device_used_to_be, RAID_DEVICE_STUB)
    13081308            && strcmp(device_str, device_used_to_be)) {
    1309             popup_and_OK(_("You can't change /dev/mdX to /dev/mdY."));
     1309            popup_and_OK("You can't change /dev/mdX to /dev/mdY.");
    13101310            b_res = NULL;
    13111311            continue;
    13121312        } else if (b_res == bOK && !strcmp(mountpoint_str, "image")
    13131313                   && strcmp(mountpt_used_to_be, "image")) {
    1314             popup_and_OK(_("You can't change a regular device to an image."));
     1314            popup_and_OK("You can't change a regular device to an image.");
    13151315            b_res = NULL;
    13161316            continue;
    … …  
    13351335                 */
    13361336                popup_and_OK
    1337                     (_("You cannot edit the RAID settings until you have OK'd your change to the device node."));
     1337                    ("You cannot edit the RAID settings until you have OK'd your change to the device node.");
    13381338            } else {
    13391339                j = find_raid_device_in_raidlist(raidlist,
    … …  
    13421342                if (j < 0) {
    13431343                    sprintf(tmp,
    1344                             _("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
     1344                            "/etc/raidtab does not have an entry for %s; please delete it and add it again",
    13451345                            mountlist->el[currline].device);
    13461346                    popup_and_OK(tmp);
    13471347                } else {
    1348                     log_it(_("edit_raidlist_entry - calling"));
     1348                    log_it("edit_raidlist_entry - calling");
    13491349                    edit_raidlist_entry(mountlist, raidlist,
    13501350                                        &raidlist->el[j], currline);
    … …  
    13961396    else if (strcmp(device_used_to_be, device_str)) {
    13971397        popup_and_OK
    1398             (_("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it."));
     1398            ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
    13991399    }
    14001400#endif
    … …  
    15061506    int currline2 = 0;
    15071507
    1508     log_it(_("Started edit_raidlist_entry"));
     1508    log_it("Started edit_raidlist_entry");
    15091509    memcpy((void *) &bkp_raidrec, (void *) raidrec,
    15101510           sizeof(struct vinum_volume));
    1511     sprintf(title_of_editraidForm_window, _("Plexes on %s"),
     1511    sprintf(title_of_editraidForm_window, "Plexes on %s",
    15121512            raidrec->volname);
    1513     newtPushHelpLine(_("   Please select a plex to edit"));
     1513    newtPushHelpLine("   Please select a plex to edit");
    15141514    newtOpenWindow(13, 5, 54, 15, title_of_editraidForm_window);
    15151515    for (;;) {
    … …  
    15171517        char headerstr[MAX_STR_LEN];
    15181518        snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
    1519                  _("Plex"), _("Level",) _("Stripe Size"), _("Subdisks"));
    1520 
    1521         bOK = newtCompactButton(2, 13, _("  OK  "));
    1522         bCancel = newtCompactButton(12, 13, _("Cancel"));
    1523         bAdd = newtCompactButton(22, 13, _(" Add "));
    1524         bEdit = newtCompactButton(32, 13, _(" Edit "));
    1525         bDelete = newtCompactButton(42, 13, _("Delete"));
     1519                 "Plex", "Level", "Stripe Size", "Subdisks");
     1520
     1521        bOK = newtCompactButton(2, 13, "  OK  ");
     1522        bCancel = newtCompactButton(12, 13, "Cancel");
     1523        bAdd = newtCompactButton(22, 13, " Add ");
     1524        bEdit = newtCompactButton(32, 13, " Edit ");
     1525        bDelete = newtCompactButton(42, 13, "Delete");
    15261526
    15271527        plexesListbox =
    … …  
    15831583        if (b_res == bDelete) {
    15841584            char msg[MAX_STR_LEN];
    1585             sprintf(msg, _("Are you sure you want to delete %s.p%i?"),
     1585            sprintf(msg, "Are you sure you want to delete %s.p%i?",
    15861586                    raidrec->volname, currline2);
    15871587            if (ask_me_yes_or_no(msg)) {
    1588                 log_it(_("Deleting RAID plex"));
     1588                log_it("Deleting RAID plex");
    15891589                memcpy((void *) &raidrec->plex[currline2],
    15901590                       (void *) &raidrec->plex[raidrec->plexes - 1],
    … …  
    16601660    for (;;) {
    16611661        log_msg(2, "Main loop");
    1662         sprintf(title_of_editraidForm_window, _("Edit %s"),
     1662        sprintf(title_of_editraidForm_window, "Edit %s",
    16631663                raidrec->raid_device);
    16641664        strcpy(sz_raid_level,
    … …  
    16661666        strcpy(sz_data_disks,
    16671667               number_of_disks_as_string(raidrec->data_disks.entries,
    1668                                          _("data")));
     1668                                         "data"));
    16691669        strcpy(sz_spare_disks,
    16701670               number_of_disks_as_string(raidrec->spare_disks.entries,
    1671                                          _("spare")));
     1671                                         "spare"));
    16721672        strcpy(sz_parity_disks,
    16731673               number_of_disks_as_string(raidrec->parity_disks.entries,
    1674                                          _("parity")));
     1674                                         "parity"));
    16751675        strcpy(sz_failed_disks,
    16761676               number_of_disks_as_string(raidrec->failed_disks.entries,
    1677                                          _("failed")));
     1677                                         "failed"));
    16781678        bSelectData = newtButton(1, 1, sz_data_disks);
    16791679        bSelectSpare = newtButton(20, 1, sz_spare_disks);
    … …  
    16811681        bSelectFailed = newtButton(20, 5, sz_failed_disks);
    16821682        bChangeRaid = newtButton(1, 9, sz_raid_level);
    1683         bOK = newtButton(16 + (raidrec->raid_level == -1), 9, _("  OK  "));
    1684         bCancel = newtButton(28, 9, _("Cancel"));
     1683        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, "  OK  ");
     1684        bCancel = newtButton(28, 9, "Cancel");
    16851685        bAdditional =
    16861686            newtCompactButton(1, 13,
    1687                               _("Additional settings and information"));
     1687                              "Additional settings and information");
    16881688        newtPushHelpLine
    1689             (_("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel."));
     1689            ("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel.");
    16901690        editraidForm = newtForm(NULL, NULL, 0);
    16911691        newtFormAddComponents(editraidForm, bSelectData, bSelectParity,
    … …  
    16961696            choose_raid_level(raidrec);
    16971697        } else if (b_res == bSelectData) {
    1698             select_raid_disks(mountlist, raidlist, raidrec, _("data"),
     1698            select_raid_disks(mountlist, raidlist, raidrec, "data",
    16991699                              &raidrec->data_disks);
    17001700        } else if (b_res == bSelectSpare) {
    1701             select_raid_disks(mountlist, raidlist, raidrec, _("spare"),
     1701            select_raid_disks(mountlist, raidlist, raidrec, "spare",
    17021702                              &raidrec->spare_disks);
    17031703        } else if (b_res == bSelectParity) {
    1704             select_raid_disks(mountlist, raidlist, raidrec, _("parity"),
     1704            select_raid_disks(mountlist, raidlist, raidrec, "parity",
    17051705                              &raidrec->parity_disks);
    17061706        } else if (b_res == bSelectFailed) {
    1707             select_raid_disks(mountlist, raidlist, raidrec, _("failed"),
     1707            select_raid_disks(mountlist, raidlist, raidrec, "failed",
    17081708                              &raidrec->failed_disks);
    17091709        } else if (b_res == bAdditional) {
    … …  
    17861786            raidlist->el[currline].volname, currline2);
    17871787    newtPushHelpLine
    1788         (_("   Please select a subdisk to edit, or edit this plex's parameters"));
     1788        ("   Please select a subdisk to edit, or edit this plex's parameters");
    17891789    newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
    17901790    for (;;) {
    … …  
    17921792        char headerstr[MAX_STR_LEN];
    17931793        char tmp[64];
    1794         snprintf(headerstr, MAX_STR_LEN, "%-24s %s", _("Subdisk"), _("Device"));
     1794        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", "Subdisk", "Device");
    17951795
    17961796
    … …  
    18061806            break;
    18071807        default:
    1808             sprintf(tmp, _("unknown (%i)"), raidrec->raidlevel);
     1808            sprintf(tmp, "unknown (%i)", raidrec->raidlevel);
    18091809            break;
    18101810        }
    1811         bLevel = newtCompactButton(2, 2, _(" RAID level "));
     1811        bLevel = newtCompactButton(2, 2, " RAID level ");
    18121812        sLevel = newtLabel(19, 2, tmp);
    18131813
    18141814        if (raidrec->raidlevel >= 0) {
    18151815            sprintf(tmp, "%ik", raidrec->stripesize);
    1816             bStripeSize = newtCompactButton(2, 4, _(" Stripe size "));
     1816            bStripeSize = newtCompactButton(2, 4, " Stripe size ");
    18171817        } else {
    18181818            strcpy(tmp, "N/A");
    1819             bStripeSize = newtLabel(2, 4, _("Stripe size:"));
     1819            bStripeSize = newtLabel(2, 4, "Stripe size:");
    18201820        }
    18211821        sStripeSize = newtLabel(19, 4, tmp);
    18221822
    1823         bOK = newtCompactButton(2, 16, _("  OK  "));
    1824         bCancel = newtCompactButton(12, 16, _("Cancel"));
    1825         bAdd = newtCompactButton(22, 16, _(" Add "));
    1826         bEdit = newtCompactButton(32, 16, _(" Edit "));
    1827         bDelete = newtCompactButton(42, 16, _("Delete"));
     1823        bOK = newtCompactButton(2, 16, "  OK  ");
     1824        bCancel = newtCompactButton(12, 16, "Cancel");
     1825        bAdd = newtCompactButton(22, 16, " Add ");
     1826        bEdit = newtCompactButton(32, 16, " Edit ");
     1827        bDelete = newtCompactButton(42, 16, "Delete");
    18281828
    18291829
    … …  
    19111911            sprintf(tmp, "%i", raidrec->stripesize);
    19121912            if (popup_and_get_string
    1913                 (_("Stripe size"),
    1914                  _("Please enter the stripe size in kilobytes."), tmp, 20)) {
     1913                ("Stripe size",
     1914                 "Please enter the stripe size in kilobytes.", tmp, 20)) {
    19151915                raidrec->stripesize = atoi(tmp);
    19161916            }
    … …  
    19631963
    19641964    strcpy(sz_out, raidrec->additional_vars.el[lino].value);
    1965     sprintf(header, _("Edit %s"), raidrec->additional_vars.el[lino].label);
    1966     sprintf(comment, _("Please set %s's value (currently '%s')"),
     1965    sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
     1966    sprintf(comment, "Please set %s's value (currently '%s')",
    19671967            raidrec->additional_vars.el[lino].label, sz_out);
    19681968    if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
    … …  
    20262026    strcpy(flaws_str_C, "xxxxxxxxx");
    20272027    if (mountlist->entries > ARBITRARY_MAXIMUM) {
    2028         log_to_screen(_("Arbitrary limits suck, man!"));
     2028        log_to_screen("Arbitrary limits suck, man!");
    20292029        finish(1);
    20302030    }
    20312031    newtPushHelpLine
    2032         (_("   Please edit the mountlist to your satisfaction, then click OK or Cancel."));
     2032        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
    20332033    i = 4;
    2034     bAdd = newtCompactButton(i, 17, _(" Add "));
    2035     bEdit = newtCompactButton(i += 11, 17, _(" Edit "));
    2036     bDelete = newtCompactButton(i += 12, 17, _("Delete"));
    2037     bReload = newtCompactButton(i += 12, 17, _("Reload"));
    2038     bCancel = newtCompactButton(i += 12, 17, _("Cancel"));
    2039     bOK = newtCompactButton(i += 12, 17, _("  OK  "));
    2040     sprintf(tmp, "%-24s %-24s %-8s  %s", _("Device"), _("Mountpoint"), _("Format"),
    2041             _("Size (MB)"));
     2034    bAdd = newtCompactButton(i, 17, " Add ");
     2035    bEdit = newtCompactButton(i += 11, 17, " Edit ");
     2036    bDelete = newtCompactButton(i += 12, 17, "Delete");
     2037    bReload = newtCompactButton(i += 12, 17, "Reload");
     2038    bCancel = newtCompactButton(i += 12, 17, "Cancel");
     2039    bOK = newtCompactButton(i += 12, 17, "  OK  ");
     2040    sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
     2041            "Size (MB)");
    20422042    headerMsg = newtLabel(2, 1, tmp);
    20432043    flawsLabelA = newtLabel(2, 13, flaws_str_A);
    … …  
    20472047        newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
    20482048    redraw_mountlist(mountlist, keylist, partitionsListbox);
    2049     newtOpenWindow(1, 3, 77, 18, _("Editing mountlist"));
     2049    newtOpenWindow(1, 3, 77, 18, "Editing mountlist");
    20502050    myForm = newtForm(NULL, NULL, 0);
    20512051    newtFormAddComponents(myForm, headerMsg, partitionsListbox,
    … …  
    20642064                finished =
    20652065                    ask_me_yes_or_no
    2066                     (_("Your mountlist might not work. Continue anyway?"));
     2066                    ("Your mountlist might not work. Continue anyway?");
    20672067            } else {
    20682068                finished =
    20692069                    ask_me_yes_or_no
    2070                     (_("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)"));
     2070                    ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
    20712071            }
    20722072        } else if (b_res == bCancel) {
    20732073            finished = TRUE;
    20742074        } else if (b_res == bReload) {
    2075             if (ask_me_yes_or_no(_("Reload original mountlist?"))) {
     2075            if (ask_me_yes_or_no("Reload original mountlist?")) {
    20762076/*
    20772077This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
    … …  
    20912091                 i < mountlist->entries && keylist[i] != curr_choice; i++);
    20922092            if (i == mountlist->entries && mountlist->entries > 0) {
    2093                 log_to_screen(_("I don't know what that button does!"));
     2093                log_to_screen("I don't know what that button does!");
    20942094            } else {
    20952095                currline = i;
    … …  
    21092109                    } else {
    21102110                        popup_and_OK
    2111                             (_("Please add an entry. Then press ENTER to edit it."));
     2111                            ("Please add an entry. Then press ENTER to edit it.");
    21122112                    }
    21132113                }
    … …  
    21192119    newtPopHelpLine();
    21202120    if (b_res == bOK) {
    2121         log_it(_("You pushed 'OK'. I shall now continue."));
     2121        log_it("You pushed 'OK'. I shall now continue.");
    21222122        return (0);
    21232123    } else {
    … …  
    21982198    sprintf(title_of_window, "Additional variables");
    21992199    newtPushHelpLine
    2200         (_("  Edit the additional fields to your heart's content, then click OK or Cancel."));
    2201     headerMsg = newtLabel(1, 1, _("Label                            Value"));
     2200        ("  Edit the additional fields to your heart's content, then click OK or Cancel.");
     2201    headerMsg = newtLabel(1, 1, "Label                            Value");
    22022202    varsListbox =
    22032203        newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
    22042204    i = 1;
    2205     bAdd = newtCompactButton(i, 9, _(" Add "));
    2206     bEdit = newtCompactButton(i += 8, 9, _(" Edit "));
    2207     bDelete = newtCompactButton(i += 9, 9, _("Delete"));
    2208     bOK = newtCompactButton(i += 9, 9, _("  OK  "));
    2209     bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
     2205    bAdd = newtCompactButton(i, 9, " Add ");
     2206    bEdit = newtCompactButton(i += 8, 9, " Edit ");
     2207    bDelete = newtCompactButton(i += 9, 9, "Delete");
     2208    bOK = newtCompactButton(i += 9, 9, "  OK  ");
     2209    bCancel = newtCompactButton(i += 9, 9, "Cancel");
    22102210    newtOpenWindow(17, 7, 46, 10, title_of_window);
    22112211    myForm = newtForm(NULL, NULL, 0);
    … …  
    23282328 * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters.
    23292329 * @param isodir_format Where to put the format (e.g. ext2) the user enters.
    2330  * @param isodir_path Where to put the path (e.g. /var/cache/mondo) the user enters.
     2330 * @param isodir_path Where to put the path (e.g. /root/images/mondo) the user enters.
    23312331 * @param nuke_me_please Whether we're planning on nuking or not.
    23322332 * @return TRUE if OK was pressed, FALSE otherwise.
    … …  
    23612361
    23622362    if (popup_and_get_string
    2363         (_("ISO Mode - device"), _("On what device do the ISO files live?"),
     2363        ("ISO Mode - device", "On what device do the ISO files live?",
    23642364         isodir_device, MAX_STR_LEN / 4)) {
    23652365        if (popup_and_get_string
    2366             (_("ISO Mode - format"),
    2367              _("What is the disk format of the device? (Hit ENTER if you don't know.)"),
     2366            ("ISO Mode - format",
     2367             "What is the disk format of the device? (Hit ENTER if you don't know.)",
    23682368             isodir_format, 16)) {
    23692369            if (popup_and_get_string
    2370                 (_("ISO Mode - path"),
    2371                  _("At what path on this device can the ISO files be found?"),
     2370                ("ISO Mode - path",
     2371                 "At what path on this device can the ISO files be found?",
    23722372                 isodir_path, MAX_STR_LEN / 4)) {
    23732373                strip_spaces(isodir_device);
    … …  
    24672467
    24682468    newtPushHelpLine
    2469         (_("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!"));
    2470     newtOpenWindow(24, 3, 32, 13, _("Nuking"));
    2471     b1 = newtButton(7, 1, _("Slowly"));
    2472     b2 = newtButton(7, 5, _("Medium"));
    2473     b3 = newtButton(7, 9, _("Quickly"));
     2469        ("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!");
     2470    newtOpenWindow(24, 3, 32, 13, "Nuking");
     2471    b1 = newtButton(7, 1, "Slowly");
     2472    b2 = newtButton(7, 5, "Medium");
     2473    b3 = newtButton(7, 9, "Quickly");
    24742474    myForm = newtForm(NULL, NULL, 0);
    24752475    newtFormAddComponents(myForm, b1, b2, b3, NULL);
    … …  
    28372837    iamhere("Post-malloc");
    28382838    strcpy(help_text,
    2839            _("   Edit this RAID device's list of partitions. Choose OK or Cancel when done."));
    2840     sprintf(header_text, "%-24s    %s", _("Device"), _("Index"));
    2841     sprintf(title_of_window, _("%s contains..."), raidrec->raid_device);
     2839           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
     2840    sprintf(header_text, "%-24s    %s", "Device", "Index");
     2841    sprintf(title_of_window, "%s contains...", raidrec->raid_device);
    28422842    newtPushHelpLine(help_text);
    28432843    for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
    … …  
    28472847        redraw_disklist(disklist, keylist, partitionsListbox);
    28482848        i = 1;
    2849         bAdd = newtCompactButton(i, 9, _(" Add "));
    2850         bDelete = newtCompactButton(i += 8, 9, _("Delete"));
    2851         bOK = newtCompactButton(i += 9, 9, _("  OK  "));
    2852         bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
     2849        bAdd = newtCompactButton(i, 9, " Add ");
     2850        bDelete = newtCompactButton(i += 8, 9, "Delete");
     2851        bOK = newtCompactButton(i += 9, 9, "  OK  ");
     2852        bCancel = newtCompactButton(i += 9, 9, "Cancel");
    28532853        newtOpenWindow(21, 7, 38, 10, title_of_window);
    28542854        myForm = newtForm(NULL, NULL, 0);
    … …  
    28692869                 i++);
    28702870            if (i == disklist->entries && disklist->entries > 0) {
    2871                 log_to_screen(_("I don't know what that button does!"));
     2871                log_to_screen("I don't know what that button does!");
    28722872            } else {
    28732873                currline = i;
    28742874                if (b_res == bAdd) {
    2875                     log_it(_("Making list of unallocated RAID slices"));
     2875                    log_it("Making list of unallocated RAID slices");
    28762876                    make_list_of_unallocated_raid_partitions
    28772877                        (unallocated_raid_partitions, mountlist_dontedit,
    … …  
    28792879                    if (unallocated_raid_partitions->entries <= 0) {
    28802880                        popup_and_OK
    2881                             (_("There are no unallocated partitions marked for RAID."));
     2881                            ("There are no unallocated partitions marked for RAID.");
    28822882                    } else {
    28832883                        log_it
    2884                             (_("Done. The user may add one or more of the above to RAID device"));
     2884                            ("Done. The user may add one or more of the above to RAID device");
    28852885                        add_disklist_entry(disklist, raidrec->raid_device,
    28862886                                           unallocated_raid_partitions);
    2887                         log_it(_("I have finished adding a disklist entry."));
     2887                        log_it("I have finished adding a disklist entry.");
    28882888                        redraw_disklist(disklist, keylist,
    28892889                                        partitionsListbox);
    … …  
    28942894                    redraw_disklist(disklist, keylist, partitionsListbox);
    28952895                } else {
    2896                     sprintf(tmp, _("%s's index is %d. What should it be?"),
     2896                    sprintf(tmp, "%s's index is %d. What should it be?",
    28972897                            raidrec->raid_device,
    28982898                            disklist->el[currline].index);
    28992899                    sprintf(sz_res, "%d", disklist->el[currline].index);
    2900                     if (popup_and_get_string(_("Set index"), tmp, sz_res, 10)) {
     2900                    if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
    29012901                        disklist->el[currline].index = atoi(sz_res);
    29022902                    }
    … …  
    29552955        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
    29562956            printf
    2957                 (_("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> "));
     2957                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
    29582958            fgets(tmp, MAX_STR_LEN - 1, stdin);
    29592959        }
    … …  
    29622962
    29632963    newtPushHelpLine
    2964         (_("   Do you want to 'nuke' your system, restore interactively, or just compare?"));
    2965     newtOpenWindow(24, 3, 32, 17, _("How should I restore?"));
    2966     b1 = newtButton(7, 1, _("Automatically"));
    2967     b2 = newtButton(7, 5, _("Interactively"));
    2968     b3 = newtButton(7, 9, _("Compare only!"));
    2969     b4 = newtButton(7, 13, _("Exit to shell"));
     2964        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
     2965    newtOpenWindow(24, 3, 32, 17, "How should I restore?");
     2966    b1 = newtButton(7, 1, "Automatically");
     2967    b2 = newtButton(7, 5, "Interactively");
     2968    b3 = newtButton(7, 9, "Compare only!");
     2969    b4 = newtButton(7, 13, "Exit to shell");
    29702970    myForm = newtForm(NULL, NULL, 0);
    29712971    newtFormAddComponents(myForm, b1, b2, b3, b4, NULL);

  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-newt.h

    r501 r541  
    2525#endif /*__FreeBSD__*/
    2626
    27 #define NO_FLAWS_DETECTED _("No flaws detected in mountlist at this time. Hit 'OK' to proceed.")
     27#define NO_FLAWS_DETECTED "No flaws detected in mountlist at this time. Hit 'OK' to proceed."
    2828
    2929

  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r497 r541  
    241241
    242242        sprintf(question_ptr,
    243                 _("Should I restore the image of %s ?"), incoming_ptr);
     243                "Should I restore the image of %s ?", incoming_ptr);
    244244
    245245        if (ask_me_yes_or_no(question_ptr)) {
    … …  
    355355    while (get_cfg_file_from_archive(bkpinfo)) {
    356356        if (!ask_me_yes_or_no
    357             (_("Failed to find config file/archives. Choose another source?")))
     357            ("Failed to find config file/archives. Choose another source?"))
    358358        {
    359359            fatal_error("Could not find config file/archives. Aborting.");
    … …  
    459459
    460460    if (is_this_device_mounted(g_isodir_device)) {
    461         log_to_screen(_("WARNING - isodir is already mounted"));
     461        log_to_screen("WARNING - isodir is already mounted");
    462462        already_mounted = TRUE;
    463463    } else {
    … …  
    476476        if (run_program_and_log_output(mount_isodir_command, FALSE)) {
    477477            popup_and_OK
    478                 (_("Cannot mount the device where the ISO files are stored."));
     478                ("Cannot mount the device where the ISO files are stored.");
    479479            return (1);
    480480        }
    481481        log_to_screen
    482             (_("I have mounted the device where the ISO files are stored."));
     482            ("I have mounted the device where the ISO files are stored.");
    483483    }
    484484    if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    … …  
    491491    if (i < 0) {
    492492        popup_and_OK
    493             (_("Cannot find ISO images in the directory you specified."));
     493            ("Cannot find ISO images in the directory you specified.");
    494494        retval = 1;
    495495    }
    … …  
    617617    these_failed[0] = '\0';
    618618
    619     mvaddstr_and_log_it(g_currentY, 0, _("Mounting devices         "));
    620     open_progress_form(_("Mounting devices"),
    621                        _("I am now mounting all the drives."),
    622                        _("This should not take long."),
     619    mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
     620    open_progress_form("Mounting devices",
     621                       "I am now mounting all the drives.",
     622                       "This should not take long.",
    623623                       "", mountlist->entries);
    624624
    … …  
    628628                    "Again with the /proc - why is this in your mountlist?");
    629629        } else if (is_this_device_mounted(mountlist->el[lino].device)) {
    630             sprintf(tmp, _("%s is already mounted"),
     630            sprintf(tmp, "%s is already mounted",
    631631                    mountlist->el[lino].device);
    632632            log_to_screen(tmp);
    … …  
    657657        if (g_partition_table_locked_up > 0) {
    658658            log_to_screen
    659                 (_("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to"));
     659                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
    660660            log_to_screen
    661                 (_("lock up the partition table. You might have to reboot and use Interactive Mode to"));
     661                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
    662662            log_to_screen
    663                 (_("format and restore *without* partitioning first. Sorry for the inconvenience."));
    664         }
    665         sprintf(tmp, _("Could not mount devices %s- shall I abort?"),
     663                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
     664        }
     665        sprintf(tmp, "Could not mount devices %s- shall I abort?",
    666666                these_failed);
    667667        if (!ask_me_yes_or_no(tmp)) {
    668668            retval = 0;
    669669            log_to_screen
    670                 (_("Continuing, although some devices failed to be mounted"));
    671             mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     670                ("Continuing, although some devices failed to be mounted");
     671            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    672672        } else {
    673             mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     673            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    674674            log_to_screen
    675                 (_("Unable to mount some or all of your partitions."));
     675                ("Unable to mount some or all of your partitions.");
    676676        }
    677677    } else {
    678         log_to_screen(_("All partitions were mounted OK."));
    679         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     678        log_to_screen("All partitions were mounted OK.");
     679        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    680680    }
    681681    run_program_and_log_output("df -P -m", 3);
    … …  
    13401340    if (am_I_in_disaster_recovery_mode()
    13411341        &&
    1342         ask_me_yes_or_no(_("Do you want to retrieve the mountlist as well?")))
     1342        ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
    13431343    {
    13441344//      sprintf(command, "cp -f tmp/mountlist.txt /tmp");
    … …  
    13661366
    13671367    case 0:
    1368         log_to_screen(("Pre-processing filelist"));
     1368        log_to_screen("Pre-processing filelist");
    13691369        if (!does_file_exist(g_biggielist_txt)) {
    13701370            sprintf(command, "> %s", g_biggielist_txt);
    … …  
    13781378
    13791379    default:
    1380         open_evalcall_form(_("Pre-processing filelist"));
     1380        open_evalcall_form("Pre-processing filelist");
    13811381        while (!waitpid(pid, (int *) 0, WNOHANG)) {
    13821382            usleep(100000);
    … …  
    13911391    unlink(g_filelist_full);
    13921392    if (g_text_mode) {
    1393         printf(_("Restore which directory? --> "));
     1393        printf("Restore which directory? --> ");
    13941394        fgets(tmp, sizeof(tmp), stdin);
    13951395        toggle_path_selection(filelist, tmp, TRUE);
    … …  
    15241524    else {
    15251525        log_to_screen
    1526             (_("Unable to determine type of boot loader. Defaulting to LILO."));
     1526            ("Unable to determine type of boot loader. Defaulting to LILO.");
    15271527        res = run_lilo(offer_to_hack_scripts);
    15281528    }
    … …  
    15301530    retval += res;
    15311531    if (res) {
    1532         log_to_screen(_("Your boot loader returned an error"));
     1532        log_to_screen("Your boot loader returned an error");
    15331533    } else {
    1534         log_to_screen(_("Your boot loader ran OK"));
     1534        log_to_screen("Your boot loader ran OK");
    15351535    }
    15361536    paranoid_free(device);
    … …  
    16131613    }
    16141614    if (offer_to_run_stabgrub
    1615         && ask_me_yes_or_no(_("Did you change the mountlist?")))
     1615        && ask_me_yes_or_no("Did you change the mountlist?"))
    16161616        /* interactive mode */
    16171617    {
    16181618        mvaddstr_and_log_it(g_currentY,
    16191619                            0,
    1620                             _("Modifying fstab and grub.conf, and running GRUB...                             "));
     1620                            "Modifying fstab and grub.conf, and running GRUB...                             ");
    16211621        for (done = FALSE; !done;) {
    1622             popup_and_get_string(_("Boot device"),
    1623                                  _("Please confirm/enter the boot device. If in doubt, try /dev/hda"),
     1622            popup_and_get_string("Boot device",
     1623                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
    16241624                                 boot_device, MAX_STR_LEN / 4);
    16251625            sprintf(command, "stabgrub-me %s", boot_device);
    … …  
    16271627            if (res) {
    16281628                popup_and_OK
    1629                     (_("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done."));
     1629                    ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
    16301630                newtSuspend();
    16311631                system("chroot " MNT_RESTORING);
    16321632                newtResume();
    1633                 popup_and_OK(_("Thank you."));
     1633                popup_and_OK("Thank you.");
    16341634            } else {
    16351635                done = TRUE;
    16361636            }
    1637             popup_and_OK(_("You will now edit fstab and grub.conf"));
     1637            popup_and_OK("You will now edit fstab and grub.conf");
    16381638            if (!g_text_mode) {
    16391639                newtSuspend();
    … …  
    16521652        mvaddstr_and_log_it(g_currentY,
    16531653                            0,
    1654                             _("Running GRUB...                                                 "));
     1654                            "Running GRUB...                                                 ");
    16551655        iamhere(command);
    16561656        res = run_program_and_log_output(command, 1);
    16571657        if (res) {
    16581658            popup_and_OK
    1659                 (_("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished."));
     1659                ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
    16601660            newtSuspend();
    16611661            system("chroot " MNT_RESTORING);
    16621662            newtResume();
    1663             popup_and_OK(_("Thank you."));
     1663            popup_and_OK("Thank you.");
    16641664        }
    16651665    }
    16661666    if (res) {
    1667         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1667        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    16681668        log_to_screen
    1669             (_("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info."));
     1669            ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");
    16701670        log_msg(1, "Type:-");
    16711671        log_msg(1, "    mount-me");
    … …  
    16781678                "If you're really stuck, please e-mail the mailing list.");
    16791679    } else {
    1680         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1680        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    16811681    }
    16821682    paranoid_free(rootdev);
    … …  
    17161716    strcpy(editor, find_my_editor());
    17171717    if (offer_to_run_stabelilo
    1718         && ask_me_yes_or_no(_("Did you change the mountlist?")))
     1718        && ask_me_yes_or_no("Did you change the mountlist?"))
    17191719
    17201720        /* interactive mode */
    … …  
    17221722        mvaddstr_and_log_it(g_currentY,
    17231723                            0,
    1724                             _("Modifying fstab and elilo.conf...                             "));
     1724                            "Modifying fstab and elilo.conf...                             ");
    17251725        sprintf(command, "stabelilo-me");
    17261726        res = run_program_and_log_output(command, 3);
    17271727        if (res) {
    17281728            popup_and_OK
    1729                 (_("You will now edit fstab and elilo.conf, to make sure they match your new mountlist."));
     1729                ("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
    17301730            for (done = FALSE; !done;) {
    17311731                if (!g_text_mode) {
    … …  
    17411741                }
    17421742//              newtCls();
    1743                 if (ask_me_yes_or_no(_("Edit them again?"))) {
     1743                if (ask_me_yes_or_no("Edit them again?")) {
    17441744                    continue;
    17451745                }
    … …  
    17471747            }
    17481748        } else {
    1749             log_to_screen(_("elilo.conf and fstab were modified OK"));
     1749            log_to_screen("elilo.conf and fstab were modified OK");
    17501750        }
    17511751    } else
    … …  
    17911791    strcpy(editor, find_my_editor());
    17921792    if (offer_to_run_stablilo
    1793         && ask_me_yes_or_no(_("Did you change the mountlist?")))
     1793        && ask_me_yes_or_no("Did you change the mountlist?"))
    17941794
    17951795        /* interactive mode */
    … …  
    17971797        mvaddstr_and_log_it(g_currentY,
    17981798                            0,
    1799                             _("Modifying fstab and lilo.conf, and running LILO...                             "));
     1799                            "Modifying fstab and lilo.conf, and running LILO...                             ");
    18001800        sprintf(command, "stablilo-me");
    18011801        res = run_program_and_log_output(command, 3);
    18021802        if (res) {
    18031803            popup_and_OK
    1804                 (_("You will now edit fstab and lilo.conf, to make sure they match your new mountlist."));
     1804                ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
    18051805            for (done = FALSE; !done;) {
    18061806                if (!g_text_mode) {
    … …  
    18151815                }
    18161816//              newtCls();
    1817                 if (ask_me_yes_or_no(_("Edit them again?"))) {
     1817                if (ask_me_yes_or_no("Edit them again?")) {
    18181818                    continue;
    18191819                }
    … …  
    18291829                    done =
    18301830                        ask_me_yes_or_no
    1831                         (_("LILO failed. Re-edit system files?"));
     1831                        ("LILO failed. Re-edit system files?");
    18321832                } else {
    18331833                    done = TRUE;
    … …  
    18351835            }
    18361836        } else {
    1837             log_to_screen(_("lilo.conf and fstab were modified OK"));
     1837            log_to_screen("lilo.conf and fstab were modified OK");
    18381838        }
    18391839    } else
    … …  
    18421842        mvaddstr_and_log_it(g_currentY,
    18431843                            0,
    1844                             _("Running LILO...                                                 "));
     1844                            "Running LILO...                                                 ");
    18451845        res =
    18461846            run_program_and_log_output("chroot " MNT_RESTORING " lilo -L",
    … …  
    18521852        }
    18531853        if (res) {
    1854             mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1854            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    18551855            log_to_screen
    1856                 (_("Failed to re-jig fstab and/or lilo. Edit/run manually, please."));
     1856                ("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
    18571857        } else {
    1858             mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1858            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    18591859        }
    18601860    }
    … …  
    19041904
    19051905    if (offer_to_hack_scripts
    1906         && ask_me_yes_or_no(_("Did you change the mountlist?")))
     1906        && ask_me_yes_or_no("Did you change the mountlist?"))
    19071907        /* interactive mode */
    19081908    {
    19091909        mvaddstr_and_log_it(g_currentY, 0,
    1910                             _("Modifying fstab and restoring MBR...                           "));
     1910                            "Modifying fstab and restoring MBR...                           ");
    19111911        for (done = FALSE; !done;) {
    19121912            if (!run_program_and_log_output("which vi", FALSE)) {
    1913                 popup_and_OK(_("You will now edit fstab"));
     1913                popup_and_OK("You will now edit fstab");
    19141914                if (!g_text_mode) {
    19151915                    newtSuspend();
    … …  
    19221922//              newtCls();
    19231923            }
    1924             popup_and_get_string(_("Boot device"),
    1925                                  _("Please confirm/enter the boot device. If in doubt, try /dev/hda"),
     1924            popup_and_get_string("Boot device",
     1925                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
    19261926                                 boot_device, MAX_STR_LEN / 4);
    19271927            sprintf(command, "stabraw-me %s", boot_device);
    19281928            res = run_program_and_log_output(command, 3);
    19291929            if (res) {
    1930                 done = ask_me_yes_or_no(_("Modifications failed. Re-try?"));
     1930                done = ask_me_yes_or_no("Modifications failed. Re-try?");
    19311931            } else {
    19321932                done = TRUE;
    … …  
    19371937    {
    19381938        mvaddstr_and_log_it(g_currentY, 0,
    1939                             _("Restoring MBR...                                               "));
     1939                            "Restoring MBR...                                               ");
    19401940        res = run_program_and_log_output(command, 3);
    19411941    }
    19421942    if (res) {
    1943         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1943        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    19441944        log_to_screen
    1945             (_("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info."));
     1945            ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info.");
    19461946    } else {
    1947         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1947        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    19481948    }
    19491949    paranoid_free(command);
    … …  
    20852085{
    20862086    log_to_screen
    2087         (_("Mondorestore is terminating in response to a signal from the OS"));
     2087        ("Mondorestore is terminating in response to a signal from the OS");
    20882088    paranoid_MR_finish(254);
    20892089}
    … …  
    21072107        return;
    21082108    }
    2109     open_progress_form(_("CAUTION"),
    2110                        _("Be advised: I am about to ERASE your hard disk(s)!"),
    2111                        _("You may press Ctrl+Alt+Del to abort safely."),
     2109    open_progress_form("CAUTION",
     2110                       "Be advised: I am about to ERASE your hard disk(s)!",
     2111                       "You may press Ctrl+Alt+Del to abort safely.",
    21122112                       "", 20);
    21132113    for (i = 0; i < 20; i++) {
    21142114        g_current_progress = i;
    2115         sprintf(tmp, _("You have %d seconds left to abort."), 20 - i);
     2115        sprintf(tmp, "You have %d seconds left to abort.", 20 - i);
    21162116        update_progress_form(tmp);
    21172117        sleep(1);
    … …  
    21692169
    21702170    run_program_and_log_output("df -P -m", 3);
    2171     mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices      "));
    2172     open_progress_form(_("Unmounting devices"),
    2173                        _("Unmounting all devices that were mounted,"),
    2174                        _("in preparation for the post-restoration reboot."),
     2171    mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     2172    open_progress_form("Unmounting devices",
     2173                       "Unmounting all devices that were mounted,",
     2174                       "in preparation for the post-restoration reboot.",
    21752175                       "", mountlist->entries);
    21762176    chdir("/");
    … …  
    22052205            continue;
    22062206        }
    2207         sprintf(tmp, _("Unmounting device %s  "), mountlist->el[lino].device);
     2207        sprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
    22082208
    22092209        update_progress_form(tmp);
    … …  
    22242224            res = run_program_and_log_output(command, 3);
    22252225        } else {
    2226             strcat(tmp, _("...not mounted anyway :-) OK"));
     2226            strcat(tmp, "...not mounted anyway :-) OK");
    22272227            res = 0;
    22282228        }
    22292229        g_current_progress++;
    22302230        if (res) {
    2231             strcat(tmp, _("...Failed"));
     2231            strcat(tmp, "...Failed");
    22322232            retval++;
    22332233            log_to_screen(tmp);
    … …  
    22382238    close_progress_form();
    22392239    if (retval) {
    2240         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     2240        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    22412241    } else {
    2242         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2242        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    22432243    }
    22442244    if (retval) {
    2245         log_to_screen(_("Unable to unmount some of your partitions."));
     2245        log_to_screen("Unable to unmount some of your partitions.");
    22462246    } else {
    2247         log_to_screen(_("All partitions were unmounted OK."));
     2247        log_to_screen("All partitions were unmounted OK.");
    22482248    }
    22492249    free(mountlist);
    … …  
    23282328    malloc_string(tmp);
    23292329    log_msg(2, "gcffa --- starting");
    2330     log_to_screen(_("I'm thinking..."));
     2330    log_to_screen("I'm thinking...");
    23312331    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
    23322332    device[0] = '\0';
    … …  
    24392439
    24402440            if (!does_file_exist("tmp/mondo-restore.cfg")) {
    2441                 log_to_screen(_("Cannot find config info on tape/CD/floppy"));
     2441                log_to_screen("Cannot find config info on tape/CD/floppy");
    24422442                return (1);
    24432443            }
    … …  
    25202520        log_msg(1, "%s not found", cfg_file);
    25212521        log_to_screen
    2522             (_("Oh dear. Unable to recover configuration file from boot disk"));
     2522            ("Oh dear. Unable to recover configuration file from boot disk");
    25232523        return (1);
    25242524    }
    25252525
    2526     log_to_screen(_("Recovered mondo-restore.cfg"));
     2526    log_to_screen("Recovered mondo-restore.cfg");
    25272527    if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
    2528         log_to_screen(_("...but not mountlist.txt - a pity, really..."));
     2528        log_to_screen("...but not mountlist.txt - a pity, really...");
    25292529    }
    25302530/* start SAH */
    … …  
    25962596    while (unfinished_mdstat_devices > 0) {
    25972597        if (read_mdstat(mdstat, mdstat_file)) {
    2598             log_to_screen(_("Sorry, cannot read %s"), mdstat_file);
     2598            log_to_screen("Sorry, cannot read %s", mdstat_file);
    25992599            return;
    26002600        }
    … …  
    26022602            if (mdstat->el[i].progress < wait_for_percentage) {
    26032603                unfinished_mdstat_devices++;
    2604                 sprintf(screen_message, _("Sync'ing /dev/md%d"),
     2604                sprintf(screen_message, "Sync'ing /dev/md%d",
    26052605                        mdstat->el[i].md);
    26062606                open_evalcall_form(screen_message);

  • branches/stable/tools/deb-env

    r530 r541  
    1919dname=`dirname $0`
    2020
    21 
    2221# TBD
    2322export TOPDIR=${BASE}/debs
    2423mkdir -p ${TOPDIR}
    25 export opt=""
    26 export pkg=""
    27 export ARCH=""
    2824
    2925if [ -e /etc/debian-release ]; then
    30     export dfam="debian"
    3126    export ddir="debian"
    3227    export dver=`awk '{print $4}' /etc/debian-release`

  • branches/stable/tools/livwww

    r509 r541  
    1616TESTDIR=/mondo/www/html/test
    1717
    18 force=1
     18force=0
    1919nodoc=0
    2020
    21 if [ "$1" = "--keep" ]; then
    22         force=0
     21if [ "$1" = "-f" ]; then
     22        force=1
    2323        optsvn=""
    2424        shift
    … …  
    3535    DESTMACH=mondo.hpintelco.org
    3636else
    37     DESTMACH=www.mondorescue.org
     37    DESTMACH=www1.mondorescue.org
    3838fi
    3939

  • branches/stable/tools/mkcommon

    r530 r541  
    22#
    33# Prepare build env common for all packages build process from SVN repository
    4 # Also prepare the documentation which is common
    54#
    65# $Id$
    … …  
    98umask 022
    109
     10echo "Generating SVN log file ..."
    1111cd $TOOLHOME/..
    12 echo "Generating SVN log file ..."
    1312svn log -v > /tmp/mondorescue-svn.log
    1413
    1514if [ "$1" = "" ]; then
    16         c="mondo-doc mindi mondo"
     15    c="mindi mondo"
    1716else
    18     if [ "$1" = "all" ]; then
    19             c="mindi-kernel mondo-doc mindi mondo"
    20     else
    21         c=$1
    22     fi
     17    c=$1
    2318fi
    2419if [ "`echo $c | grep mindi-kernel`" != "" ]; then
    … …  
    3328    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    3429fi
    35 
    36 #
    37 # Should be done before mindi
    38 #
    39 if [ "`echo $c | grep mondo-doc`" != "" ]; then
    40     cd ${BASE}/svn
    41     echo "Management of mondo-doc ${MONDO_VER}-$REVISION"
    42     rm -rf mondo-doc-${MONDO_VER}
    43     svn export ${VER}/documentation mondo-doc-${MONDO_VER}
    44     svn log -v ${VER}/documentation > mondo-doc-${MONDO_VER}/svn.log
    45     echo "$REVISION" > mondo-doc-${MONDO_VER}/REVISION
    46     cd mondo-doc-${MONDO_VER}
    47     $TOOLHOME/expandver mondorescue-howto.sgml *8
    48     make -f Makefile.howto install INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/en
    49     if [ $? != 0 ]; then
    50         exit -1
    51     fi
    52     make -f Makefile.man install-mondo INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/man
    53     if [ $? != 0 ]; then
    54         exit -1
    55     fi
    56     cd ..
    57 
    58     echo "Creating mondo-doc tar files"
    59     tar cfhz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz mondo-doc-${MONDO_VER}
    60     tar cfhj ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 mondo-doc-${MONDO_VER}
    61 fi
    6230if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    6331    cd ${BASE}/svn
    … …  
    6634    svn export ${VER}/mindi mindi-${MINDI_VER}
    6735    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    68     (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
     36    cp -a ${VER}/documentation/mindi.8 mindi-${MINDI_VER}
     37    rm -rf documentation-${MONDO_VER}
     38    svn export ${VER}/documentation documentation-${MONDO_VER}
     39    cd documentation-${MONDO_VER}
     40    $TOOLHOME/expandver mindi*8
     41    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
     42    cd ..
    6943    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    7044    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    … …  
    7549    rm -f ${TMP}/mindi-*-root
    7650fi
    77 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     51if [ "`echo $c | grep mondo`" != "" ]; then
    7852    cd ${BASE}/svn
    7953    echo "Management of mondo ${MONDO_VER}-$REVISION"
    … …  
    8256    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    8357    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    84     (cd mondo-doc-${MONDO_VER} ; make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en ; make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man)
    85     (cd mondo-${MONDO_VER} ; echo "Bootstraping mondo ... " ; ./bootstrap)
     58    rm -rf documentation-${MONDO_VER}
     59    svn export ${VER}/documentation documentation-${MONDO_VER}
     60    cd documentation-${MONDO_VER}
     61    $TOOLHOME/expandver mondorescue-howto.sgml mondo*8
     62    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en
     63    if [ $? != 0 ]; then
     64        exit -1
     65    fi
     66    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
     67    if [ $? != 0 ]; then
     68        exit -1
     69    fi
     70    cd ../mondo-${MONDO_VER}
     71    echo "Bootstraping mondo ... "
     72    ./bootstrap
     73    cd ..
    8674
    8775    echo "Creating mondo tar files"

  • branches/stable/tools/mkdeb

    r530 r541  
    2828    cd ${BASE}/svn
    2929    mkdir -p ${TOPDIR}/SOURCES
    30     $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    31     chmod 644 ${TOPDIR}/SPECS/mindi-kernel.spec
    32     pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    33     pkg="$pkg $pkg1"
    34     rm -f $pkg1
     30    sed "s/^%define mrel..*RRR/%define mrel ${REVISION}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     31    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    3532fi
    3633if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3734    cd ${BASE}/svn
    38     $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    39     cat mindi-${MINDI_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mindi.spec
    40     chmod 644 ${TOPDIR}/SPECS/mindi.spec
     35    if [ -f mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec ]; then
     36        specfile=mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec
     37    else
     38        specfile=mindi-${MINDI_VER}/distributions/common/mindi.spec
     39    fi
     40    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MINDI_VER}/" $specfile > ${TOPDIR}/SPECS/mindi.spec
    4141    rm -rf mindi-${MINDI_VER}/distributions
    4242    mkdir -p ${TOPDIR}/SOURCES
    4343
    44     pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    45     pkg="$pkg $pkg1"
    46     rm -f $pkg1
     44    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     45    # ATTENTION: This could be dangerous for your setup
     46    opt="rm -rf /usr/lib/mindi ;"
    4747fi
    4848if [ "`echo $c | grep  mondo`" != "" ]; then
    4949    cd ${BASE}/svn
    50     $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    51     cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
    52     chmod 644 ${TOPDIR}/SPECS/mondo.spec
     50    if [ -f mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec ]; then
     51        specfile=mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec
     52    else
     53        specfile=mondo-${MONDO_VER}/distributions/common/mondo.spec
     54    fi
     55    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MONDO_VER}/" $specfile > ${TOPDIR}/SPECS/mondo.spec
    5356    rm -rf mondo-${MONDO_VER}/distributions
    5457
    55     pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
    56     pkg="$pkg $pkg1"
    57     rm -f $pkg1
     58    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
    5859fi
    5960
    6061cd ${TOPDIR}/SPECS
    6162status=0
    62 for p in "$c"; do
    63     echo "Generating $p deb"
    64     log=/tmp/$p-deb.log
    65     #rpmbuild -ba $p.spec 2> $log 1> $log
     63if [ "`echo $c | grep kernel`" != "" ]; then
     64    echo "Generating mindi-kernel RPMS"
     65    log=/tmp/mindi-kernel-rpm.log
     66    rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
     67    if [ $? != 0 ]; then
     68        cat $log
     69        status=-1
     70    fi
     71fi
     72if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     73    echo "Generating mindi RPMS"
     74    log=/tmp/mindi-rpm.log
     75    rpmbuild -ba mindi.spec 2> $log 1> $log
     76    if [ $? != 0 ]; then
     77        cat $log
     78        status=-1
     79    fi
     80fi
     81if [ "`echo $c | grep mondo`" != "" ]; then
     82    echo "Generating mondo RPMS"
     83    log=/tmp/mondo-rpm.log
     84    rpmbuild -ba mondo.spec 2> $log 1> $log
    6685    if [ $? != 0 ]; then
    6786        cat $log
    … …  
    7089fi
    7190if [ $status = 0 ]; then
    72     echo "Installing deb as root ($pkg)"
     91    echo "Installing RPMS as root ($pkg)"
    7392    su - -c "$opt rpm -Uvh --force $pkg"
    7493fi

  • branches/stable/tools/mkdeliv

    r530 r541  
    88# BerliOS FTP/SSH setup
    99ACCOUNT=bruno@ftp.mondorescue.org
    10 DSTDIR=/mondo/ftp
     10DSTDIR=/
    1111FTPSERV="ftp.berlios.de"
    1212FTPDIR="/incoming"
    … …  
    2828
    2929if [ "$1" = "" ]; then
    30         c="mondo-doc mindi mondo"
     30    c="mindi mondo"
    3131else
    3232    c=$1
    … …  
    3939    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
    4040fi
    41 if [ "`echo $c | grep mondo-doc`" != "" ]; then
    42     cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz
    43     cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2
    44     tgz="$tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2"
    45     rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
    46     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
    47 fi
    48 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     41if [ "`echo $c | grep  mondo`" != "" ]; then
    4942    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
    5043    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2

  • branches/stable/tools/mkrpm

    r532 r541  
    1818
    1919if [ "$1" = "" ]; then
    20     c="mondo-doc mindi mondo"
     20    c="mindi mondo"
    2121else
    22     if [ "$1" = "all" ]; then
    23         c="mindi-kernel mondo-doc mindi mondo"
    24     else
    25         c=$1
    26     fi
     22    c=$1
    2723fi
    2824
    … …  
    5248    opt="rm -rf /usr/lib/mindi ;"
    5349fi
    54 if [ "`echo $c | grep mondo-doc`" != "" ]; then
    55     cd ${BASE}/svn
    56     $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo-doc.spec > ${TOPDIR}/SPECS/mondo-doc.spec
    57     cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo-doc.spec
    58     chmod 644 ${TOPDIR}/SPECS/mondo-doc.spec
    59 
    60     pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
    61     pkg="$pkg $pkg1"
    62     rm -f $pkg1
    63 fi
    64 
    65 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     50if [ "`echo $c | grep  mondo`" != "" ]; then
    6651    cd ${BASE}/svn
    6752    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    … …  
    7762cd ${TOPDIR}/SPECS
    7863status=0
    79 
    80 for p in $c; do
    81     echo "Generating $p RPMS"
    82     log=/tmp/$p-rpm.log
    83     rpmbuild -ba $p.spec 2> $log 1> $log
     64if [ "`echo $c | grep kernel`" != "" ]; then
     65    echo "Generating mindi-kernel RPMS"
     66    log=/tmp/mindi-kernel-rpm.log
     67    rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
    8468    if [ $? != 0 ]; then
    8569        cat $log
    8670        status=-1
    8771    fi
    88 done
     72fi
     73if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     74    echo "Generating mindi RPMS"
     75    log=/tmp/mindi-rpm.log
     76    rpmbuild -ba mindi.spec 2> $log 1> $log
     77    if [ $? != 0 ]; then
     78        cat $log
     79        status=-1
     80    fi
     81fi
     82if [ "`echo $c | grep mondo`" != "" ]; then
     83    echo "Generating mondo RPMS"
     84    log=/tmp/mondo-rpm.log
     85    rpmbuild -ba mondo.spec 2> $log 1> $log
     86    if [ $? != 0 ]; then
     87        cat $log
     88        status=-1
     89    fi
     90fi
    8991if [ $status = 0 ]; then
    9092    echo "Installing RPMS as root ($pkg)"

  • branches/stable/tools/mkspec

    r460 r541  
    1212if [ -f ${dir}/../$ddir/spec.m4 ]; then
    1313    inc=${dir}/../$ddir/spec.m4
    14 elif [ -f ${dir}/../$dfam/spec.m4 ]; then
    15     inc=${dir}/../$dfam/spec.m4
     14elif [ -f ${dir}/../$ddmir/spec.m4 ]; then
     15    inc=${dir}/../$ddmir/spec.m4
    1616else
    1717    echo "Unable to build RPM for this distro. Please report to authors"
    … …  
    2525cat >> /tmp/mondorescue.mc << EOF
    2626define(\`RRR', ${REVISION}${suf})dnl
    27 define(\`EEE', ${REVISION})dnl
    2827define(\`VVV', ${1})dnl
    2928EOF

  • branches/stable/tools/rpm-env

    r530 r541  
    99prem=`echo $dname |cut -c1`
    1010if [ ${prem} == "/" ]; then
    11     export TOOLHOME=$dname
     11        export TOOLHOME=$dname
    1212else
    1313    export TOOLHOME=${PWD}/$dname
    … …  
    5656        export ddir="redhat"
    5757        dver=`awk '{print $5}' /etc/redhat-release`
     58        export suf=".rh${dver}"
    5859        export dver=`echo ${dver} | sed "s/\.//"`
    59         export suf=".rh${dver}"
    6060    fi
    6161elif [ -e /etc/SuSE-release ]; then

  • branches/stable/website/about.shtml

    r447 r541  
    9090      <P ALIGN=CENTER>
    9191       <I>Michael Clark</I><BR>
    92        original PDF docs</P>
     92       original DPF docs</P>
    9393  <div class="h2-5">
    9494          <h2>The Mondo Rescue Community</h2>

  • branches/stable/website/downloads.shtml

    r466 r541  
    6363<p>Most of the time, you'll be able to download directly the packages suited for your distribution. Currently we provide packages for :
    6464<ul>
    65         <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a> and <a href="ftp://ftp.mondorescue.org/redhat/9">9</a>.</li>
    66         <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a> and <a href="ftp://ftp.mondorescue.org/fedora/5">Core 5</a>.</li>
     65        <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a>.</li>
     66        <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a>.</li>
    6767        <li>RedHat Enterprise Linux <!--<a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, --><a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>.</li>
    6868        <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/9.3">9.3</a>, <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details.
    … …  
    7676<h3>Mondo Rescue CD</h3>
    7777
    78 <p>In order to make it as easy as possible for you to use Mondo Rescue, you may want to download the latest <a href="ftp://ftp.mondorescue.org/iso/mondorescue.iso">Mondo Rescue CD</a> which contains all the packages with its dependancies available on the ftp site. It is updated daily (Currently un-available for bandwidth issues)
     78<p>In order to make it as easy as possible for you to use Mondo Rescue, you may want to download the latest <a href="ftp://ftp.mondorescue.org/iso/mondorescue.iso">Mondo Rescue CD</a> which contains all the packages with its dependancies available on the ftp site. It is updated daily.
     79
    7980<!--
    8081    <div class="h2-5">

  • branches/stable/website/latest-news.html

    r472 r541  
    1 <p><B>2006-04-08 </B>Mondo 2.0.7 / Mindi 1.0.7 updated to r460</p>
    2 <p>
    3 I'm happy to announce the availability of a newest version of
    4 mondo 2.0.7 / mindi 1.0.7 aka r460
    5 </p>
    6 
    7 <p>
    8 Now available at ftp://ftp.mondorescue.org/
    9 </p>
    10 
    11 <p>
    12 fedora/4/mindi-1.0.7-460.fc4.i386.rpm
    13 fedora/4/mondo-2.0.7-460.fc4.i386.rpm
    14 fedora/5/mindi-1.0.7-460.fc5.i386.rpm
    15 fedora/5/mondo-2.0.7-460.fc5.i386.rpm
    16 mandrake/10.1/mindi-1.0.7-460.101mdk.i386.rpm
    17 mandrake/10.1/mondo-2.0.7-460.101mdk.i386.rpm
    18 mandrake/10.2/mindi-1.0.7-460.102mdk.i386.rpm
    19 mandrake/10.2/mondo-2.0.7-460.102mdk.i386.rpm
    20 mandriva/2006.0/mindi-1.0.7-460.20060mdk.i586.rpm
    21 mandriva/2006.0/mondo-2.0.7-460.20060mdk.i586.rpm
    22 redhat/73/mindi-1.0.7-460.rh73.i386.rpm
    23 redhat/73/mondo-2.0.7-460.rh73.i386.rpm
    24 redhat/9/mindi-1.0.7-460.rh9.i386.rpm
    25 redhat/9/mondo-2.0.7-460.rh9.i386.rpm
    26 rhel/3/mindi-1.0.7-460.rhel3.i386.rpm
    27 rhel/3/mondo-2.0.7-460.rhel3.i386.rpm
    28 rhel/4/mindi-1.0.7-460.rhel4.i386.rpm
    29 rhel/4/mondo-2.0.7-460.rhel4.i386.rpm
    30 sles/9/mindi-1.0.7-460.sles9.i386.rpm
    31 sles/9/mondo-2.0.7-460.sles9.i386.rpm
    32 suse/10.0/mindi-1.0.7-464.suse10.0.i386.rpm
    33 suse/10.0/mondo-2.0.7-464.suse10.0.i386.rpm
    34 </p>
    35 
    36 
    37 <p>
    38 Changes are few:
    39 </p>
    40 
    41 <p>
    42 MONDO:
    43 </p>
    44 
    45 <p>
    46 Remove speed=1 for growisofs (better version expected for 2.0.8)
    47 Usage of Epoch for RPMs to ease update
    48 </p>
    49 
    50 <p>
    51 MINDI:
    52 </p>
    53 
    54 <p>
    55 analyze-my-lvm is under $MINDI_SBIN (not _LIB)
    56 Usage of Epoch for RPMs to ease update
    57 </p>
    58 
    59 <p><B>2006-03-20 </B>Mondo 2.0.7 / Mindi 1.0.7 are out</p>
    60 <p>
    61 I'm happy to announce the availability of the latest and greatest
    62 version of mondo 2.0.7 / mindi 1.0.7. Version numbers have changed of
    63 format to be more in line with what is done generally (x.y.z)
    64 </p>
    65 <p>
    66 Now available at ftp://ftp.mondorescue.org :
    67 </p>
    68 
    69 <p>
    70 mandrake/10.1/mindi-1.0.7-447.101mdk.i386.rpm<br>
    71 mandrake/10.1/mondo-2.0.7-447.101mdk.i386.rpm<br>
    72 mandrake/10.2/mindi-1.0.7-447.102mdk.i386.rpm<br>
    73 mandrake/10.2/mondo-2.0.7-447.102mdk.i386.rpm<br>
    74 mandriva/2006.0/mindi-1.0.7-447.20060mdk.i386.rpm<br>
    75 mandriva/2006.0/mondo-2.0.7-447.20060mdk.i386.rpm<br>
    76 src/mindi-1.0.7-r447.tgz<br>
    77 src/mondo-2.0.7-r447.tgz<br>
    78 </p>
    79 
    80 <p>
    81 Other distributions will follow asap (should be able to produce soon
    82 redhat 7.3, fedora core 4, and only after rhel3/4 and sles9) due to the
    83 change in the virtual machines I have to do (now using qemu + more tools
    84 to generate RPMs)
    85 </p>
    86 
    87 <p>
    88 The focus on this version has been more around the new website and
    89 documentation, and a bit less on code. So some persistant bugs are still
    90 not corrected (some dvd burning issues and dm/lvm2 support mainly) and
    91 will be hopefully in 2.0.8.
    92 </p>
    93 
    94 <p>
    95 MONDO CHANGES
    96 </p>
    97 
    98 <p>
    99 v2.07 (2006-02-23)<br>
    100 - useless cat, sort|uniq commands removed (Bruno Cornec/Sébastien Aperghis-Tramoni)<br>
    101 - Doc cleanup (Andree Leidenfrost)<br>
    102 - Add the actual format to messages after calls to function is_this_a_valid_disk_format() about unsupported formats.  (Andree Leidenfrost)<br>
    103 - Abort|Warn when one of the include|exclude dirs (-I|-E) does not exist (Bruno Cornec/Jeffs)<br>
    104 - Replaced partimagehack with ntfsclone from ntfsprogs package. (Andree Leidenfrost)<br>
    105 - use df -P everywhere (Bruno Cornec)<br>
    106 - Paypal incitations removed (Andree Leidenfrost)<br>
    107 - mondo now uses /usr/share for the restore-scripts (Bruno Cornec)<br>
    108 - rpmlint cleanups (Bruno Cornec)<br>
    109 - no shared librairies and no X11 anymore (were useless) (Bruno Cornec)<br>
    110 - files > 2GB are now really supported (Andree Leidenfrost)<br>
    111 - new SGML based Mondo Rescue documentation + new Web site (Bruno Cornec/Andree Leidenfrost)<br>
    112 - mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also Debian bug #352323.) (Andree Leidenfrost)<br>
    113 - /tmp not excluded anymore from backup (Bruno Cornec)<br>
    114 - New RPM Build environement (Bruno Cornec)<br>
    115 </p>
    116 
    117 <p>
    118 MINDI CHANGES
    119 </p>
    120 
    121 <p>
    122 1.07 (2006-02-23)<br>
    123 - stop creating further size of floppy disks if the smaller one succeeds (Bruno Cornec)<br>
    124 - init revamped (removed unnecessary second general module loading phase, start NFS appropriately depending on PXE or simple NFS) (Andree Leidenfrost)<br>
    125   - Changed module 'nfsacl' to 'nfs_acl' (Andree Leidenfrost)<br>
    126   - Mindi/DiskSize is gone (Bruno Cornec)<br>
    127 - useless cat, sort|uniq commands removed (Bruno Cornec/Sébastien Aperghis-Tramoni)<br>
    128 - Doc cleanup (Andree Leidenfrost)<br>
    129 - Bug fix for chown in install.sh (JeffS)<br>
    130 - CHANGES renamed also in install.sh now (Bruno Cornec)<br>
    131 - rpmlint cleanups<br>
    132 - Get mindi to look for analyze-my-lvm in it's library directory MINDI_LIB (See also Debian bug #351446.)<br>
    133 - mindi only deletes freshly created 1440kb images in case of error (See also Debian Bug #348966.) (Andree Leidenfrost)<br>
    134 - try standard grub-install in grub-MR restore script before trying anything fancy (Andree Leidenfrost)<br>
    135 - busybox mount should be called with -o ro for PXE (Make RHEL 3 works in PXE with a 2.6 failsafe kernel now available) (Bruno Cornec)<br>
    136 - Fix mindi for 2.6 Failsafe support (Bruno Cornec)<br>
    137 - mindi now depends on grep >= 2.5 (for -m option) (Marco Puggelli/Bruno Cornec)<br>
    138 - Fix a bug in LVM context for RHEL4 in GetValueFromField (Rémi Bondoin/Bruno Cornec)<br>
    139 - New RPM Build environement (Bruno Cornec)<br>
    140 - mindi now supports x86_64 natively (Bruno Cornec)<br>
    141 - stop creating further size of floppy disks if the smaller one succeeds (Bruno Cornec)<br>
    142 </p>
    143 
    1441<p><B>2006-02-21 </B>Mondo Rescue has a new Web site</p>
    1452<p>Thanks to <a href="http://www.73lab.com">Ayo</a>'s authorization, and after 2 weeks of hard work, we are proud to announce that we now have a new and updated Web site. We hope it will be useful and wait for your feedback.</p>
    … …  
    1485<p>Mondorescue has been officially referenced by the HP OpenSource Portal:
    1496<a href="http://opensource.hp.com/index.php">http://opensource.hp.com/index.php</a> (look in the "Recently released" area)</p>
     7<p><B>2006-02-02 </B>Mondo Rescue rsync server available</p>
     8<p>In our always increasing set of services :-) I'd like to announce the
     9availability of an rsync mirror service for mondo-rescue.
    15010
     11Try rsync rsync.mondorescue.org::</p>
     12<p><B>2006-02-01 </B>Mondo Rescue ftp server available</p>
     13<p>Things are progressing. I've gathered all the packages that were originally on <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> and also added Mike's SuSE RPMs
     14+ all the latest packages I've produced and put them on a new ftp server
     15accessible at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a>
     16</p><p>
     17You may have issues to access to it yet, as I've done a DNS refresh this
     18night and propagation could not be made everywhere now.
     19
     20FYI:
     21
     22</p><p>
     23$ host ftp.mondorescue.org<br>
     24ftp.mondorescue.org has address 213.30.161.23
     25</p><p>
     26
     27The tree is:
     28</p><p>
     29level one distribution<br>
     30level two version number<br>
     31level three the packages
     32
     33</p><p>
     34Feel free to send me (by private mail) packages that you have and that
     35are not in the repository, so that I can add them.
     36
     37</p><p>
     38Thanks to HP and especially the HP/Intel Solution Center to help me
     39hosting the project.
     40
     41Next step will be the Web site.</p>

  • branches/stable/website/mondorescue.org.conf

    r447 r541  
    22# Apache Virtual Host Configuration File
    33#
    4 NameVirtualHost *
     4NameVirtualHost *:80
    55
    6 <VirtualHost *>
     6<VirtualHost *:80>
    77    ServerName www.mondorescue.org
    8     #ServerAlias mondorescue.org
    98    ServerAdmin webmaster@mondorescue.org
    109    DocumentRoot /mondo/www/html/mondo
    1110    CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
    1211    Errorlog /var/log/httpd/www.mondorescue.org/error_log
    13     RewriteEngine On
    14     RewriteRule     ^/index\.html$  /index.shtml
    15     RewriteRule     ^/$  /index.shtml
    1612    <Directory "/mondo/www/html/mondo">
    17     DirectoryIndex index.shtml
    1813        Options -Indexes MultiViews FollowSymLinks +Includes
    1914        AllowOverride None
    … …  
    2318</VirtualHost>
    2419
    25 <VirtualHost *>
    26     ServerName oldwww.mondorescue.org
    27     ServerAdmin webmaster@mondorescue.org
    28     DocumentRoot /mondo/www/html/oldwww
    29     CustomLog /var/log/httpd/oldwww.mondorescue.org/access_log combined
    30     Errorlog /var/log/httpd/oldwww.mondorescue.org/error_log
    31     <Directory "/mondo/www/html/oldwww">
    32         Options -Indexes MultiViews FollowSymLinks +Includes
    33         AllowOverride None
    34         Order allow,deny
    35         Allow from all
    36     </Directory>
    37 </VirtualHost>
    38 
    39 <VirtualHost *>
     20<VirtualHost *:80>
    4021    ServerName www1.mondorescue.org
    4122    ServerAdmin webmaster@mondorescue.org
    … …  
    5031    </Directory>
    5132</VirtualHost>
    52 
    53 <VirtualHost *>
    54     ServerName www.mondorescue.com
    55     ServerAdmin webmaster@mondorescue.com
    56     DocumentRoot /mondo/www/html/mondo
    57     CustomLog /var/log/httpd/www.mondorescue.com/access_log combined
    58     Errorlog /var/log/httpd/www.mondorescue.com/error_log
    59     <Directory "/mondo/www/html/mondo">
    60     DirectoryIndex index.shtml
    61         Options -Indexes MultiViews FollowSymLinks +Includes
    62         AllowOverride None
    63         Order allow,deny
    64         Allow from all
    65     </Directory>
    66 </VirtualHost>

  • branches/stable/website/news.shtml

    r469 r541  
    1414  </div>
    1515  <!--#include virtual="/latest-news.html" -->
    16 <p><B>2006-02-02 </B>Mondo Rescue rsync server available</p>
    17 <p>In our always increasing set of services :-) I'd like to announce the
    18 availability of an rsync mirror service for mondo-rescue.
    19 
    20 Try rsync rsync.mondorescue.org::</p>
    21 
    22 <p><B>2006-02-01 </B>Mondo Rescue ftp server available</p>
    23 <p>Things are progressing. I've gathered all the packages that were originally on <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> and also added Mike's SuSE RPMs
    24 + all the latest packages I've produced and put them on a new ftp server
    25 accessible at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a>
    26 </p><p>
    27 You may have issues to access to it yet, as I've done a DNS refresh this
    28 night and propagation could not be made everywhere now.
    29 
    30 FYI:
    31 
    32 </p><p>
    33 $ host ftp.mondorescue.org<br>
    34 ftp.mondorescue.org has address 213.30.161.23
    35 </p><p>
    36 
    37 The tree is:
    38 </p><p>
    39 level one distribution<br>
    40 level two version number<br>
    41 level three the packages
    42 
    43 </p><p>
    44 Feel free to send me (by private mail) packages that you have and that
    45 are not in the repository, so that I can add them.
    46 
    47 </p><p>
    48 Thanks to HP and especially the HP/Intel Solution Center to help me
    49 hosting the project.
    50 
    51 Next step will be the Web site.</p>
    52 
    53   <div class="h2-2">
    54     <h2>Older News</h2>
    55   </div>
    56 
    5716<p><B>2005-12-24</B>
    5817I think that it's time to promote our revisions to a newer version, as a
    … …  
    162121</p>
    163122
     123  <div class="h2-2">
     124    <h2>Older News</h2>
     125  </div>
     126
    164127<p><B>2005-11-22</B>
    165128
Note: See TracChangeset for help on using the changeset viewer.