From 6d5d063d90dec6a3d3dc9867cc9533c7923c6f25 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Feb 02 2012 18:21:05 +0000 Subject: update to latest git --- diff --git a/0080-30convertfs-convertfs.sh-fix-check-for-var-run-and-v.patch b/0080-30convertfs-convertfs.sh-fix-check-for-var-run-and-v.patch new file mode 100644 index 0000000..a4e9729 --- /dev/null +++ b/0080-30convertfs-convertfs.sh-fix-check-for-var-run-and-v.patch @@ -0,0 +1,30 @@ +From 61ad49e7d33a89e8ca4d604c2da5ff69c2548bdc Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 2 Feb 2012 19:18:48 +0100 +Subject: [PATCH] 30convertfs/convertfs.sh: fix check for /var/run and + /var/lock + +--- + modules.d/30convertfs/convertfs.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh +index 6c76a4c..eaeb8e4 100755 +--- a/modules.d/30convertfs/convertfs.sh ++++ b/modules.d/30convertfs/convertfs.sh +@@ -160,13 +160,13 @@ if [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/fil + /usr/sbin/setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || : + fi + +-if [ -d $ROOT/var/run ]; then ++if [ ! -L $ROOT/var/run ]; then + echo "Converting /var/run to symlink" + mv -f $ROOT/var/run $ROOT/var/run.runmove~ + ln -sfn ../run $ROOT/var/run + fi + +-if [ -d $ROOT/var/lock ]; then ++if [ ! -L $ROOT/var/lock ]; then + echo "Converting /var/lock to symlink" + mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~ + ln -sfn ../run/lock $ROOT/var/lock diff --git a/dracut.spec b/dracut.spec index 3cff6a7..35bba8d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 014 -Release: 80.git20120202%{?dist} +Release: 81.git20120202%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} > 6 @@ -103,6 +103,7 @@ Patch76: 0076-fix-kernel-modules-search-for-s390.patch Patch77: 0077-30usrmove-usrmove-convert.sh-do-not-force-selinux-au.patch Patch78: 0078-dracut-functions-install-nosegneg-libs-additionally-.patch Patch79: 0079-renamed-usrmove-to-convertfs.patch +Patch80: 0080-30convertfs-convertfs.sh-fix-check-for-var-run-and-v.patch BuildArch: noarch @@ -387,6 +388,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Thu Feb 02 2012 Harald Hoyer 014-81.git20120202 +- update to latest git + * Thu Feb 02 2012 Harald Hoyer 014-80.git20120202 - update to latest git