Module Name: src
Committed By: apb
Date: Mon Dec 17 18:20:50 UTC 2012
Modified Files:
src/etc/rc.d: random_seed
Log Message:
Reinstate the dirname invocations that were recently removed from
rc.d/random_seed. The new dirname shell function provided by rc.subr
will be used, so it should work before the /usr file system is mounted.
This should fix a problem in which the fs_safe shell function failed when
passed the name of a file that did not exist.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/random_seed
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/random_seed
diff -u src/etc/rc.d/random_seed:1.4 src/etc/rc.d/random_seed:1.5
--- src/etc/rc.d/random_seed:1.4 Fri Dec 14 18:42:25 2012
+++ src/etc/rc.d/random_seed Mon Dec 17 18:20:50 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: random_seed,v 1.4 2012/12/14 18:42:25 apb Exp $
+# $NetBSD: random_seed,v 1.5 2012/12/17 18:20:50 apb Exp $
#
# PROVIDE: random_seed
@@ -59,7 +59,7 @@ random_load()
{
if [ -f $random_file ]; then
- if ! fs_safe "${random_file}"; then
+ if ! fs_safe "$(dirname "${random_file}")"; then
return 1
fi
@@ -90,7 +90,7 @@ random_save()
rm -Pf "${random_file}"
- if ! fs_safe "${random_file}"; then
+ if ! fs_safe "$(dirname "${random_file}")"; then
return 1
fi
