Changeset 1713 for branches/2.2.5


Ignore:
Timestamp:
Oct 27, 2007, 8:31:17 PM (12 years ago)
Author:
bruno
Message:
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
Location:
branches/2.2.5
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1698 r1713  
    516516    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
    517517    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
     518    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
     519    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
    518520    if [ ! -e "$KEYDIR" ] ; then
    519521        LogIt "Keyboard mapping directory not found. I shall use default map at boot-time."
     
    537539        mkdir -p $bigdir/etc/console
    538540        cp /etc/console/boottime.kmap.gz $bigdir/etc/console 2>> $LOGFILE
     541        echo -e "$DONE"
     542        return 0
     543    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
     544        echo "Ubuntu-style config detected." >> $LOGFILE
     545        echo -en "Adding the following keyboard mapping tables: "
     546        mkdir -p $bigdir/tmp
     547        echo "/etc/console-setup/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
     548        KBDEPTH=0
     549        mkdir -p $bigdir/etc/console-setup
     550        cp /etc/console-setup/boottime.kmap.gz $bigdir/etc/console-setup 2>> $LOGFILE
    539551        echo -e "$DONE"
    540552        return 0
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1710 r1713  
    18951895    log_msg(1, message_to_screen);
    18961896
    1897     asprintf(&tmp1, "umount %s1", bkpinfo->media_device);
     1897    asprintf(&tmp1, "%s1", bkpinfo->media_device);
    18981898    if (is_this_device_mounted(tmp1)) {
    18991899        log_msg(1, "USB device mounted. Remounting it at the right place");
  • branches/2.2.5/mondo/src/common/libmondo-verify.h

    r1647 r1713  
    6363
    6464int verify_cd_image();
     65int verify_usb_image();
    6566int verify_a_tarball(char *);
    6667int verify_an_afioball_from_CD(char *);
  • branches/2.2.5/mondo/src/common/newt-specific.c

    r1708 r1713  
    131131    extern char *g_tmpfs_mountpt;
    132132    extern char *g_boot_mountpt;
    133     extern char *g_mondo_home;
    134133    extern char *ps_options;
    135134    extern char *ps_proc_id;
     
    474473        chdir("/");
    475474        run_program_and_log_output("umount " MNT_CDROM, FALSE);
    476         run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*",
    477                                    FALSE);
    478475        if (g_selfmounted_isodir) {
    479476            asprintf(&command, "umount %s", g_selfmounted_isodir);
  • branches/2.2.5/mondo/src/mondoarchive/main.c

    r1708 r1713  
    131131extern char *g_boot_mountpt;
    132132extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
    133 extern char *g_mondo_home;
    134133extern char *g_tmpfs_mountpt;
    135134extern char *g_cdrw_drive_is_here;
  • branches/2.2.5/pbconf/mondo/pbinit

    r1620 r1713  
    55
    66# Export documentation to generate what is needed
    7 use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p);
     7use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p pb_filter_file);
     8use File::Basename;
     9
    810
    911system("./bootstrap");
     12pb_mkdir_p("docs/entmp");
     13pb_mkdir_p("docs/mantmp");
    1014pb_mkdir_p("docs/en");
    1115pb_mkdir_p("docs/man");
     16my $pbpkg = "PBPKG";
     17my $pbver = "PBVER";
     18my $pbtag = "PBTAG";
     19my $pbrev = "PBREV";
    1220
    1321my $cms = pb_cms_init($ENV{'PBPROJ'},undef);
    1422
    15 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/man");
    16 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/man");
     23pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/mantmp");
     24pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/mantmp");
    1725pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/images","docs/en/images");
    1826pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/fdl.sgml","docs/en");
    19 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/en");
     27pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/entmp");
    2028pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.dsl","docs/en");
    2129pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/Makefile.howto","docs/en");
    2230# should call filter_file here
    23 system("cd docs/en ; ls -lR > /tmp/1 ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");
     31
     32my $ptr = pb_get_filters($pbpkg);
     33foreach my $f (<docs/mantmp/*>) {
     34    pb_filter_file("$f",$ptr,"docs/man/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
     35}
     36foreach my $f (<docs/entmp/*>) {
     37    pb_filter_file("$f",$ptr,"docs/en/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
     38}
     39pb_rm_rf("docs/entmp");
     40pb_rm_rf("docs/mantmp");
     41
     42system("cd docs/en ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");
Note: See TracChangeset for help on using the changeset viewer.