diff options
27 files changed, 53 insertions, 52 deletions
@@ -1,5 +1,15 @@ Changelog for utmps. +In 0.1.0.2 +---------- + + - The wtmpd example now uses /var/log/wtmp instead of /run/utmps/wtmp +since wtmp is supposed to survive across reboots. + - WTMPX_FILE, which is unused by utmps, now points to /var/log/wtmp +so that programs that want to read that file (e.g. lastlog) can +access it without patching. + + In 0.1.0.1 ---------- diff --git a/doc/index.html b/doc/index.html index e404044..794115e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -76,7 +76,7 @@ suitable replacement for <h3> Download </h3> <ul> - <li> The current released version of utmps is <a href="utmps-0.1.0.1.tar.gz">0.1.0.1</a>. </li> + <li> The current released version of utmps is <a href="utmps-0.1.0.2.tar.gz">0.1.0.2</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/utmps/">utmps git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index 0bd8da1..a124263 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,13 @@ <h1> What has changed in utmps </h1> +<h2> in 0.1.0.2 </h2> + +<ul> + <li> WTMP_FILE is now <tt>/var/log/wtmp</tt>, to ease integration +with distributions. (Unlike utmp, wtmp is supposed to be persistent.) </li> +</ul> + <h2> in 0.1.0.1 </h2> <ul> diff --git a/examples/openrc/utmpd b/examples/openrc/utmpd index 2cf467b..291180a 100755 --- a/examples/openrc/utmpd +++ b/examples/openrc/utmpd @@ -1,13 +1,19 @@ #!/sbin/openrc-run -name="utmpd" -command="s6-ipcserver" -command_args="/run/utmps/utmpd-socket utmps-utmpd" -command_background=yes +depend() { + after bootmisc + before networking +} + +name=utmpd +description="utmps daemon for the utmp service" +command=s6-ipcserver +command_args=".utmpd-socket utmps-utmpd" command_user=utmp -pidfile="/run/utmps/utmpd.pid" -start_stop_daemon_args="-d /run/utmps" +command_background=true +directory=/run/utmps +pidfile=/run/utmps/utmpd.pid start_pre() { - checkpath -D -d -o utmp:utmp -m 0755 /run/utmps + checkpath -D -d -o utmp:utmp -m 0755 /run/utmps } diff --git a/examples/openrc/wtmpd b/examples/openrc/wtmpd index a7bda75..7d40941 100755 --- a/examples/openrc/wtmpd +++ b/examples/openrc/wtmpd @@ -1,13 +1,20 @@ #!/sbin/openrc-run -name="wtmpd" -command="s6-ipcserver" -command_args="/run/utmps/wtmpd-socket utmps-wtmpd" -command_background=yes +depend() { + after bootmisc + before networking + after utmpd +} + +name=wtmpd +description="utmps daemon for the wtmp service" +command=s6-ipcserver +command_args="/run/utmps/.wtmpd-socket utmps-wtmpd" command_user=utmp -pidfile="/run/utmps/wtmpd.pid" -start_stop_daemon_args="-d /run/utmps" +command_background=true +directory=/var/log +pidfile=/run/utmps/wtmpd.pid start_pre() { - checkpath -D -d -o utmp:utmp -m 0755 /run/utmps + checkpath -f -o utmp:utmp /var/log/wtmp } diff --git a/examples/s6-rc/utmpd-log/consumer-for b/examples/s6-rc/utmpd-log/consumer-for deleted file mode 100644 index fe07d03..0000000 --- a/examples/s6-rc/utmpd-log/consumer-for +++ /dev/null @@ -1 +0,0 @@ -utmpd diff --git a/examples/s6-rc/utmpd-log/dependencies b/examples/s6-rc/utmpd-log/dependencies deleted file mode 100644 index 8b13789..0000000 --- a/examples/s6-rc/utmpd-log/dependencies +++ /dev/null @@ -1 +0,0 @@ - diff --git a/examples/s6-rc/utmpd-log/notification-fd b/examples/s6-rc/utmpd-log/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/s6-rc/utmpd-log/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/s6-rc/utmpd-log/run b/examples/s6-rc/utmpd-log/run deleted file mode 100644 index ec3b2f4..0000000 --- a/examples/s6-rc/utmpd-log/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P - -s6-setuidgid utmplog -exec -c -s6-log -d3 -- t /var/log/utmpd diff --git a/examples/s6-rc/utmpd-log/type b/examples/s6-rc/utmpd-log/type deleted file mode 100644 index 5883cff..0000000 --- a/examples/s6-rc/utmpd-log/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/examples/s6-rc/utmpd/pipeline-name b/examples/s6-rc/utmpd/pipeline-name deleted file mode 100644 index d75e141..0000000 --- a/examples/s6-rc/utmpd/pipeline-name +++ /dev/null @@ -1 +0,0 @@ -utmpd-pipeline diff --git a/examples/s6-rc/utmpd/producer-for b/examples/s6-rc/utmpd/producer-for deleted file mode 100644 index 8ff8e12..0000000 --- a/examples/s6-rc/utmpd/producer-for +++ /dev/null @@ -1 +0,0 @@ -utmpd-log diff --git a/examples/s6-rc/wtmpd-log/consumer-for b/examples/s6-rc/wtmpd-log/consumer-for deleted file mode 100644 index 18e5a30..0000000 --- a/examples/s6-rc/wtmpd-log/consumer-for +++ /dev/null @@ -1 +0,0 @@ -wtmpd diff --git a/examples/s6-rc/wtmpd-log/dependencies b/examples/s6-rc/wtmpd-log/dependencies deleted file mode 100644 index 8b13789..0000000 --- a/examples/s6-rc/wtmpd-log/dependencies +++ /dev/null @@ -1 +0,0 @@ - diff --git a/examples/s6-rc/wtmpd-log/notification-fd b/examples/s6-rc/wtmpd-log/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/s6-rc/wtmpd-log/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/s6-rc/wtmpd-log/run b/examples/s6-rc/wtmpd-log/run deleted file mode 100644 index eeda433..0000000 --- a/examples/s6-rc/wtmpd-log/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P - -s6-setuidgid utmplog -exec -c -s6-log -d3 -- t /var/log/wtmpd diff --git a/examples/s6-rc/wtmpd-log/type b/examples/s6-rc/wtmpd-log/type deleted file mode 100644 index 5883cff..0000000 --- a/examples/s6-rc/wtmpd-log/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/examples/s6-rc/wtmpd/dependencies b/examples/s6-rc/wtmpd/dependencies index 6cfcf60..194a7b1 100644 --- a/examples/s6-rc/wtmpd/dependencies +++ b/examples/s6-rc/wtmpd/dependencies @@ -1 +1,6 @@ +# mount-var-log is not defined in this example; +# it's there to show that wtmpd should only run +# once /var/log has been mounted. + utmps-prepare +mount-var-log diff --git a/examples/s6-rc/wtmpd/pipeline-name b/examples/s6-rc/wtmpd/pipeline-name deleted file mode 100644 index 37edf1f..0000000 --- a/examples/s6-rc/wtmpd/pipeline-name +++ /dev/null @@ -1 +0,0 @@ -wtmpd-pipeline diff --git a/examples/s6-rc/wtmpd/producer-for b/examples/s6-rc/wtmpd/producer-for deleted file mode 100644 index 4206ab1..0000000 --- a/examples/s6-rc/wtmpd/producer-for +++ /dev/null @@ -1 +0,0 @@ -wtmpd-log diff --git a/examples/s6-rc/wtmpd/run b/examples/s6-rc/wtmpd/run index b9d9da3..cb26286 100644 --- a/examples/s6-rc/wtmpd/run +++ b/examples/s6-rc/wtmpd/run @@ -2,7 +2,7 @@ fdmove -c 2 1 s6-setuidgid utmp -cd /run/utmps +cd /var/log fdmove 1 3 s6-ipcserver -1 -- /run/utmps/wtmpd-socket utmps-wtmpd diff --git a/examples/s6/utmpd/log/notification-fd b/examples/s6/utmpd/log/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/s6/utmpd/log/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/s6/utmpd/log/run b/examples/s6/utmpd/log/run deleted file mode 100755 index ec3b2f4..0000000 --- a/examples/s6/utmpd/log/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P - -s6-setuidgid utmplog -exec -c -s6-log -d3 -- t /var/log/utmpd diff --git a/examples/s6/wtmpd/log/notification-fd b/examples/s6/wtmpd/log/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/s6/wtmpd/log/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/s6/wtmpd/log/run b/examples/s6/wtmpd/log/run deleted file mode 100755 index b23b32e..0000000 --- a/examples/s6/wtmpd/log/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P - -s6-setuidgid utmplog -exec -c -s6-log -d3 -- t /var/log/utmps-wtmpd diff --git a/examples/s6/wtmpd/run b/examples/s6/wtmpd/run index 83844ae..d8aba76 100755 --- a/examples/s6/wtmpd/run +++ b/examples/s6/wtmpd/run @@ -3,7 +3,7 @@ fdmove -c 2 1 unexport ? s6-setuidgid utmp -cd /run/utmps +cd /var/log # will only work after /var/log is mounted! fdmove 1 3 s6-ipcserver -1 -- /run/utmps/.wtmpd-socket utmps-wtmpd diff --git a/package/info b/package/info index 587ff56..5a5337f 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=utmps -version=0.1.0.1 +version=0.1.0.2 category=admin package_macro_name=UTMPS |