packages: dracut/dracut.spec, dracut/bash-sh.patch (NEW)=?UTF-8?Q?=20?=- dracut doesn't p...

[baggins]

Author: baggins                      Date: Wed Mar 21 22:54:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dracut doesn't play with mksh which is /bin/sh in PLD, so force bash

---- Files affected:
packages/dracut:
   dracut.spec (1.7 -> 1.8) , bash-sh.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dracut/dracut.spec
diff -u packages/dracut/dracut.spec:1.7 packages/dracut/dracut.spec:1.8
--- packages/dracut/dracut.spec:1.7	Wed Mar 21 23:04:00 2012
+++ packages/dracut/dracut.spec	Wed Mar 21 23:54:46 2012
@@ -2,7 +2,7 @@
 Summary:	Initramfs generator using udev
 Name:		dracut
 Version:	017
-Release:	0.3
+Release:	0.5
 License:	GPL v2+
 Group:		Base
 Source0:	ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -10,6 +10,7 @@
 Source1:	pld.conf
 Patch0:		no-rh.patch
 Patch1:		create-target-dir-for-symlink.patch
+Patch2:		bash-sh.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libxslt-progs
@@ -96,6 +97,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make}
@@ -149,6 +151,8 @@
 %attr(755,root,root) %{dracutlibdir}/modules.d/00bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/00dash
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
+%dir %{dracutlibdir}/modules.d/01bash
+%attr(755,root,root) %{dracutlibdir}/modules.d/01bash/*.sh
 %dir %{dracutlibdir}/modules.d/05busybox
 %attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh
 %dir %{dracutlibdir}/modules.d/10i18n
@@ -299,6 +303,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/03/21 22:54:46  baggins
+- dracut doesn't play with mksh which is /bin/sh in PLD, so force bash
+
 Revision 1.7  2012/03/21 22:04:00  baggins
 - verbose files, fix attr
 

================================================================
Index: packages/dracut/bash-sh.patch
diff -u /dev/null packages/dracut/bash-sh.patch:1.1
--- /dev/null	Wed Mar 21 23:54:51 2012
+++ packages/dracut/bash-sh.patch	Wed Mar 21 23:54:46 2012
@@ -0,0 +1,21 @@
+--- /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"
++}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dracut/dracut.spec?r1=1.7&r2=1.8