diff options
| author | J William Piggott | 2017-06-17 22:32:19 +0200 |
|---|---|---|
| committer | J William Piggott | 2017-06-21 01:51:26 +0200 |
| commit | 8493eedd155e5194ff1358fd7e063c84257802b0 (patch) | |
| tree | 936f0b15e0516831bf665dfb1f8c69250e3a59bd /include/pathnames.h | |
| parent | hwclock: add usage() functions heading (diff) | |
| download | kernel-qcow2-util-linux-8493eedd155e5194ff1358fd7e063c84257802b0.tar.gz kernel-qcow2-util-linux-8493eedd155e5194ff1358fd7e063c84257802b0.tar.xz kernel-qcow2-util-linux-8493eedd155e5194ff1358fd7e063c84257802b0.zip | |
include: update pathnames.h
* use /dev/rtc0 (/dev/rtc was for the 'old' driver)
* remove hwclock Award workaround and alpha cmos paths
* relocate _PATH_BTMP from hwclock to login-utils
* add a comment for _PATH_BTMP and fix other login-utils comments
* add a comment for proc/cpuinfo
* remove empty shutdown.c comment from 4d43977f
Review changes
* remove 'used in' comments
* white space fixes
Reviewed-by: Karel Zak <kzak@redhat.com>
Signed-off-by: J William Piggott <elseifthen@gmx.com>
Diffstat (limited to 'include/pathnames.h')
| -rw-r--r-- | include/pathnames.h | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/include/pathnames.h b/include/pathnames.h index de6abe63e..8af386457 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -7,7 +7,7 @@ #define PATHNAMES_H #ifdef HAVE_PATHS_H -#include <paths.h> +# include <paths.h> #endif #ifndef __STDC__ @@ -41,45 +41,40 @@ #define _PATH_NOLOGIN_TXT "/etc/nologin.txt" #ifndef _PATH_MAILDIR -#define _PATH_MAILDIR "/var/spool/mail" +# define _PATH_MAILDIR "/var/spool/mail" #endif #define _PATH_MOTDFILE "/etc/motd" #ifndef _PATH_NOLOGIN -#define _PATH_NOLOGIN "/etc/nologin" +# define _PATH_NOLOGIN "/etc/nologin" #endif #define _PATH_VAR_NOLOGIN "/var/run/nologin" #ifndef _PATH_LOGIN -#define _PATH_LOGIN "/bin/login" +# define _PATH_LOGIN "/bin/login" #endif #define _PATH_SHUTDOWN "/sbin/shutdown" #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d" #define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME -/* used in login-utils/shutdown.c */ - -/* used in login-utils/setpwnam.h and login-utils/islocal.c */ +/* login paths */ #define _PATH_PASSWD "/etc/passwd" - -/* used in login-utils/newgrp and login-utils/setpwnam.h*/ #define _PATH_GSHADOW "/etc/gshadow" - -/* used in login-utils/setpwnam.h */ #define _PATH_GROUP "/etc/group" #define _PATH_SHADOW_PASSWD "/etc/shadow" #define _PATH_SHELLS "/etc/shells" -/* used in term-utils/agetty.c */ +#ifndef _PATH_BTMP +# define _PATH_BTMP "/var/log/btmp" +#endif + #define _PATH_ISSUE "/etc/issue" #define _PATH_OS_RELEASE_ETC "/etc/os-release" #define _PATH_OS_RELEASE_USR "/usr/lib/os-release" - #define _PATH_NUMLOCK_ON _PATH_LOCALSTATEDIR "/numlock-on" - #define _PATH_LOGINDEFS "/etc/login.defs" -/* used in misc-utils/look.c */ +/* misc paths */ #define _PATH_WORDS "/usr/share/dict/words" #define _PATH_WORDS_ALT "/usr/share/dict/web2" @@ -154,15 +149,10 @@ # define _PATH_ADJTIME "/etc/adjtime" #endif -#define _PATH_LASTDATE "/var/lib/lastdate" #ifdef __ia64__ # define _PATH_RTC_DEV "/dev/efirtc" #else -# define _PATH_RTC_DEV "/dev/rtc" -#endif - -#ifndef _PATH_BTMP -#define _PATH_BTMP "/var/log/btmp" +# define _PATH_RTC_DEV "/dev/rtc0" #endif /* raw paths*/ @@ -195,9 +185,7 @@ /* ctrlaltdel paths */ #define _PATH_PROC_CTRL_ALT_DEL "/proc/sys/kernel/ctrl-alt-del" -/* hwclock-cmos paths */ -#define _PATH_DEV_PORT "/dev/port" +/* lscpu paths */ #define _PATH_PROC_CPUINFO "/proc/cpuinfo" #endif /* PATHNAMES_H */ - |