[patch] 0001-Install-skipcpio-into-libexec-dir-instead-of-lib-dir.patch

0001-Install-skipcpio-into-libexec-dir-instead-of-lib-dir.patch (text/plain), 1.81 KB, created by Alexander Tsoy on 2014-11-17 18:25:17 UTC

From 3caad8b1c2e84e983942b69de89b12c434da5920 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <[e-mail]>
Date: Mon, 17 Nov 2014 20:28:46 +0300
Subject: [PATCH] Install skipcpio into libexec dir instead of lib dir
To: <[e-mail]>

---
 Makefile                    | 2 +-
 dracut-initramfs-restore.sh | 2 +-
 lsinitrd.sh                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index af61faf..fae536b 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,7 @@ endif
 		install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
 	fi
 	if [ -f skipcpio/skipcpio ]; then \
-		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
+		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(libexecdir)/skipcpio; \
 	fi
 	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
 	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 8b30af1..5bb299a 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -5,7 +5,7 @@ set -e
 KERNEL_VERSION="$(uname -r)"
 
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-SKIP="$dracutbasedir/skipcpio"
+SKIP="$libexecdir/skipcpio"
 [[ -x $SKIP ]] || SKIP=cat
 
 [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
diff --git a/lsinitrd.sh b/lsinitrd.sh
index 4f12c2c..f84e96b 100755
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -158,7 +158,7 @@ case $bin in
                 echo "Early CPIO image"
                 list_files
             fi
-            SKIP="$dracutbasedir/skipcpio"
+            SKIP="$libexecdir/skipcpio"
             if ! [[ -x $SKIP ]]; then
                 echo
                 echo "'$SKIP' not found, cannot display remaining contents!" >&2
-- 
2.0.4