[packages/util-linux.git] / util-linux-fhs.patch

--- util-linux-2.21/include/pathnames.h~	2011-12-18 22:28:28.000000000 +0200
+++ util-linux-2.21/include/pathnames.h	2012-03-05 17:32:49.986673893 +0200
@@ -26,13 +26,13 @@
 #define	_PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 
 #define _PATH_SECURETTY		"/etc/securetty"
-#define _PATH_WTMPLOCK		"/etc/wtmplock"
+#define _PATH_WTMPLOCK		"/var/lock/wtmplock"
 
 #define	_PATH_HUSHLOGIN		".hushlogin"
 #define	_PATH_HUSHLOGINS	"/etc/hushlogins"
 
 #ifndef _PATH_MAILDIR
-#define	_PATH_MAILDIR		"/var/spool/mail"
+#define	_PATH_MAILDIR		"/var/mail"
 #endif
 #define	_PATH_MOTDFILE		"/etc/motd"
 #define	_PATH_NOLOGIN		"/etc/nologin"
--- util-linux-2.21/login-utils/login.1~	2012-02-10 15:45:52.000000000 +0200
+++ util-linux-2.21/login-utils/login.1	2012-03-05 18:07:04.386917212 +0200
@@ -223,7 +223,7 @@
 .I /var/run/utmp
 .I /var/log/wtmp
 .I /var/log/lastlog
-.I /var/spool/mail/*
+.I /var/mail/*
 .I /etc/motd
 .I /etc/passwd
 .I /etc/nologin
Commit	Line	Data
a7980c08 ER	1	--- util-linux-2.21/include/pathnames.h~ 2011-12-18 22:28:28.000000000 +0200
	2	+++ util-linux-2.21/include/pathnames.h 2012-03-05 17:32:49.986673893 +0200
	3	@@ -26,13 +26,13 @@
f212f39a	4	#define _PATH_DEFPATH_ROOT "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
	5
	6	#define _PATH_SECURETTY "/etc/securetty"
	7	-#define _PATH_WTMPLOCK "/etc/wtmplock"
	8	+#define _PATH_WTMPLOCK "/var/lock/wtmplock"
	9
	10	#define _PATH_HUSHLOGIN ".hushlogin"
a7980c08	11	#define _PATH_HUSHLOGINS "/etc/hushlogins"
f212f39a	12
	13	#ifndef _PATH_MAILDIR
	14	-#define _PATH_MAILDIR "/var/spool/mail"
	15	+#define _PATH_MAILDIR "/var/mail"
	16	#endif
	17	#define _PATH_MOTDFILE "/etc/motd"
	18	#define _PATH_NOLOGIN "/etc/nologin"
a7980c08 ER	19	--- util-linux-2.21/login-utils/login.1~ 2012-02-10 15:45:52.000000000 +0200
	20	+++ util-linux-2.21/login-utils/login.1 2012-03-05 18:07:04.386917212 +0200
	21	@@ -223,7 +223,7 @@
	22	.I /var/run/utmp
	23	.I /var/log/wtmp
	24	.I /var/log/lastlog
	25	-.I /var/spool/mail/*
	26	+.I /var/mail/*
	27	.I /etc/motd
	28	.I /etc/passwd
	29	.I /etc/nologin