| 1 |
aidecoe 13/10/02 21:13:08 |
| 2 |
|
| 3 |
Added: |
| 4 |
033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch |
| 5 |
033-0004-Install-dracut-install-into-libexec-di.patch |
| 6 |
Log: |
| 7 |
Fixes bug #485204 and bug #485218. |
| 8 |
|
| 9 |
Thanks to Alexander Tsoy <alexander@××××.me> for suggestions on bug #485204. |
| 10 |
|
| 11 |
Thanks to Steven Newbury <s_j_newbury@××××××××.uk> for good suggestions on |
| 12 |
bug #485218. Patch installing dracut-install to /usr/libexec has been |
| 13 |
submitted upstream. |
| 14 |
|
| 15 |
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5) |
| 16 |
|
| 17 |
Revision Changes Path |
| 18 |
1.1 sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch |
| 19 |
|
| 20 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch?rev=1.1&view=markup |
| 21 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch?rev=1.1&content-type=text/plain |
| 22 |
|
| 23 |
Index: 033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch |
| 24 |
=================================================================== |
| 25 |
From 7e5b656e5880242b57bda6bf2f0ee8d4c5eb3292 Mon Sep 17 00:00:00 2001 |
| 26 |
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
| 27 |
Date: Wed, 2 Oct 2013 22:37:09 +0200 |
| 28 |
Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with |
| 29 |
configure script |
| 30 |
|
| 31 |
Makefile alters destination main dracut script and sets dracutbasedir to |
| 32 |
the value of pkglibdir set in configure. |
| 33 |
--- |
| 34 |
Makefile | 3 +++ |
| 35 |
dracut.sh | 9 ++++----- |
| 36 |
2 files changed, 7 insertions(+), 5 deletions(-) |
| 37 |
|
| 38 |
diff --git a/Makefile b/Makefile |
| 39 |
index 124a41b..ea504f5 100644 |
| 40 |
--- a/Makefile |
| 41 |
+++ b/Makefile |
| 42 |
@@ -91,6 +91,9 @@ install: dracut-version.sh |
| 43 |
mkdir -p $(DESTDIR)$(pkglibdir)/modules.d |
| 44 |
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
| 45 |
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
| 46 |
+ sed -r \ |
| 47 |
+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
| 48 |
+ -i $(DESTDIR)$(bindir)/dracut |
| 49 |
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
| 50 |
install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd |
| 51 |
install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
| 52 |
diff --git a/dracut.sh b/dracut.sh |
| 53 |
index bd905e3..768b76d 100755 |
| 54 |
--- a/dracut.sh |
| 55 |
+++ b/dracut.sh |
| 56 |
@@ -26,10 +26,13 @@ |
| 57 |
# store for logging |
| 58 |
dracut_args=( "$@" ) |
| 59 |
|
| 60 |
+# base dirs |
| 61 |
+pkglibdir=/usr/lib/dracut |
| 62 |
+dracutbasedir="$pkglibdir" |
| 63 |
+ |
| 64 |
set -o pipefail |
| 65 |
|
| 66 |
usage() { |
| 67 |
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| 68 |
if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
| 69 |
. $dracutbasedir/dracut-version.sh |
| 70 |
fi |
| 71 |
@@ -54,7 +57,6 @@ EOF |
| 72 |
} |
| 73 |
|
| 74 |
long_usage() { |
| 75 |
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| 76 |
if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
| 77 |
. $dracutbasedir/dracut-version.sh |
| 78 |
fi |
| 79 |
@@ -542,8 +544,6 @@ export DRACUT_LOG_LEVEL=warning |
| 80 |
debug=yes |
| 81 |
} |
| 82 |
|
| 83 |
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| 84 |
- |
| 85 |
# if we were not passed a config file, try the default one |
| 86 |
if [[ ! -f $conffile ]]; then |
| 87 |
if [[ $allowlocal ]]; then |
| 88 |
@@ -660,7 +660,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) |
| 89 |
[[ $use_fstab_l ]] && use_fstab=$use_fstab_l |
| 90 |
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l |
| 91 |
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l |
| 92 |
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| 93 |
[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" |
| 94 |
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l" |
| 95 |
[[ $tmpdir ]] || tmpdir=/var/tmp |
| 96 |
-- |
| 97 |
1.8.3.2 |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.1 sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch?rev=1.1&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch?rev=1.1&content-type=text/plain |
| 106 |
|
| 107 |
Index: 033-0004-Install-dracut-install-into-libexec-di.patch |
| 108 |
=================================================================== |
| 109 |
From ddde4cb83f5f7bd5e4b4e7d8d094c3d8dbd59211 Mon Sep 17 00:00:00 2001 |
| 110 |
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
| 111 |
Date: Wed, 2 Oct 2013 22:40:43 +0200 |
| 112 |
Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib |
| 113 |
dir |
| 114 |
|
| 115 |
dracut-install script is the only thing ABI specific atm. |
| 116 |
|
| 117 |
See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the |
| 118 |
problem. |
| 119 |
--- |
| 120 |
Makefile | 4 +++- |
| 121 |
configure | 1 + |
| 122 |
dracut-functions.sh | 4 ++++ |
| 123 |
dracut.sh | 1 + |
| 124 |
4 files changed, 9 insertions(+), 1 deletion(-) |
| 125 |
|
| 126 |
diff --git a/Makefile b/Makefile |
| 127 |
index ea504f5..e004a79 100644 |
| 128 |
--- a/Makefile |
| 129 |
+++ b/Makefile |
| 130 |
@@ -92,6 +92,7 @@ install: dracut-version.sh |
| 131 |
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
| 132 |
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
| 133 |
sed -r \ |
| 134 |
+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ |
| 135 |
-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
| 136 |
-i $(DESTDIR)$(bindir)/dracut |
| 137 |
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
| 138 |
@@ -135,7 +136,8 @@ endif |
| 139 |
done \ |
| 140 |
fi |
| 141 |
if [ -f install/dracut-install ]; then \ |
| 142 |
- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ |
| 143 |
+ mkdir -p $(DESTDIR)$(libexecdir); \ |
| 144 |
+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ |
| 145 |
fi |
| 146 |
mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d |
| 147 |
install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install |
| 148 |
diff --git a/configure b/configure |
| 149 |
index 19b5e1f..d2ffc2c 100755 |
| 150 |
--- a/configure |
| 151 |
+++ b/configure |
| 152 |
@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} |
| 153 |
mandir ?= ${mandir:-${prefix}/share/man} |
| 154 |
enable_documentation ?= ${enable_documentation:-yes} |
| 155 |
bindir ?= ${bindir:-${prefix}/bin} |
| 156 |
+libexecdir ?= ${libexecdir:-${prefix}/libexec} |
| 157 |
EOF |
| 158 |
|
| 159 |
{ |
| 160 |
diff --git a/dracut-functions.sh b/dracut-functions.sh |
| 161 |
index b5eca31..d6489d6 100755 |
| 162 |
--- a/dracut-functions.sh |
| 163 |
+++ b/dracut-functions.sh |
| 164 |
@@ -694,6 +694,10 @@ if ! [[ $DRACUT_INSTALL ]]; then |
| 165 |
DRACUT_INSTALL=$(find_binary dracut-install) |
| 166 |
fi |
| 167 |
|
| 168 |
+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then |
| 169 |
+ DRACUT_INSTALL=$libexecdir/dracut-install |
| 170 |
+fi |
| 171 |
+ |
| 172 |
if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then |
| 173 |
DRACUT_INSTALL=$dracutbasedir/dracut-install |
| 174 |
fi |
| 175 |
diff --git a/dracut.sh b/dracut.sh |
| 176 |
index 768b76d..066d9d6 100755 |
| 177 |
--- a/dracut.sh |
| 178 |
+++ b/dracut.sh |
| 179 |
@@ -27,6 +27,7 @@ |
| 180 |
dracut_args=( "$@" ) |
| 181 |
|
| 182 |
# base dirs |
| 183 |
+libexecdir=/usr/libexec |
| 184 |
pkglibdir=/usr/lib/dracut |
| 185 |
dracutbasedir="$pkglibdir" |
| 186 |
|
| 187 |
-- |
| 188 |
1.8.3.2 |
Archives