aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kaspar [Dee'Kej] <dkaspar@redhat.com>2018-05-17 17:52:44 +0200
committerDee'Kej <deekej@linuxmail.org>2018-05-30 14:29:23 +0200
commit3424690ff366fa2e7ca3cf5806f9601249bea6df (patch)
tree49aef3df5ead7d8ac5b7de988ef3c5298e21add2
parent665d560efebeb05dbc70e859ae67ee9415775b32 (diff)
downloadinitscripts-3424690ff366fa2e7ca3cf5806f9601249bea6df.tar
initscripts-3424690ff366fa2e7ca3cf5806f9601249bea6df.tar.gz
initscripts-3424690ff366fa2e7ca3cf5806f9601249bea6df.tar.bz2
initscripts-3424690ff366fa2e7ca3cf5806f9601249bea6df.tar.xz
initscripts-3424690ff366fa2e7ca3cf5806f9601249bea6df.zip
adjtime moved into 'util-linux' package
The line /etc/adjtime has been kept in rwtab, to not break the readonly-root...
-rw-r--r--doc/sysconfig.txt26
-rw-r--r--etc/adjtime2
-rw-r--r--initscripts.spec13
3 files changed, 6 insertions, 35 deletions
diff --git a/doc/sysconfig.txt b/doc/sysconfig.txt
index df4f789a..1e8729ee 100644
--- a/doc/sysconfig.txt
+++ b/doc/sysconfig.txt
@@ -56,32 +56,6 @@ Generic options:
AUTOFSCK_SINGLEUSER=
If this is set, drop to single user mode before fsck.
-/etc/sysconfig/clock:
-
- Current releases use the third parameter in the /etc/adjtime
- file (either 'UTC' or 'LOCAL') to determine whether the hwclock
- is in UTC or localtime.
-
- ZONE="filename" indicates the zonefile under /usr/share/zoneinfo
- that /etc/localtime is a copy of, for example:
- ZONE="US/Eastern"
-
- deprecated values from earlier releases:
-
- CLOCKMODE=GMT indicates that the clock is set to UTC
- CLOCKMODE=ARC on alpha only indicates the ARC console's
- 42-year time offset is in effect
- UTC=true,yes
- Indicates that the hardware clock is set to UTC.
- UTC=no,false
- Indicates that the hardware clock is set to Local Time.
- ARC=true on alpha only indicates the ARC console's
- 42-year time offset is in effect; otherwise the normal
- Unix epoch is assumed.
-
- SRM=true on alpha only indicates the SRM 1900 epoch is in
- effect; otherwise the normal Unix epoch is assumed.
-
/etc/sysconfig/init:
BOOTUP=<some bootup mode>
diff --git a/etc/adjtime b/etc/adjtime
deleted file mode 100644
index 3127bd0d..00000000
--- a/etc/adjtime
+++ /dev/null
@@ -1,2 +0,0 @@
-0.0 0 0.0
-0
diff --git a/initscripts.spec b/initscripts.spec
index 117c7637..4113b649 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -171,13 +171,12 @@ fi
# ---------------
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
-%config(noreplace) %{_sysconfdir}/networks
-%config(noreplace) %{_sysconfdir}/rwtab
-%config(noreplace) %{_sysconfdir}/statetab
-%config(noreplace) %{_sysconfdir}/sysconfig/netconsole
-%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root
-%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo
+%config(noreplace) %{_sysconfdir}/networks
+%config(noreplace) %{_sysconfdir}/rwtab
+%config(noreplace) %{_sysconfdir}/statetab
+%config(noreplace) %{_sysconfdir}/sysconfig/netconsole
+%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root
+%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo
%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local