Mergemaster Fails

Thomas D. Dean tomdean at speakeasy.org
Wed Jun 6 23:51:29 UTC 2012


Mergemaster fails in a up-to-date as of now build.

 >  uname -a
FreeBSD P9X79.tddhome 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed Jun  6
16:16:58 PDT 2012     root at P9X79.tddhome:/usr/obj/usr/src/sys/GENERIC
amd64

# mergemaster
...
[END]

And no response to the keyboard, except <ctrl-Z.
^Z

# ps
...
1363  4  Is   0:00.01 su
1364  4  S    0:00.01 _su (csh)
1368  4  T    0:00.06 /bin/sh /usr/sbin/mergemaster
2434  4  T    0:00.01 less
2439  4  R+   0:00.00 ps

How do I get around this?

Tom Dean

 From script /tmp/mergemaster
# mergemaster

Script started on Wed Jun  6 16:48:05 2012

You have mail.
root at P9X79:/usr/src # mergemaster^M

*** The directory specified for the temporary root environment,
     /var/tmp/temproot, exists.  This can be a security risk if untrusted
     users have access to the system.

   Use 'd' to delete the old /var/tmp/temproot and continue
   Use 't' to select a new temporary root directory
   Use 'e' to exit mergemaster

   Default is to use /var/tmp/temproot as is

How should I deal with this? [Use the existing /var/tmp/temproot] d

    *** Deleting the old /var/tmp/temproot

*** Creating the temporary root environment in /var/tmp/temproot
  *** /var/tmp/temproot ready for use
  *** Creating and populating directory structure in /var/tmp/temproot

+ ln -s ../var/named/etc/namedb /var/tmp/temproot/etc/namedb
+ ln -s mail/aliases /var/tmp/temproot/etc/aliases


*** Beginning comparison

    *** Checking /etc/rc.d for stale files

    *** No stale files found

  *** Temp ./.cshrc and installed have the same CVS Id, deleting
  *** Temp ./.profile and installed have the same CVS Id, deleting
  *** Temp ./COPYRIGHT and installed have the same CVS Id, deleting
  *** Temp ./boot/device.hints and installed have the same CVS Id, deleting
  *** Temp ./etc/amd.map and installed have the same CVS Id, deleting
  *** Temp ./etc/apmd.conf and installed have the same CVS Id, deleting
  *** Temp ./etc/auth.conf and installed have the same CVS Id, deleting
  *** Temp ./etc/bluetooth/hcsecd.conf and installed have the same CVS 
Id, deleting
  *** Temp ./etc/bluetooth/hosts and installed have the same CVS Id, 
deleting
  *** Temp ./etc/bluetooth/protocols and installed have the same CVS Id, 
deleting
  *** Temp ./etc/crontab and installed have the same CVS Id, deleting
  *** Temp ./etc/csh.cshrc and installed have the same CVS Id, deleting
  *** Temp ./etc/csh.login and installed have the same CVS Id, deleting
  *** Temp ./etc/csh.logout and installed have the same CVS Id, deleting
  *** Temp ./etc/ddb.conf and installed have the same CVS Id, deleting
  *** Temp ./etc/defaults/bluetooth.device.conf and installed have the 
same CVS Id, deleting
  *** Temp ./etc/defaults/devfs.rules and installed have the same CVS 
Id, deleting
  *** Temp ./etc/defaults/periodic.conf and installed have the same CVS 
Id, deleting
  *** Temp ./etc/defaults/rc.conf and installed have the same CVS Id, 
deleting
  *** Temp ./etc/devd.conf and installed have the same CVS Id, deleting
  *** Temp ./etc/devd/asus.conf and installed have the same CVS Id, deleting
  *** Temp ./etc/devd/uath.conf and installed have the same CVS Id, deleting
 
======================================================================

ESC[?1hESC=^M  *** Displaying differences between ./etc/devd/usb.conf 
and installed version:

--- /etc/devd/usb.conf  2012-03-27 21:31:26.000000000 -0700
+++ ./etc/devd/usb.conf 2012-06-06 16:48:12.000000000 -0700
@@ -1,5 +1,5 @@
  #
-# $FreeBSD: src/etc/devd/usb.conf,v 1.2.4.4 2012/03/27 15:33:38 
hselasky Exp $
+# $FreeBSD: src/etc/devd/usb.conf,v 1.2.4.5 2012/06/01 07:06:00 
hselasky Exp $
  #
  # This file was automatically generated by "tools/bus_autoconf.sh".
  # Please do not edit!
@@ -157,7 +157,7 @@
         match "bus" "uhub[0-9]+";
         match "mode" "host";
         match "vendor" "0x0403";
-       match "product" 
"(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xa6d0|0xa6d0|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)";
+       match "product" 
"(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)";
         action "kldload -n uftdi";
  };

@@ -1021,7 +1021,7 @@
         match "bus" "uhub[0-9]+";
         match "mode" "host";
         match "vendor" "0x05c6";
-       match "product" "(0x1000|0x6000|0x6613)";
+       match "product" "(0x1000|0x6000|0x6613|0x9000)";
         action "kldload -n u3g";
  };

@@ -2852,6 +2852,14 @@
  nomatch 32 {
         match "bus" "uhub[0-9]+";
         match "mode" "host";
+       match "vendor" "0x1199";
+       match "product" "0x68aa";
+       action "kldload -n u3g";
+};
+
+nomatch 32 {
+       match "bus" "uhub[0-9]+";
+       match "mode" "host";
         match "vendor" "0x11ad";
         match "product" "0x0701";
         action "kldload -n uplcom";
@@ -3661,7 +3669,7 @@
         match "bus" "uhub[0-9]+";
         match "mode" "host";
         match "vendor" "0x19d2";
-       match "product" 
"(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0:ESC[K^MESC[K060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x2000|0x2002|0x2003|0xfff1|0xfff5|0xfffe)";
+       match "product" 
"(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x2000|0x2002|0x2003|0xfff1|0xfff5|0xfffe)";
         action "kldload -n u3g";
  };

@@ -4165,7 +4173,7 @@
         match "bus" "uhub[0-9]+";
         match "mode" "host";
         match "vendor" "0x9710";
-       match "product" "0x7830";
+       match "product" "(0x7830|0x7832)";
         action "kldload -n if_mos";
  };

@@ -4336,5 +4344,5 @@
         action "kldload -n umass";
  };

-# 1652 USB entries processed
+# 1654 USB entries processed

ESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[K
ESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[K
ESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[K
ESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[K
ESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^M^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^M^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27m
ESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27mESC[K^MESC[K^G^MESC[KESC[7m(END)ESC[27m
ESC[K^MESC[KESC[?1lESC>
Suspended
root at P9X79:/usr/src # ^M
root at P9X79:/usr/src # ^M
root at P9X79:/usr/src # ^M
root at P9X79:/usr/src # ^M
root at P9X79:/usr/src # ps^M
  PID TT  STAT    TIME COMMAND
1199 v0  Is   0:00.00 login [pam] (login)
1330 v0  S    0:05.88 /usr/local/bin/X :0 -auth 
/home/tomdean/.serverauth.1311
1200 v1  Is   0:00.00 login [pam] (login)
1306 v1  I+   0:00.02 -csh (csh)
1201 v2  Is+  0:00.00 /usr/libexec/getty Pc ttyv2
1202 v3  Is+  0:00.00 /usr/libexec/getty Pc ttyv3
1203 v4  Is+  0:00.00 /usr/libexec/getty Pc ttyv4
1204 v5  Is+  0:00.00 /usr/libexec/getty Pc ttyv5
1205 v6  Is+  0:00.00 /usr/libexec/getty Pc ttyv6
1206 v7  Is+  0:00.00 /usr/libexec/getty Pc ttyv7
1363  4  Is   0:00.01 su
1364  4  I    0:00.01 _su (csh)
2486  4  S+   0:00.00 script /tmp/mergemaster
2487  5  Ss   0:00.01 /bin/csh -i
2489  5  T    0:00.05 /bin/sh /usr/sbin/mergemaster
3540  5  T    0:00.00 less
3542  5  R+   0:00.00 ps
root at P9X79:/usr/src # kill 2489 2487 3540^M
root at P9X79:/usr/src # ps^M
  PID TT  STAT    TIME COMMAND
1199 v0  Is   0:00.00 login [pam] (login)
1330 v0  S    0:05.88 /usr/local/bin/X :0 -auth 
/home/tomdean/.serverauth.1311
1200 v1  Is   0:00.00 login [pam] (login)
1306 v1  I+   0:00.02 -csh (csh)
1201 v2  Is+  0:00.00 /usr/libexec/getty Pc ttyv2
1202 v3  Is+  0:00.00 /usr/libexec/getty Pc ttyv3
1203 v4  Is+  0:00.00 /usr/libexec/getty Pc ttyv4
1204 v5  Is+  0:00.00 /usr/libexec/getty Pc ttyv5
1205 v6  Is+  0:00.00 /usr/libexec/getty Pc ttyv6
1206 v7  Is+  0:00.00 /usr/libexec/getty Pc ttyv7
1363  4  Is   0:00.01 su
1364  4  I    0:00.01 _su (csh)
2486  4  S+   0:00.00 script /tmp/mergemaster
2487  5  Ss   0:00.01 /bin/csh -i
3544  5  R+   0:00.00 ps
[1]  + Terminated                    mergemaster



More information about the freebsd-stable mailing list