[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5b71042c5426855ee58a56d16d11a4cc5d0f5253

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5b71042c5426855ee58a56d16d11a4cc5d0f5253

[git]

[-- Attachment #1: Type: text/plain, Size: 5199 bytes --]

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 "IPFire 2.x development tree".

The branch, master has been updated
       via  5b71042c5426855ee58a56d16d11a4cc5d0f5253 (commit)
       via  e055b1105a1251dc3862b599e86a691c20141728 (commit)
      from  261624fb991083f07246e2d3d7a24b2d1ff18c35 (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 5b71042c5426855ee58a56d16d11a4cc5d0f5253
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jul 17 16:03:08 2014 +0200

    cleanfs: repair /var/run symlink to /run if it not exist.

commit e055b1105a1251dc3862b599e86a691c20141728
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jul 17 15:54:35 2014 +0200

    rootfiles: remove /var/run/... from packages.
    
    this will destroy a symlink to /run and is a ramdisk so
    content is removed on every boot and it make no sense to
    package it.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/80/filelists/files | 1 +
 config/rootfiles/packages/asterisk       | 2 +-
 config/rootfiles/packages/clamav         | 2 +-
 config/rootfiles/packages/cups           | 4 ++--
 config/rootfiles/packages/dbus           | 2 +-
 config/rootfiles/packages/mysql          | 2 +-
 config/rootfiles/packages/vdradmin       | 2 +-
 src/initscripts/init.d/cleanfs           | 7 +++++++
 8 files changed, 15 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
index 753c38d..822baa2 100644
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/logrotate.conf
+etc/rc.d/init.d/cleanfs
 etc/rc.d/init.d/dhcrelay
 etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/networking/red.up/30-ddns
diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index f7b6cde..1b0eb9d 100644
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -2706,7 +2706,7 @@ var/lib/asterisk/static-http/prototype.js
 var/log/asterisk/cdr-csv
 var/log/asterisk/cdr-custom
 var/log/asterisk/cel-custom
-var/run/asterisk
+#var/run/asterisk
 #var/spool/asterisk
 var/spool/asterisk/dictate
 var/spool/asterisk/meetme
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index c2aee7c..f3afd6b 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -41,6 +41,6 @@ var/ipfire/clamav/clamd.conf
 var/ipfire/clamav/clamd.conf.sample
 var/ipfire/clamav/freshclam.conf
 var/ipfire/clamav/freshclam.conf.sample
-var/run/clamav
+#var/run/clamav
 etc/rc.d/init.d/clamav
 usr/local/bin/clamavctrl
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 3acbcac..56ee1f2 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -936,7 +936,7 @@ var/ipfire/cups/ppd
 var/ipfire/cups/snmp.conf
 var/ipfire/cups/ssl
 var/log/cups
-var/run/cups
-var/run/cups/certs
+#var/run/cups
+#var/run/cups/certs
 var/spool/cups
 var/spool/cups/tmp
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index 2d31a13..b252653 100644
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -50,4 +50,4 @@ usr/share/dbus-1/services
 #usr/share/man/man1/dbus-send.1
 #usr/share/man/man1/dbus-uuidgen.1
 var/lib/dbus
-var/run/dbus
+#var/run/dbus
diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql
index 0beaca8..8f1414a 100644
--- a/config/rootfiles/packages/mysql
+++ b/config/rootfiles/packages/mysql
@@ -300,4 +300,4 @@ usr/share/mysql
 #usr/share/mysql/ukrainian
 #usr/share/mysql/ukrainian/errmsg.sys
 var/ipfire/backup/addons/includes/mysql
-var/run/mysql
+#var/run/mysql
diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
index 20ea7d5..3dba2a0 100644
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -182,4 +182,4 @@ etc/rc.d/rc3.d/S99vdradmin
 #usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
 var/cache/vdradmin
 var/log/vdradmin
-var/run/vdradmin
+#var/run/vdradmin
diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/init.d/cleanfs
index d526c35..e8c8c8b 100644
--- a/src/initscripts/init.d/cleanfs
+++ b/src/initscripts/init.d/cleanfs
@@ -71,6 +71,13 @@ create_files() {
 
 case "${1}" in
 	start)
+		if [[ ! -L "/var/run" ]]; then
+			boot_mesg "Repair /var/run symlink to /run..."
+			mv -u /var/run/* /run/ 2>&1 > /dev/null
+			rm -rf /var/run
+			ln -s ../run /var/run
+		fi
+
 		boot_mesg -n "Cleaning file systems:" ${INFO}
 
 		boot_mesg -n " /tmp" ${NORMAL}


hooks/post-receive
--
IPFire 2.x development tree