| From 6660721bd34b7a25026ffc6a6df4cdfdc8742ed3 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> |
| Date: Wed, 2 Oct 2013 22:37:09 +0200 |
| Subject: [PATCH 4/5] Use the same paths in dracut.sh as those set with |
| configure script |
| |
| Makefile alters destination main dracut script and sets dracutbasedir to |
| the value of pkglibdir set in configure. |
| --- |
| Makefile | 3 +++ |
| dracut.sh | 9 ++++----- |
| 2 files changed, 7 insertions(+), 5 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index 124a41b..ea504f5 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -91,6 +91,9 @@ install: dracut-version.sh |
| mkdir -p $(DESTDIR)$(pkglibdir)/modules.d |
| mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
| install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
| + sed -r \ |
| + -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
| + -i $(DESTDIR)$(bindir)/dracut |
| install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
| install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd |
| install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
| diff --git a/dracut.sh b/dracut.sh |
| index d9533dd..cf18c81 100755 |
| --- a/dracut.sh |
| +++ b/dracut.sh |
| @@ -26,10 +26,13 @@ |
| # store for logging |
| dracut_args=( "$@" ) |
| |
| +# base dirs |
| +pkglibdir=/usr/lib/dracut |
| +dracutbasedir="$pkglibdir" |
| + |
| set -o pipefail |
| |
| usage() { |
| - [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
| . $dracutbasedir/dracut-version.sh |
| fi |
| @@ -54,7 +57,6 @@ EOF |
| } |
| |
| long_usage() { |
| - [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
| . $dracutbasedir/dracut-version.sh |
| fi |
| @@ -549,8 +551,6 @@ export DRACUT_LOG_LEVEL=warning |
| debug=yes |
| } |
| |
| -[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| - |
| # if we were not passed a config file, try the default one |
| if [[ ! -f $conffile ]]; then |
| if [[ $allowlocal ]]; then |
| @@ -669,7 +669,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) |
| [[ $use_fstab_l ]] && use_fstab=$use_fstab_l |
| [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l |
| [[ $lvmconf_l ]] && lvmconf=$lvmconf_l |
| -[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
| [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" |
| [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" |
| [[ $tmpdir ]] || tmpdir=/var/tmp |
| -- |
| 1.8.3.2 |
| |