[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b8e2d10888412cbe37b0614e88fc739732305c79 - IPFire-SCM

12 Jan 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 "IPFire 2.x development tree".
The branch, next has been updated
       via  b8e2d10888412cbe37b0614e88fc739732305c79 (commit)
      from  4ec728f840372f61d61c5019d766f453231eb706 (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 b8e2d10888412cbe37b0614e88fc739732305c79
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Jan 12 12:15:44 2014 +0100
fifteen: move /var/run to /run.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/cyrus-sasl                       |  1 -
 config/rootfiles/common/stage2                           |  1 -
 config/rootfiles/core/76/update.sh                       | 13 +++++++++++++
 lfs/Config                                               |  2 +-
 lfs/dracut                                               |  2 +-
 lfs/stage2                                               | 16 ++++++++--------
 src/initscripts/init.d/mountkernfs                       |  5 +++++
 src/install+setup/install/main.c                         |  3 +--
 ...dd_run_symlink.patch => dracut-006_add_run_dir.patch} |  4 ++--
 9 files changed, 31 insertions(+), 16 deletions(-)
 rename src/patches/{dracut-006_add_run_symlink.patch => dracut-006_add_run_dir.patch} (90%)
Difference in files:

diff --git a/config/rootfiles/common/cyrus-sasl b/config/rootfiles/common/cyrus-sasl
index 287ef37..08a7321 100644
--- a/config/rootfiles/common/cyrus-sasl
+++ b/config/rootfiles/common/cyrus-sasl
@@ -87,4 +87,3 @@ usr/sbin/saslpasswd2
 #usr/share/man/man8/sasldblistusers2.8
 #usr/share/man/man8/saslpasswd2.8
 var/lib/sasl
-var/run/saslauthd
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 114592a..4286cec 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -152,7 +152,6 @@ var/log/wtmp
 var/mail
 #var/opt
 var/run
-var/run/utmp
 #var/spool
 var/tmp
 dev/console
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index f41f5f3..8d55152 100644
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -179,6 +179,19 @@ for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do
    mv $i $i.conf
 done
+# Move /var/run to /run.
+if [ -L "/run" ]; then
+	rm -f /run
+fi
+
+mkdir -p /run
+if mountpoint /var/run; then
+	mount --move /var/run /run
+	rm -rf /var/run
+fi
+
+ln -svf ../run /var/run
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
diff --git a/lfs/Config b/lfs/Config
index b9c0fb6..fb0f2e9 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -68,7 +68,7 @@ KGCC = gcc
 #
 define FIND_FILES
    cd $(ROOT)/ && find -mount \
-	-not -path './tools*' -not -path './tmp*' -not -path './usr/src*' \
+	-not -path './tools*' -not -path './tmp*' -not -path './usr/src*' -not -path './run/*' \
    -not -path './dev*' -not -path './proc*' -not -path './install*' | sort
 endef
diff --git a/lfs/dracut b/lfs/dracut
index 7b0cd8a..aacf747 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_add_run_symlink.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_add_run_dir.patch
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_scsi_wait.patch
cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .
diff --git a/lfs/stage2 b/lfs/stage2
index 3c4a8e4..3d64f68 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -49,7 +49,7 @@ $(TARGET) :
    @$(PREBUILD)
# Create directories
-	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt}
+	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt,run}
    -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
    -install -dv -m 0750 /root
    -install -dv -m 1777 /tmp /var/tmp
@@ -60,6 +60,9 @@ $(TARGET) :
    #-for dir in /usr /usr/local; do \
    #  ln -sv share/{man,doc,info} $$dir; \
    #done
+
+	# Symlink /var/run -> /run.
+	ln -svf ../run /var/run
    
    # Symlinks
    # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
@@ -103,16 +106,13 @@ $(TARGET) :
    chown -R nobody:nobody /home/nobody
# Create /var dirs and files
-	-mkdir -v /var/{lock,log,mail,run,spool,empty}
+	-mkdir -v /var/{lock,log,mail,spool,empty}
    -mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
    -mkdir -pv /var/log/{counter,calamaris}
    chown nobody.nobody /var/log/calamaris
-	touch /var/run/utmp /var/log/{btmp,lastlog,wtmp,net-traffic.log}
-	chgrp -v utmp /var/run/utmp /var/log/lastlog
-	chmod -v 664 /var/run/utmp /var/log/lastlog
-
-	# Create /run symlink
-	ln -s /var/run /run
+	touch /var/log/{btmp,lastlog,wtmp,net-traffic.log}
+	chgrp -v utmp /var/log/lastlog
+	chmod -v 664 /var/log/lastlog
# Permissions
    chmod 0711 /var/empty
diff --git a/src/initscripts/init.d/mountkernfs b/src/initscripts/init.d/mountkernfs
index 9cbceb4..6ea2d18 100644
--- a/src/initscripts/init.d/mountkernfs
+++ b/src/initscripts/init.d/mountkernfs
@@ -29,6 +29,11 @@ case "${1}" in
    		mount -n -t sysfs /sys /sys || failed=1
    	fi
+		if ! mountpoint /run &> /dev/null; then
+			boot_mesg -n " /run" ${NORMAL}
+			mount -n -t tmpfs,nosuid,nodev,mode=755 /run /run || failed=1
+		fi
+
    	boot_mesg "" ${NORMAL}
(exit ${failed})
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 6bd2e22..52b5c8c 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -433,8 +433,7 @@ int main(int argc, char *argv[])
    mkdir("/harddisk/boot", S_IRWXU|S_IRWXG|S_IRWXO);
    mkdir("/harddisk/var", S_IRWXU|S_IRWXG|S_IRWXO);
    mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
-	mkdir("/harddisk/var/run", S_IRWXU|S_IRWXG|S_IRWXO);
-	
+
    snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode_part);
    if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
    {
diff --git a/src/patches/dracut-006_add_run_dir.patch b/src/patches/dracut-006_add_run_dir.patch
new file mode 100644
index 0000000..08063f8
--- /dev/null
+++ b/src/patches/dracut-006_add_run_dir.patch
@@ -0,0 +1,13 @@
+diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init
+--- dracut-006.org/modules.d/99base/init	2010-06-17 10:46:29.000000000 +0200
++++ dracut-006/modules.d/99base/init	2013-10-31 16:51:17.658771341 +0100
+@@ -87,6 +87,9 @@
+ 
+ ln -s /proc/self/fd /dev/fd >/dev/null 2>&1
+ 
++# create run dir
++mkdir run
++
+ if getarg rdinitdebug; then
+     getarg quiet && DRACUT_QUIET="yes"
+     mkfifo /dev/initlog.pipe
diff --git a/src/patches/dracut-006_add_run_symlink.patch b/src/patches/dracut-006_add_run_symlink.patch
deleted file mode 100644
index abe029f..0000000
--- a/src/patches/dracut-006_add_run_symlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init
---- dracut-006.org/modules.d/99base/init	2010-06-17 10:46:29.000000000 +0200
-+++ dracut-006/modules.d/99base/init	2013-10-31 16:51:17.658771341 +0100
-@@ -87,6 +87,9 @@
- 
- ln -s /proc/self/fd /dev/fd >/dev/null 2>&1
- 
-+# Add run symlink
-+ln -s /var/run /run
-+
- if getarg rdinitdebug; then
-     getarg quiet && DRACUT_QUIET="yes"
-     mkfifo /dev/initlog.pipe
hooks/post-receive
--
IPFire 2.x development tree

    