liminix

commit 4cc0add2ad0cbfebbf5dd36fd30c712681fae907
parent 2d7e6188acb4e8c37a2addd2402a9db351c77168
Author: Daniel Barlow <dan@telent.net>
Date:   Sun,  6 Oct 2024 13:46:14 +0100

update refs to uncaught-logs in docs/tests

Diffstat:
M
doc/admin.rst
 | 
8
++++----
M
doc/tutorial.rst
 | 
2
+-
M
tests/wlan/wait-for-wlan.expect
 | 
4
++--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/admin.rst b/doc/admin.rst
@@ -97,7 +97,7 @@ time.  For example:
 Logs
 ====
 
-Logs for all services are collated into :file:`/run/uncaught-logs/current`.
+Logs for all services are collated into :file:`/run/log/current`.
 The log file is rotated when it reaches a threshold size, into another
 file in the same directory whose name contains a TAI64 timestamp.
 
@@ -108,7 +108,7 @@ human-readable format, use :command:`s6-tai64nlocal`.
 
 .. code-block:: console
 
-  # ls -l /run/uncaught-logs/
+  # ls -l /run/log/
   -rw-r--r--    1         0 lock
   -rw-r--r--    1         0 state
   -rwxr--r--    1     98059 @4000000000025cb629c311ac.s
@@ -122,10 +122,10 @@ human-readable format, use :command:`s6-tai64nlocal`.
   -rwxr--r--    1     98023 @4000000000027e6f0ed24a6c.s
   -rw-r--r--    1     42374 current
   
-  # tail -2 /run/uncaught-logs/current 
+  # tail -2 /run/log/current
   @40000000000284f130747343 wan.link.pppoe Connect: ppp0 <--> /dev/pts/0
   @40000000000284f230acc669 wan.link.pppoe sent [LCP ConfReq id=0x1 <asyncmap 0x0> <magic 0x667a9594> <pcomp> <accomp>]
-  # tail -2 /run/uncaught-logs/current  | s6-tai64nlocal 
+  # tail -2 /run/log/current  | s6-tai64nlocal
   1970-01-02 21:51:45.828598156 wan.link.pppoe sent [LCP ConfReq id=0x1 <asyncmap 0x0> <magic 0x667a9594> <pcomp> <accom
   p>]
   1970-01-02 21:51:48.832588765 wan.link.pppoe sent [LCP ConfReq id=0x1 <asyncmap 0x0> <magic 0x667a9594> <pcomp> <accom
diff --git a/doc/tutorial.rst b/doc/tutorial.rst
@@ -71,7 +71,7 @@ stdin/stdout.
 You should now see Linux boot messages and after a few seconds be
 presented with a root shell prompt.  You can run commands to look at
 the filesystem, see what processes are running, view log messages (in
-:file:/run/uncaught-logs.current), etc. To kill the emulator, press ^P
+:file:/run/log/current), etc. To kill the emulator, press ^P
 (Control P) then c to enter the "QEMU Monitor", then type ``quit`` at
 the ``(qemu)`` prompt.
 
diff --git a/tests/wlan/wait-for-wlan.expect b/tests/wlan/wait-for-wlan.expect
@@ -14,7 +14,7 @@ expect {
 }
 expect "#"
 while { $FINISHED < 10 } {
-  send "date && grep AP-ENABLED /run/uncaught-logs/* || echo \$NOT\r\n"
+  send "date && grep AP-ENABLED /run/log/* || echo \$NOT\r\n"
   
   expect {
     "wlan0: AP-ENABLED" { set FINISHED 999; set EXIT 0; }
@@ -24,7 +24,7 @@ while { $FINISHED < 10 } {
 }
 
 if { $EXIT > 0 } {
-  send "tail -40 /run/uncaught-logs/current\r\n"
+  send "tail -40 /run/log/current\r\n"
   expect "#"
 }
 exit $EXIT