Module Name: src Committed By: dholland Date: Thu Jan 9 18:55:41 UTC 2014
Modified Files: src/share/man/man7: symlink.7 Log Message: Clarify the behavior of the @machine and @machine_arch magic links relative to uname output when running in emulations: the magic links are *not* affected even though uname output changes. (This means @machine magic links can be used for e.g. amd64 vs. i386 device nodes. There's also an @emul magic link for emulation.) Noted by apb. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man7/symlink.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/man/man7/symlink.7 diff -u src/share/man/man7/symlink.7:1.21 src/share/man/man7/symlink.7:1.22 --- src/share/man/man7/symlink.7:1.21 Thu Jun 2 09:02:39 2011 +++ src/share/man/man7/symlink.7 Thu Jan 9 18:55:41 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: symlink.7,v 1.21 2011/06/02 09:02:39 jruoho Exp $ +.\" $NetBSD: symlink.7,v 1.22 2014/01/09 18:55:41 dholland Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" -.Dd June 2, 2011 +.Dd January 9, 2014 .Dt SYMLINK 7 .Os .Sh NAME @@ -513,25 +513,31 @@ For example .It @machine Expands to the value of .Li MACHINE -for the system -.Po +for the system. +For native binaries, this is equivalent to the output of .Dq uname -m or .Xr sysctl 3 -.Dq hw.machine -.Pc . +.Dq hw.machine . +.Po +For non-native binaries, the values returned by uname and sysctl +typically vary to match the emulation environment. +.Pc .It @machine_arch Expands to the value of .Li MACHINE_ARCH -for the system -.Po +for the system. +For native binaries, this is equivalent to the output of .Dq uname -p or .Xr sysctl 3 -.Dq hw.machine_arch -.Pc . +.Dq hw.machine_arch . +.Po +For non-native binaries, the values returned by uname and sysctl +typically vary to match the emulation environment. +.Pc .It @osrelease Expands to the operating system release of the running kernel .Po