Changeset 1713 in MondoRescue for branches/2.2.5

Timestamp:

Oct 27, 2007, 8:31:17 PM (16 years ago)

Author:

Bruno Cornec

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:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-verify.h (modified) (1 diff)
• mondo/src/common/newt-specific.c (modified) (2 diffs)
• mondo/src/mondoarchive/main.c (modified) (1 diff)
• pbconf/mondo/pbinit (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -516 +516 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
     if [ ! -e "$KEYDIR" ] ; then
         LogIt "Keyboard mapping directory not found. I shall use default map at boot-time."
@@ -537 +539 @@
         mkdir -p $bigdir/etc/console
         cp /etc/console/boottime.kmap.gz $bigdir/etc/console 2>> $LOGFILE
+        echo -e "$DONE"
+        return 0
+    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
+        echo "Ubuntu-style config detected." >> $LOGFILE
+        echo -en "Adding the following keyboard mapping tables: "
+        mkdir -p $bigdir/tmp
+        echo "/etc/console-setup/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
+        KBDEPTH=0
+        mkdir -p $bigdir/etc/console-setup
+        cp /etc/console-setup/boottime.kmap.gz $bigdir/etc/console-setup 2>> $LOGFILE
         echo -e "$DONE"
         return 0

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -1895 +1895 @@
     log_msg(1, message_to_screen);
 
-    asprintf(&tmp1, "umount %s1", bkpinfo->media_device);
+    asprintf(&tmp1, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");

branches/2.2.5/mondo/src/common/libmondo-verify.h

@@ -63 +63 @@
 
 int verify_cd_image();
+int verify_usb_image();
 int verify_a_tarball(char *);
 int verify_an_afioball_from_CD(char *);

branches/2.2.5/mondo/src/common/newt-specific.c

@@ -131 +131 @@
     extern char *g_tmpfs_mountpt;
     extern char *g_boot_mountpt;
-    extern char *g_mondo_home;
     extern char *ps_options;
     extern char *ps_proc_id;
@@ -474 +473 @@
         chdir("/");
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
-        run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*",
-                                   FALSE);
         if (g_selfmounted_isodir) {
             asprintf(&command, "umount %s", g_selfmounted_isodir);

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -131 +131 @@
 extern char *g_boot_mountpt;
 extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
-extern char *g_mondo_home;
 extern char *g_tmpfs_mountpt;
 extern char *g_cdrw_drive_is_here;

branches/2.2.5/pbconf/mondo/pbinit

@@ -5 +5 @@
 
 # Export documentation to generate what is needed
-use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p);
+use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p pb_filter_file);
+use File::Basename;
+
 
 system("./bootstrap");
+pb_mkdir_p("docs/entmp");
+pb_mkdir_p("docs/mantmp");
 pb_mkdir_p("docs/en");
 pb_mkdir_p("docs/man");
+my $pbpkg = "PBPKG";
+my $pbver = "PBVER";
+my $pbtag = "PBTAG";
+my $pbrev = "PBREV";
 
 my $cms = pb_cms_init($ENV{'PBPROJ'},undef);
 
-pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/man");
-pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/man");
+pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/mantmp");
+pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/mantmp");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/images","docs/en/images");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/fdl.sgml","docs/en");
-pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/en");
+pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/entmp");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.dsl","docs/en");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/Makefile.howto","docs/en");
 # should call filter_file here
-system("cd docs/en ; ls -lR > /tmp/1 ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");
+
+my $ptr = pb_get_filters($pbpkg);
+foreach my $f (<docs/mantmp/*>) {
+    pb_filter_file("$f",$ptr,"docs/man/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
+}
+foreach my $f (<docs/entmp/*>) {
+    pb_filter_file("$f",$ptr,"docs/en/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
+}
+pb_rm_rf("docs/entmp");
+pb_rm_rf("docs/mantmp");
+
+system("cd docs/en ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");