From owner-freebsd-stable@FreeBSD.ORG Thu Jun 7 17:55:14 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E68C1065674 for ; Thu, 7 Jun 2012 17:55:14 +0000 (UTC) (envelope-from apeiron@isuckatdomains.net) Received: from isuckatdomains.net (unknown [IPv6:2600:3c01:e000:4::1]) by mx1.freebsd.org (Postfix) with ESMTP id 389E38FC1B for ; Thu, 7 Jun 2012 17:55:14 +0000 (UTC) Received: from isuckatdomains.isuckatdomains.net (isuckatdomains.net [74.207.243.179]) by isuckatdomains.net (Postfix) with ESMTPSA id 18DD445AF8 for ; Thu, 7 Jun 2012 13:55:14 -0400 (EDT) Date: Thu, 7 Jun 2012 13:55:13 -0400 From: Chris Nehren To: freebsd-stable@freebsd.org Message-ID: <20120607175512.GB30509@isuckatdomains.isuckatdomains.net> Mail-Followup-To: freebsd-stable@freebsd.org References: <4FCFECFF.9070504@speakeasy.org> <20120607042008.GA30509@isuckatdomains.isuckatdomains.net> <4FD0DF54.10704@speakeasy.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="f2QGlHpHGjS2mn6Y" Content-Disposition: inline In-Reply-To: <4FD0DF54.10704@speakeasy.org> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: Mergemaster Fails X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2012 17:55:14 -0000 --f2QGlHpHGjS2mn6Y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 07, 2012 at 10:05:24 -0700 , Thomas D. Dean wrote: > On 06/06/12 21:20, Chris Nehren wrote: >=20 > >Have you tried ctrl-t? This will send SIGINFO to the process which >=20 > No response to any key except ^z >=20 > >Additionally, the output of ps ax -d (show process trees) would be > >helpful. This should also show what mergemaster is waiting on. > > >=20 > Viewing the output of the script with vi > ... > ^M > @@ -4165,7 +4173,7 @@^M > match "bus" "uhub[0-9]+";^M > match "mode" "host";^M > match "vendor" "0x9710";^M > - match "product" "0x7830";^M > + match "product" "(0x7830|0x7832)";^M > action "kldload -n if_mos";^M > [snipped] > There are a large number of control characters, then (END) then, no > response to any key except ^z. It looks like there's a pager (probably less) that's waiting for you to respond. The output suggests it's showing you the results of diffing an old file with a new one--could be either /etc/devd.conf or /etc/usb.conf. > from ps -ax -d: >=20 > PID PPID STAT TIME COMMAND > [snipped] > 1339 1338 R 0:06.58 | |-- /usr/local/bin/X :0 -auth > /home/tomdean/.se > 1341 1338 I 0:00.01 | `-- /usr/local/bin/xterm -j -sk -sb > -sl 1000 -f > 1342 1341 I 0:00.01 | |-- twm > 1343 1341 S 0:00.07 | |-- xclock -digital -update 1 > -geometry 230x3 > 1344 1341 I 0:00.01 | |-- /usr/local/bin/xterm -j -sk -sb > -sl 1000 > 1354 1344 Is+ 0:00.02 | | `-- tcsh > 1363 1354 I 0:00.01 | | `-- /usr/local/bin/xterm -bd > red -cr red > 1365 1363 Is 0:00.01 | | `-- su > 1366 1365 I 0:00.01 | | `-- _su (csh) > 1368 1366 I+ 0:00.00 | | `-- script /tmp/mergemaster > 1369 1368 Is 0:00.01 | | `-- /bin/csh -i > 1371 1369 I+ 0:00.05 | | `-- /bin/sh > /usr/sbin/mergemast > 2423 1371 I+ 0:00.00 | | `-- less And this confirms it. So you'll probably want to examine the changes in the script(1) output and then quit the pager. I would also recommend running mergemaster in single user mode to avoid this sort of thing. X11 complicates things an awful lot. --=20 Thanks and best regards, Chris Nehren --f2QGlHpHGjS2mn6Y Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAEBAgAGBQJP0Or/AAoJEB3ywRGrHAnQNLkP/jPrGVlGyLvV/YbTQB1I4VN7 SLWHH8RUUMq1KSNWTgNM5NIaL+lBEtWzjT1zPRC2jAZNtk6cTI4qFA8ulx/5Dcv6 Unasxvy9Uga2rhWIVgdIyfM2zGWHBg87tuGTt0TLqzXnU023NjeNwVLY1JHW+2U0 0XkaE1OVki3vvy19SLgbjg4deH5qZ/NCMD5La3VZf29yVZLKvKdt+b9ZShIkABC4 R2+YVdhodARMmAZh6gynk4sreNyE8AG1H1Mz1Vd46YFb+6U7PX1BrvyUG94Tka2G imwSOYrfybOwZ5fuzOxdROfg0KQ1DmsHmIc8V2ajseYMddnqVMheCGA0EXj35D0+ wfxmBPCKwUyZxAmse5FwciLt4TN/dRgr7BQ4yip6ZGgqZFF79sS9vS7ctivP4HdD KFPOpTgc4pN1Jv7tmWNPvrWc92Zft3CADfDZp/vfui5AvxGPeiL4XxSvceP5dL1F ca3yfFjlOzno2kF+fhCq4OWHdQXu31DkrCm46H1Wi1bOgiL6NT5YkeQiHXtzldE4 pz2wrikVzgitUHFRVT+pqJU0TsXEyqsTURKaSuGnPGkYDR6pDzodMTXEGI34YYFo w6LAl6AeXf4aph5zi5tDsyO+Ag0Ycd8LZWYTCrb+sj6tSgn8zsgy9+6xpGbjL81V OEeMem8xb1C1Yp5yrKpD =wqhm -----END PGP SIGNATURE----- --f2QGlHpHGjS2mn6Y--