[Clfs-commits] [Bootscripts Standard]Bootscripts for Cross-LFS branch, master, updated. e814bfe4c1e95fc542b80f24f426c1e1376ac3d6
git
git at cross-lfs.org
Thu Jul 10 03:25:54 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bootscripts for Cross-LFS".
The branch, master has been updated
via e814bfe4c1e95fc542b80f24f426c1e1376ac3d6 (commit)
from 27f8c17526a22f8850740e774abd9dcecee726b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e814bfe4c1e95fc542b80f24f426c1e1376ac3d6
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jul 10 06:25:23 2014 -0400
Changed all /var/run references to /run
diff --git a/boot-scripts/CHANGELOG.lfs b/boot-scripts/CHANGELOG.lfs
index f0101fe..22eebd3 100644
--- a/boot-scripts/CHANGELOG.lfs
+++ b/boot-scripts/CHANGELOG.lfs
@@ -481,7 +481,7 @@ n/a - May 6, 2004
2.1.0 - May 4, 2004
* Update to the console script, prevent install of the console script
- * Chgrp /var/run/utmp to group utmp if it exists.
+ * Chgrp /run/utmp to group utmp if it exists.
* Moved udev from contrib to lfs
* Moved GATEWAY setup from /etc/rc.d/init.d/network to
/etc/sysconfig/network-devices/services/static
diff --git a/boot-scripts/Changelog b/boot-scripts/Changelog
index 440782b..80aee16 100644
--- a/boot-scripts/Changelog
+++ b/boot-scripts/Changelog
@@ -1,3 +1,6 @@
+Chris - July 10, 2014
+ * Changed "/var/run" references to "/run"
+
William - May 21, 2014
* Change versioning to drop Pre1 and use a date
diff --git a/boot-scripts/clfs/init.d/cleanfs b/boot-scripts/clfs/init.d/cleanfs
index e996b45..cd5ae02 100644
--- a/boot-scripts/clfs/init.d/cleanfs
+++ b/boot-scripts/clfs/init.d/cleanfs
@@ -78,10 +78,10 @@ case "${1}" in
find . -xdev -mindepth 1 ! -name lost+found \
-delete || failed=1
- > /var/run/utmp
+ > /run/utmp
if grep -q '^utmp:' /etc/group ; then
- chmod 664 /var/run/utmp
- chgrp utmp /var/run/utmp
+ chmod 664 /run/utmp
+ chgrp utmp /run/utmp
fi
(exit ${failed})
diff --git a/boot-scripts/clfs/init.d/functions b/boot-scripts/clfs/init.d/functions
index 64b1fc5..1c41e86 100644
--- a/boot-scripts/clfs/init.d/functions
+++ b/boot-scripts/clfs/init.d/functions
@@ -417,9 +417,9 @@ statusproc()
${ECHO} -e "${INFO}${base} is running with Process"\
"ID(s) ${pidlist}.${NORMAL}"
else
- if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
+ if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
${ECHO} -e "${WARNING}${1} is not running but"\
- "/var/run/${base}.pid exists.${NORMAL}"
+ "/run/${base}.pid exists.${NORMAL}"
else
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
${ECHO} -e "${WARNING}${1} is not running"\
diff --git a/bootscripts/CHANGELOG.lfs b/bootscripts/CHANGELOG.lfs
index f0101fe..22eebd3 100644
--- a/bootscripts/CHANGELOG.lfs
+++ b/bootscripts/CHANGELOG.lfs
@@ -481,7 +481,7 @@ n/a - May 6, 2004
2.1.0 - May 4, 2004
* Update to the console script, prevent install of the console script
- * Chgrp /var/run/utmp to group utmp if it exists.
+ * Chgrp /run/utmp to group utmp if it exists.
* Moved udev from contrib to lfs
* Moved GATEWAY setup from /etc/rc.d/init.d/network to
/etc/sysconfig/network-devices/services/static
diff --git a/bootscripts/Changelog b/bootscripts/Changelog
index 8ef35be..35c7aa0 100644
--- a/bootscripts/Changelog
+++ b/bootscripts/Changelog
@@ -1,3 +1,6 @@
+Chris - July 10, 2014
+ * Changed "/var/run" references to "/run"
+
William - May 21, 2014
* Change versioning to drop Pre1 and use a date
diff --git a/bootscripts/cblfs/init.d/autofs b/bootscripts/cblfs/init.d/autofs
index 9e790d4..bf5b6aa 100644
--- a/bootscripts/cblfs/init.d/autofs
+++ b/bootscripts/cblfs/init.d/autofs
@@ -145,7 +145,7 @@ case "$1" in
;;
stop)
- # Kill all automounters listed in /var/run
+ # Kill all automounters listed in /run
ls ${piddir}/${pidroot}.*.pid 2>/dev/null |
(
while read pidpath
diff --git a/bootscripts/cblfs/init.d/dbus b/bootscripts/cblfs/init.d/dbus
index dd001e4..2d4869d 100644
--- a/bootscripts/cblfs/init.d/dbus
+++ b/bootscripts/cblfs/init.d/dbus
@@ -10,8 +10,8 @@
. /etc/sysconfig/rc
. $rc_functions
-pidfile=/var/run/dbus/pid
-socket=/var/run/dbus/system_bus_socket
+pidfile=/run/dbus/pid
+socket=/run/dbus/system_bus_socket
case "$1" in
start)
diff --git a/bootscripts/cblfs/init.d/gdm b/bootscripts/cblfs/init.d/gdm
index 832a1da..8772e44 100644
--- a/bootscripts/cblfs/init.d/gdm
+++ b/bootscripts/cblfs/init.d/gdm
@@ -10,7 +10,7 @@
. /etc/sysconfig/rc
. $rc_functions
-pidfile=/var/run/gdm.pid
+pidfile=/run/gdm.pid
export PATH=$PATH:/opt/gnome/bin:/opt/gnome/sbin
diff --git a/bootscripts/cblfs/init.d/gpm b/bootscripts/cblfs/init.d/gpm
index 52a4f3e..346ec35 100644
--- a/bootscripts/cblfs/init.d/gpm
+++ b/bootscripts/cblfs/init.d/gpm
@@ -11,7 +11,7 @@
. /etc/sysconfig/rc
. $rc_functions
-pidfile=/var/run/gpm.pid
+pidfile=/run/gpm.pid
if [ -f /etc/sysconfig/mouse ]
then
diff --git a/bootscripts/cblfs/init.d/haldaemon b/bootscripts/cblfs/init.d/haldaemon
index 0e9dacd..442a91f 100644
--- a/bootscripts/cblfs/init.d/haldaemon
+++ b/bootscripts/cblfs/init.d/haldaemon
@@ -10,7 +10,7 @@
. /etc/sysconfig/rc
. $rc_functions
-pidfile=/var/run/hald/pid
+pidfile=/run/hald/pid
case "$1" in
start)
diff --git a/bootscripts/cblfs/init.d/heimdal b/bootscripts/cblfs/init.d/heimdal
index 58f2cf0..d8a838f 100644
--- a/bootscripts/cblfs/init.d/heimdal
+++ b/bootscripts/cblfs/init.d/heimdal
@@ -13,14 +13,14 @@
case "$1" in
start)
boot_mesg -n "Starting KDC Server Daemon..."
- if test -f "/var/run/kdc.pid"
+ if test -f "/run/kdc.pid"
then
boot_mesg "kdc already running!" ${WARNING}
echo_warning
else
/usr/sbin/kdc &
sleep 1
- if test -f "/var/run/kdc.pid"
+ if test -f "/run/kdc.pid"
then
echo ""
echo_ok
@@ -30,14 +30,14 @@ case "$1" in
fi
fi
boot_mesg -n "Starting KDC kpasswdd Daemon..."
- if test -f "/var/run/kpasswdd.pid"
+ if test -f "/run/kpasswdd.pid"
then
boot_mesg "kpasswdd already running!" ${WARNING}
echo_warning
else
/usr/sbin/kpasswdd &
sleep 1
- if test -f "/var/run/kpasswdd.pid"
+ if test -f "/run/kpasswdd.pid"
then
echo ""
echo_ok
@@ -47,14 +47,14 @@ case "$1" in
fi
fi
boot_mesg -n "Starting KDC kadmind Daemon..."
- if test -f "/var/run/kadmind.pid"
+ if test -f "/run/kadmind.pid"
then
boot_mesg "kadmind already running!" ${WARNING}
echo_warning
else
/usr/sbin/kadmind &
sleep 1
- if test -f "/var/run/kadmind.pid"
+ if test -f "/run/kadmind.pid"
then
echo ""
echo_ok
diff --git a/bootscripts/cblfs/init.d/nfs-server b/bootscripts/cblfs/init.d/nfs-server
index 8797b11..c3b7201 100644
--- a/bootscripts/cblfs/init.d/nfs-server
+++ b/bootscripts/cblfs/init.d/nfs-server
@@ -87,8 +87,8 @@ case "$1" in
# Remove a pid file that isn't done automatically
boot_mesg "Removing the rpc.statd pid file if it exists"
- if [ -f /var/run/rpc.statd.pid ]; then
- rm -f /var/run/rpc.statd.pid
+ if [ -f /run/rpc.statd.pid ]; then
+ rm -f /run/rpc.statd.pid
fi
# NFSD support only in 2.6 kernel
diff --git a/bootscripts/cblfs/init.d/ntp b/bootscripts/cblfs/init.d/ntp
index 785677e..b852b6f 100644
--- a/bootscripts/cblfs/init.d/ntp
+++ b/bootscripts/cblfs/init.d/ntp
@@ -7,7 +7,7 @@
. /etc/sysconfig/rc
. $rc_functions
-pidfile=/var/run/ntpd.pid
+pidfile=/run/ntpd.pid
case "$1" in
start)
diff --git a/bootscripts/cblfs/init.d/samba b/bootscripts/cblfs/init.d/samba
index 81db884..c23cf88 100644
--- a/bootscripts/cblfs/init.d/samba
+++ b/bootscripts/cblfs/init.d/samba
@@ -10,8 +10,8 @@
. /etc/sysconfig/rc
. $rc_functions
-smbdpid=/var/run/smbd.pid
-nmbdpid=/var/run/nmbd.pid
+smbdpid=/run/smbd.pid
+nmbdpid=/run/nmbd.pid
case "$1" in
start)
diff --git a/bootscripts/cblfs/init.d/sshd b/bootscripts/cblfs/init.d/sshd
index 91041c6..a83e541 100644
--- a/bootscripts/cblfs/init.d/sshd
+++ b/bootscripts/cblfs/init.d/sshd
@@ -10,7 +10,7 @@
. /etc/sysconfig/rc
. $rc_functions
-pidfile=/var/run/sshd.pid
+pidfile=/run/sshd.pid
case "$1" in
start)
diff --git a/bootscripts/cblfs/init.d/winbind b/bootscripts/cblfs/init.d/winbind
index 590fddf..11e5486 100644
--- a/bootscripts/cblfs/init.d/winbind
+++ b/bootscripts/cblfs/init.d/winbind
@@ -10,7 +10,7 @@
. /etc/sysconfig/rc
. $rc_functions
-PIDFILE="/var/run/winbindd.pid"
+PIDFILE="/run/winbindd.pid"
KILLDELAY="10"
case "$1" in
diff --git a/bootscripts/cblfs/sysconfig/autofs.conf b/bootscripts/cblfs/sysconfig/autofs.conf
index ac28289..37c4404 100644
--- a/bootscripts/cblfs/sysconfig/autofs.conf
+++ b/bootscripts/cblfs/sysconfig/autofs.conf
@@ -16,7 +16,7 @@
automount=/sbin/automount
localoptions=''
daemonoptions='--timeout 60'
-piddir=/var/run
+piddir=/run
pidroot=autofs
# END
diff --git a/bootscripts/cblfs/sysconfig/network-devices/services/dhcpcd b/bootscripts/cblfs/sysconfig/network-devices/services/dhcpcd
index 6fb1df7..a8c1829 100644
--- a/bootscripts/cblfs/sysconfig/network-devices/services/dhcpcd
+++ b/bootscripts/cblfs/sysconfig/network-devices/services/dhcpcd
@@ -9,7 +9,7 @@
. $rc_functions
. $IFCONFIG
-pidfile="/var/run/dhcpcd-$1.pid"
+pidfile="/run/dhcpcd-$1.pid"
case "$2" in
up)
diff --git a/bootscripts/clfs/init.d/cleanfs b/bootscripts/clfs/init.d/cleanfs
index 4c4973d..ee5cc87 100644
--- a/bootscripts/clfs/init.d/cleanfs
+++ b/bootscripts/clfs/init.d/cleanfs
@@ -78,10 +78,10 @@ case "${1}" in
find . -xdev -mindepth 1 ! -name lost+found \
-delete || failed=1
- > /var/run/utmp
+ > /run/utmp
if grep -q '^utmp:' /etc/group ; then
- chmod 664 /var/run/utmp
- chgrp utmp /var/run/utmp
+ chmod 664 /run/utmp
+ chgrp utmp /run/utmp
fi
(exit ${failed})
diff --git a/bootscripts/clfs/init.d/functions b/bootscripts/clfs/init.d/functions
index 69ac37d..079554b 100644
--- a/bootscripts/clfs/init.d/functions
+++ b/bootscripts/clfs/init.d/functions
@@ -417,9 +417,9 @@ statusproc()
${ECHO} -e "${INFO}${base} is running with Process"\
"ID(s) ${pidlist}.${NORMAL}"
else
- if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
+ if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
${ECHO} -e "${WARNING}${1} is not running but"\
- "/var/run/${base}.pid exists.${NORMAL}"
+ "/run/${base}.pid exists.${NORMAL}"
else
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
${ECHO} -e "${WARNING}${1} is not running"\
diff --git a/bootscripts/clfs/init.d/functions.minimal b/bootscripts/clfs/init.d/functions.minimal
index 000b96b..6174ca2 100644
--- a/bootscripts/clfs/init.d/functions.minimal
+++ b/bootscripts/clfs/init.d/functions.minimal
@@ -417,9 +417,9 @@ statusproc()
${ECHO} -e "${INFO}${base} is running with Process"\
"ID(s) ${pidlist}.${NORMAL}"
else
- if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
+ if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
${ECHO} -e "${WARNING}${1} is not running but"\
- "/var/run/${base}.pid exists.${NORMAL}"
+ "/run/${base}.pid exists.${NORMAL}"
else
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
${ECHO} -e "${WARNING}${1} is not running"\
-----------------------------------------------------------------------
Summary of changes:
boot-scripts/CHANGELOG.lfs | 2 +-
boot-scripts/Changelog | 3 +++
boot-scripts/clfs/init.d/cleanfs | 6 +++---
boot-scripts/clfs/init.d/functions | 4 ++--
bootscripts/CHANGELOG.lfs | 2 +-
bootscripts/Changelog | 3 +++
bootscripts/cblfs/init.d/autofs | 2 +-
bootscripts/cblfs/init.d/dbus | 4 ++--
bootscripts/cblfs/init.d/gdm | 2 +-
bootscripts/cblfs/init.d/gpm | 2 +-
bootscripts/cblfs/init.d/haldaemon | 2 +-
bootscripts/cblfs/init.d/heimdal | 12 ++++++------
bootscripts/cblfs/init.d/nfs-server | 4 ++--
bootscripts/cblfs/init.d/ntp | 2 +-
bootscripts/cblfs/init.d/samba | 4 ++--
bootscripts/cblfs/init.d/sshd | 2 +-
bootscripts/cblfs/init.d/winbind | 2 +-
bootscripts/cblfs/sysconfig/autofs.conf | 2 +-
.../sysconfig/network-devices/services/dhcpcd | 2 +-
bootscripts/clfs/init.d/cleanfs | 6 +++---
bootscripts/clfs/init.d/functions | 4 ++--
bootscripts/clfs/init.d/functions.minimal | 4 ++--
22 files changed, 41 insertions(+), 35 deletions(-)
hooks/post-receive
--
Bootscripts for Cross-LFS
More information about the Clfs-commits
mailing list