From: Marcin Krol Date: Sun, 11 May 2014 15:13:31 +0000 (+0000) Subject: - from PLD X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=b264e7996fa5021706ce40d68001c846b8b550a5;p=packages%2Fdracut.git - from PLD --- b264e7996fa5021706ce40d68001c846b8b550a5 diff --git a/arch-libdir.patch b/arch-libdir.patch new file mode 100644 index 0000000..00c3eec --- /dev/null +++ b/arch-libdir.patch @@ -0,0 +1,11 @@ +--- dracut-033/modules.d/95resume/module-setup.sh.orig 2013-09-15 18:27:32.700252837 +0200 ++++ dracut-033/modules.d/95resume/module-setup.sh 2013-09-15 18:30:44.410244789 +0200 +@@ -17,7 +17,7 @@ + install() { + local _bin + # Optional uswsusp support +- for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume ++ for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume + do + [[ -x "${_bin}" ]] && { + inst "${_bin}" /usr/sbin/resume diff --git a/dracut.spec b/dracut.spec new file mode 100644 index 0000000..55549f5 --- /dev/null +++ b/dracut.spec @@ -0,0 +1,459 @@ +Summary: Initramfs generator using udev +Summary(pl.UTF-8): Generator initramfs wykorzystujący udev +Name: dracut +Version: 037 +Release: 1 +License: GPL v2+ +Group: Base +Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz +# Source0-md5: 866982a7ab49e3e4442fe966eeff4111 +Source1: pld.conf +Patch1: plymouth-libexec.patch +Patch2: os-release.patch +Patch3: plymouth-logo.patch +Patch4: arch-libdir.patch +Patch5: systemd-paths.patch +Patch6: prelink-libs.patch +URL: https://dracut.wiki.kernel.org/ +BuildRequires: asciidoc +BuildRequires: dash +BuildRequires: docbook-dtd45-xml +BuildRequires: docbook-style-xsl +BuildRequires: libxslt-progs +Requires: bash +Requires: coreutils +Requires: cpio +Requires: filesystem +Requires: findutils +Requires: glibc-misc +Requires: grep +Requires: gzip +Requires: hardlink +Requires: sed +Requires: systemd-units +Requires: udev +Requires: util-linux >= 2.22.2-3 +Requires: vim-rt +Requires: vim-static +Requires: virtual(module-tools) +# disabled due to angry (bug)reports, because it changes well known +# net device names from ethX to emX or pXpY +#Suggests: biosdevname +Suggests: btrfs-progs +Suggests: busybox +Suggests: bzip2 +Suggests: cryptsetup +Suggests: dash +Suggests: device-mapper +Suggests: dmraid +Suggests: e2fsprogs +Suggests: gnupg +Suggests: kbd +Suggests: keyutils +Suggests: libselinux-utils +Suggests: losetup +Suggests: lvm2 +Suggests: mdadm +Suggests: multipath-tools +Suggests: plymouth +Suggests: suspend-utils +Suggests: syslogdaemon +Suggests: xfsprogs +Suggests: xz +Conflicts: kmod < 6 +Conflicts: systemd < 1:199 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define dracutlibdir %{_prefix}/lib/dracut + +%description +Dracut contains tools to create a bootable initramfs for 2.6 Linux +kernels. Unlike existing implementations, dracut does hard-code as +little as possible into the initramfs. Dracut contains various modules +which are driven by the event-based udev. Having root on MD, DM, LVM2, +LUKS is supported as well as NFS, iSCSI, NBD, FCoE with the +dracut-network package. + +%description -l pl.UTF-8 +Dracut zawiera narzędzia do tworzenia uruchamialnych obrazów initramfs +dla jąder Linuksa 2.6. W przeciwieństwie do wcześniejszych +implementacji, dracut zaszywa możliwie najmniej stałych w initramfs. +Zawiera różne moduły sterowane w oparciu o zdarzenia udev. Obsługiwane +jest przechowywanie głównego systemu plików na urządzeniach MD, DM, +LVM2, LUKS, a po doinstalowaniu pakietu dracut-network także poprzez +NFS, iSCSI, NBD, FCoE. + +%package network +Summary: Dracut modules to build a dracut initramfs with network support +Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs z obsługą sieci +Group: Base +Requires: %{name} = %{version}-%{release} +Requires: bridge-utils +Requires: dhcp-client +Requires: iproute2 +Requires: iputils-arping +Requires: iputils-ping +Requires: nbd +Requires: net-tools +Requires: nfs-utils-clients +Requires: open-iscsi +Requires: openssh-clients +Requires: rpcbind +Suggests: curl + +%description network +This package requires everything which is needed to build a generic +all purpose initramfs with network support with dracut. + +%description network -l pl.UTF-8 +Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu +dracuta zwykłych obrazów initramfs dowolnego przeznaczenia z obsługą +sieci. + +%package fips +Summary: Dracut modules to build a dracut initramfs with an integrity check +Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs z kontrolą spójności +Group: Base +Requires: %{name} = %{version}-%{release} +Requires: hmaccalc +Requires: nss-softokn-freebl + +%description fips +This package requires everything which is needed to build an all +purpose initramfs with dracut, which does an integrity check. + +%description fips -l pl.UTF-8 +Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu +dracuta obrazów initramfs dowolnego przeznaczenia, wykonujących +kontrolę własnej spójności. + +%package fips-aesni +Summary: Dracut modules to build a dracut initramfs with an integrity check with aesni-intel +Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs z kontrolą spójności przez aesni-intel +Group: Base +Requires: %{name}-fips = %{version}-%{release} + +%description fips-aesni +This package requires everything which is needed to build an all +purpose initramfs with dracut, which does an integrity check and adds +the aesni-intel kernel module. + +%description fips-aesni -l pl.UTF-8 +Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu +dracuta obrazów initramfs dowolnego przeznaczenia wykonujących +kontrolę własnej spójności z dodanym modułem jądra aesni-intel. + +%package caps +Summary: Dracut modules to build a dracut initramfs which drops capabilities +Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs zrzucającego uprawnienia +Group: Base +Requires: %{name} = %{version}-%{release} +Requires: libcap + +%description caps +This package requires everything which is needed to build an all +purpose initramfs with dracut, which drops capabilities. + +%description caps -l pl +Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu +dracuta obrazów initramfs dowolnego przeznaczenia zrzucających +uprawnienia. + +%package tools +Summary: Dracut tools to build the local initramfs +Summary(pl.UTF-8): Narzędzia Dracuta do tworzenia lokalnych initramfs +Group: Base +Requires: %{name} = %{version}-%{release} + +%description tools +This package contains tools to assemble the local initrd and host +configuration. + +%description tools -l pl.UTF-8 +Ten pakiet zawiera narzędzia do łączenia lokalnych initrd oraz +konfiguracji maszyn. + +%package -n bash-completion-dracut +Summary: bash-completion for dracut +Summary(pl.UTF-8): Bashowe dopełnianie składni dla polecenia dracut +Group: Applications/Shells +Requires: %{name} = %{version} +Requires: bash-completion >= 2.0 + +%description -n bash-completion-dracut +bash-completion for dracut. + +%description -n bash-completion-dracut -l pl.UTF-8 +Bashowe dopełnianie składni dla polecenia dracut. + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 + +%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh +%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh +find modules.d -name '*.orig' | xargs -r %{__rm} + +%build +%{__make} all doc \ + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \ + $RPM_BUILD_ROOT/var/{log,lib/{dracut/overlay,initramfs}} + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + libdir=%{_prefix}/lib \ + bindir=%{_bindir} \ + systemdsystemunitdir=%{systemdunitdir} \ + sysconfdir=%{_sysconfdir} \ + mandir=%{_mandir} + +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf +install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf +install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log + +echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh + +# create compat symlink +ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut + +# remove gentoo specific modules +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50gensplash + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc AUTHORS HACKING NEWS README* TODO dracut.html dracut.png dracut.svg +%dir %{_sysconfdir}/dracut.conf.d +%config(noreplace) %{_sysconfdir}/dracut.conf +%config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf +%config(noreplace) /etc/logrotate.d/dracut_log +# compat symlink +%attr(755,root,root) /sbin/dracut +%attr(755,root,root) %{_bindir}/dracut +%attr(755,root,root) %{_bindir}/mkinitrd +%attr(755,root,root) %{_bindir}/lsinitrd +%dir %{dracutlibdir} +%attr(755,root,root) %{dracutlibdir}/dracut-install +%dir %{dracutlibdir}/modules.d +%attr(755,root,root) %{dracutlibdir}/dracut-functions.sh +%attr(755,root,root) %{dracutlibdir}/dracut-functions +%attr(755,root,root) %{dracutlibdir}/dracut-logger.sh +%attr(755,root,root) %{dracutlibdir}/dracut-initramfs-restore +%dir %{dracutlibdir}/modules.d/00bash +%attr(755,root,root) %{dracutlibdir}/modules.d/00bash/module-setup.sh +%dir %{dracutlibdir}/modules.d/00bootchart +%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/00systemd-bootchart +%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh +%dir %{dracutlibdir}/modules.d/03modsign +%attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh +%dir %{dracutlibdir}/modules.d/03rescue +%attr(755,root,root) %{dracutlibdir}/modules.d/03rescue/module-setup.sh +%dir %{dracutlibdir}/modules.d/04watchdog +%attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh +%dir %{dracutlibdir}/modules.d/05busybox +%attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh +%dir %{dracutlibdir}/modules.d/10i18n +%{dracutlibdir}/modules.d/10i18n/README +%{dracutlibdir}/modules.d/10i18n/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh +%dir %{dracutlibdir}/modules.d/30convertfs +%attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh +%dir %{dracutlibdir}/modules.d/50drm +%attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh +%dir %{dracutlibdir}/modules.d/50plymouth +%attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh +%dir %{dracutlibdir}/modules.d/80cms +%attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh +%dir %{dracutlibdir}/modules.d/90btrfs +%{dracutlibdir}/modules.d/90btrfs/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh +%dir %{dracutlibdir}/modules.d/90crypt +%attr(755,root,root) %{dracutlibdir}/modules.d/90crypt/*.sh +%dir %{dracutlibdir}/modules.d/91crypt-loop +%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh +%dir %{dracutlibdir}/modules.d/90dm +%{dracutlibdir}/modules.d/90dm/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/90dm/*.sh +%dir %{dracutlibdir}/modules.d/90dmraid +%{dracutlibdir}/modules.d/90dmraid/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/90dmraid/*.sh +%dir %{dracutlibdir}/modules.d/90dmsquash-live +%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live/*.sh +%{dracutlibdir}/modules.d/90dmsquash-live/checkisomd5@.service +%dir %{dracutlibdir}/modules.d/90kernel-modules +%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh +%dir %{dracutlibdir}/modules.d/90lvm +%{dracutlibdir}/modules.d/90lvm/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/90lvm/*.sh +%dir %{dracutlibdir}/modules.d/90mdraid +%{dracutlibdir}/modules.d/90mdraid/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh +%dir %{dracutlibdir}/modules.d/90multipath +%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh +%dir %{dracutlibdir}/modules.d/90qemu +%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh +%dir %{dracutlibdir}/modules.d/91crypt-gpg +%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh +%dir %{dracutlibdir}/modules.d/95debug +%attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh +%dir %{dracutlibdir}/modules.d/95resume +%attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh +%dir %{dracutlibdir}/modules.d/95rootfs-block +%attr(755,root,root) %{dracutlibdir}/modules.d/95rootfs-block/*.sh +%dir %{dracutlibdir}/modules.d/95dasd +%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd/*.sh +%dir %{dracutlibdir}/modules.d/95dasd_mod +%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd_mod/*.sh +%dir %{dracutlibdir}/modules.d/95dasd_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd_rules/*.sh +%dir %{dracutlibdir}/modules.d/95fcoe-uefi +%attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh +%dir %{dracutlibdir}/modules.d/95fstab-sys +%attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh +%dir %{dracutlibdir}/modules.d/95zfcp +%attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh +%dir %{dracutlibdir}/modules.d/95zfcp_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp_rules/*.sh +%dir %{dracutlibdir}/modules.d/95terminfo +%attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh +%dir %{dracutlibdir}/modules.d/95udev-rules +%{dracutlibdir}/modules.d/95udev-rules/*.rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95udev-rules/*.sh +%dir %{dracutlibdir}/modules.d/95virtfs +%attr(755,root,root) %{dracutlibdir}/modules.d/95virtfs/*.sh +%dir %{dracutlibdir}/modules.d/96securityfs +%attr(755,root,root) %{dracutlibdir}/modules.d/96securityfs/*.sh +%dir %{dracutlibdir}/modules.d/97biosdevname +%attr(755,root,root) %{dracutlibdir}/modules.d/97biosdevname/*.sh +%dir %{dracutlibdir}/modules.d/97masterkey +%{dracutlibdir}/modules.d/97masterkey/README +%attr(755,root,root) %{dracutlibdir}/modules.d/97masterkey/*.sh +%dir %{dracutlibdir}/modules.d/98ecryptfs +%{dracutlibdir}/modules.d/98ecryptfs/README +%attr(755,root,root) %{dracutlibdir}/modules.d/98ecryptfs/*.sh +%dir %{dracutlibdir}/modules.d/98integrity +%{dracutlibdir}/modules.d/98integrity/README +%attr(755,root,root) %{dracutlibdir}/modules.d/98integrity/*.sh +%dir %{dracutlibdir}/modules.d/98pollcdrom +%attr(755,root,root) %{dracutlibdir}/modules.d/98pollcdrom/*.sh +%dir %{dracutlibdir}/modules.d/98selinux +%attr(755,root,root) %{dracutlibdir}/modules.d/98selinux/*.sh +%dir %{dracutlibdir}/modules.d/98syslog +%{dracutlibdir}/modules.d/98syslog/README +%{dracutlibdir}/modules.d/98syslog/rsyslog.conf +%attr(755,root,root) %{dracutlibdir}/modules.d/98syslog/*.sh +%dir %{dracutlibdir}/modules.d/98systemd +%{dracutlibdir}/modules.d/98systemd/*.service +%{dracutlibdir}/modules.d/98systemd/*.target +%attr(755,root,root) %{dracutlibdir}/modules.d/98systemd/*.sh +%doc %{dracutlibdir}/modules.d/98systemd/*.8* +%dir %{dracutlibdir}/modules.d/98usrmount +%attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh +%dir %{dracutlibdir}/modules.d/99base +%attr(755,root,root) %{dracutlibdir}/modules.d/99base/*.sh +%dir %{dracutlibdir}/modules.d/99fs-lib +%attr(755,root,root) %{dracutlibdir}/modules.d/99fs-lib/*.sh +%dir %{dracutlibdir}/modules.d/99img-lib +%attr(755,root,root) %{dracutlibdir}/modules.d/99img-lib/*.sh +%dir %{dracutlibdir}/modules.d/99shutdown +%attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh +%dir %{dracutlibdir}/modules.d/99uefi-lib +%attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh +%attr(755,root,root) %{dracutlibdir}/dracut-version.sh +%attr(755,root,root) %{dracutlibdir}/skipcpio + +%dir /var/lib/initramfs +%{systemdunitdir}/*.service +%{systemdunitdir}/*/*.service +%{_mandir}/man1/lsinitrd.1* +%{_mandir}/man5/dracut.conf.5* +%{_mandir}/man7/dracut.cmdline.7* +%{_mandir}/man7/dracut.kernel.7* +%{_mandir}/man7/dracut.modules.7* +%{_mandir}/man8/dracut.8* +%{_mandir}/man8/dracut-cmdline.service.8* +%{_mandir}/man8/dracut-initqueue.service.8* +%{_mandir}/man8/dracut-mount.service.8* +%{_mandir}/man8/dracut-pre-mount.service.8* +%{_mandir}/man8/dracut-pre-pivot.service.8* +%{_mandir}/man8/dracut-pre-trigger.service.8* +%{_mandir}/man8/dracut-pre-udev.service.8* +%{_mandir}/man8/dracut-shutdown.service.8* +%{_mandir}/man8/mkinitrd.8* +%{_mandir}/man7/dracut.bootup.7.gz + +#/usr/lib/kernel/install.d/50-dracut.install +#/usr/lib/kernel/install.d/51-dracut-rescue.install + +%files network +%defattr(644,root,root,755) +%dir %{dracutlibdir}/modules.d/40network +%{dracutlibdir}/modules.d/40network/dhclient.conf +%attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh +%dir %{dracutlibdir}/modules.d/45ifcfg +%attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh +%dir %{dracutlibdir}/modules.d/45url-lib +%attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh +%dir %{dracutlibdir}/modules.d/90livenet +%attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh +%dir %{dracutlibdir}/modules.d/90qemu-net +%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu-net/*.sh +%dir %{dracutlibdir}/modules.d/95cifs +%attr(755,root,root) %{dracutlibdir}/modules.d/95cifs/*.sh +%dir %{dracutlibdir}/modules.d/95fcoe +%attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe/*.sh +%dir %{dracutlibdir}/modules.d/95iscsi +%attr(755,root,root) %{dracutlibdir}/modules.d/95iscsi/*.sh +%dir %{dracutlibdir}/modules.d/95nbd +%attr(755,root,root) %{dracutlibdir}/modules.d/95nbd/*.sh +%dir %{dracutlibdir}/modules.d/95nfs +%attr(755,root,root) %{dracutlibdir}/modules.d/95nfs/*.sh +%dir %{dracutlibdir}/modules.d/95ssh-client +%attr(755,root,root) %{dracutlibdir}/modules.d/95ssh-client/*.sh +%dir %{dracutlibdir}/modules.d/95znet +%attr(755,root,root) %{dracutlibdir}/modules.d/95znet/*.sh + +%files fips +%defattr(644,root,root,755) +%dir %{dracutlibdir}/modules.d/01fips +%attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh +%config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf + +%files fips-aesni +%defattr(644,root,root,755) +%dir %{dracutlibdir}/modules.d/02fips-aesni +%attr(755,root,root) %{dracutlibdir}/modules.d/02fips-aesni/*.sh + +%files caps +%defattr(644,root,root,755) +%{dracutlibdir}/modules.d/02caps/README +%dir %{dracutlibdir}/modules.d/02caps +%attr(755,root,root) %{dracutlibdir}/modules.d/02caps/*.sh + +%files tools +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/dracut-catimages +%{_mandir}/man8/dracut-catimages.8* +%dir /boot/dracut +%dir /var/lib/dracut +%dir /var/lib/dracut/overlay + +%files -n bash-completion-dracut +%defattr(644,root,root,755) +%{_datadir}/bash-completion/completions/dracut +%{_datadir}/bash-completion/completions/lsinitrd diff --git a/os-release.patch b/os-release.patch new file mode 100644 index 0000000..8650197 --- /dev/null +++ b/os-release.patch @@ -0,0 +1,11 @@ +--- dracut-018/modules.d/50plymouth/plymouth-populate-initrd.sh~ 2012-04-05 13:54:38.000000000 +0200 ++++ dracut-018/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-04-27 13:04:05.676319178 +0200 +@@ -7,7 +7,7 @@ + inst /sbin/plymouthd /bin/plymouthd + dracut_install /bin/plymouth \ + "${PLYMOUTH_LOGO_FILE}" \ +- /etc/system-release ++ /etc/os-release + + mkdir -m 0755 -p "${initdir}/usr/share/plymouth" + diff --git a/pld.conf b/pld.conf new file mode 100644 index 0000000..b940a9c --- /dev/null +++ b/pld.conf @@ -0,0 +1,14 @@ +# Dracut config file customized for PLD. + +# i18n +i18n_vars="/etc/sysconfig/console:KEYTABLE-KEYMAP,CONSOLEFONT-FONT,CONSOLEMAP-FONT_MAP,CONSOLESCREENFONTMAP-FONT_UNIMAP" +install_items+=" vi /etc/vim/vimrc ps grep cat rm open " +stdloglvl=3 +systemdutildir=/lib/systemd +systemdsystemunitdir=/lib/systemd/system +udevdir=/lib/udev +kernel_cmdline="rd.auto=1" + +#add_dracutmodules+=" systemd systemd-bootchart " +# for systemd these modules do not make sense +#omit_dracutmodules+=" bootchart securityfs masterkey integrity selinux " diff --git a/plymouth-libexec.patch b/plymouth-libexec.patch new file mode 100644 index 0000000..fb35e63 --- /dev/null +++ b/plymouth-libexec.patch @@ -0,0 +1,18 @@ +--- dracut-027/modules.d/50plymouth/module-setup.sh.wiget 2013-03-27 22:56:48.855517817 +0100 ++++ dracut-027/modules.d/50plymouth/module-setup.sh 2013-03-27 22:59:42.251657247 +0100 +@@ -12,12 +12,12 @@ depends() { + } + + install() { +- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \ +- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then ++ if grep -q nash /usr/@lib@/plymouth/plymouth-populate-initrd \ ++ || [ ! -x /usr/@lib@/plymouth/plymouth-populate-initrd ]; then + . "$moddir"/plymouth-populate-initrd.sh + else + PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \ +- /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir" ++ /usr/@lib@/plymouth/plymouth-populate-initrd -t "$initdir" + fi + + inst_hook emergency 50 "$moddir"/plymouth-emergency.sh diff --git a/plymouth-logo.patch b/plymouth-logo.patch new file mode 100644 index 0000000..148428c --- /dev/null +++ b/plymouth-logo.patch @@ -0,0 +1,14 @@ +--- dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh.orig 2013-08-26 21:31:12.615640993 +0200 ++++ dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh 2013-08-27 15:35:36.416243854 +0200 +@@ -5,9 +5,10 @@ + PLYMOUTH_THEME=$(plymouth-set-default-theme) + + inst_multiple plymouthd plymouth \ +- "${PLYMOUTH_LOGO_FILE}" \ + /etc/os-release + ++[[ -f "${PLYMOUTH_LOGO_FILE}" ]] && inst_multiple "${PLYMOUTH_LOGO_FILE}" ++ + mkdir -m 0755 -p "${initdir}/usr/share/plymouth" + + inst_libdir_file "plymouth/text.so" "plymouth/details.so" diff --git a/prelink-libs.patch b/prelink-libs.patch new file mode 100644 index 0000000..0645766 --- /dev/null +++ b/prelink-libs.patch @@ -0,0 +1,15 @@ +--- dracut-034/dracut.sh.orig 2013-10-20 14:13:51.740264092 +0200 ++++ dracut-034/dracut.sh 2013-10-20 14:29:50.300223867 +0200 +@@ -1266,10 +1266,10 @@ + if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then + if [[ $DRACUT_FIPS_MODE ]]; then + dinfo "*** Installing prelink files ***" +- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache ++ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache + else + dinfo "*** Pre-linking files ***" +- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf ++ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf + chroot "$initdir" "$PRELINK_BIN" -a + rm -f -- "$initdir/$PRELINK_BIN" + rm -fr -- "$initdir"/etc/prelink.* diff --git a/systemd-paths.patch b/systemd-paths.patch new file mode 100644 index 0000000..6b0e335 --- /dev/null +++ b/systemd-paths.patch @@ -0,0 +1,22 @@ +--- dracut-026/modules.d/98systemd/rescue.service~ 2013-03-08 07:07:48.000000000 +0100 ++++ dracut-026/modules.d/98systemd/rescue.service 2013-03-21 13:23:51.761696508 +0100 +@@ -17,7 +17,7 @@ + ExecStartPre=-/bin/plymouth quit + ExecStart=-/bin/sh -i -l + ExecStopPost=-/bin/rm -f -- /.console_lock +-ExecStopPost=-/usr/bin/systemctl --fail --no-block default ++ExecStopPost=-/bin/systemctl --fail --no-block default + Type=idle + StandardInput=tty-force + StandardOutput=inherit +--- dracut-027/modules.d/98systemd/emergency.service.wiget 2013-03-27 23:05:57.984373121 +0100 ++++ dracut-027/modules.d/98systemd/emergency.service 2013-03-27 23:11:39.569991251 +0100 +@@ -17,7 +17,7 @@ Wants=systemd-vconsole-setup.service + Environment=HOME=/ + WorkingDirectory=/ + ExecStart=/bin/dracut-emergency +-ExecStopPost=-/usr/bin/systemctl --fail --no-block default ++ExecStopPost=-/bin/systemctl --fail --no-block default + Type=oneshot + StandardInput=tty-force + StandardOutput=inherit