[packages/dracut] - remove 01bash module, it's packaged by upstream now as 00bash, and duplicate causes bash not to
baggins
baggins at pld-linux.org
Fri Aug 30 20:28:41 CEST 2013
commit 5f14e9c248dc77f13f119aa80105a198ecc83611
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Aug 30 20:27:51 2013 +0200
- remove 01bash module, it's packaged by upstream now as 00bash,
and duplicate causes bash not to be included in initramfs
- rel 2
bash-sh.patch | 21 ---------------------
dracut.spec | 6 +-----
2 files changed, 1 insertion(+), 26 deletions(-)
---
diff --git a/dracut.spec b/dracut.spec
index 02f098c..6c2d485 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,13 +2,12 @@ Summary: Initramfs generator using udev
Summary(pl.UTF-8): Generator initramfs wykorzystujący udev
Name: dracut
Version: 032
-Release: 1
+Release: 2
License: GPL v2+
Group: Base
Source0: http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
# Source0-md5: 3e74a9429ea22bf4e92bf59c4ccdfe75
Source1: pld.conf
-Patch0: bash-sh.patch
Patch1: plymouth-libexec.patch
Patch2: os-release.patch
Patch3: plymouth-logo.patch
@@ -189,7 +188,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -261,8 +259,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
%dir %{dracutlibdir}/modules.d/00systemd-bootchart
%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
-%dir %{dracutlibdir}/modules.d/01bash
-%attr(755,root,root) %{dracutlibdir}/modules.d/01bash/*.sh
%dir %{dracutlibdir}/modules.d/03modsign
%attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
%dir %{dracutlibdir}/modules.d/03rescue
diff --git a/bash-sh.patch b/bash-sh.patch
deleted file mode 100644
index 6edda11..0000000
--- a/bash-sh.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- /dev/null 2012-03-21 19:30:19.123295831 +0100
-+++ dracut-017/modules.d/01bash/module-setup.sh 2012-03-21 23:46:14.717134386 +0100
-@@ -0,0 +1,18 @@
-+#!/bin/bash
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+
-+check() {
-+ return 0
-+}
-+
-+depends() {
-+ return 0
-+}
-+
-+install() {
-+ # If another shell is already installed, do not use bash
-+ [[ -x $initdir/bin/sh ]] && return
-+
-+ inst /bin/bash && ln -sf bash "${initdir}/bin/sh"
-+}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/5f14e9c248dc77f13f119aa80105a198ecc83611
More information about the pld-cvs-commit
mailing list