Author: cactus Date: Thu Jun 7 22:26:44 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 019; with systemd support module, rpmversion module droped
---- Files affected: packages/dracut: dracut.spec (1.21 -> 1.22) , pld.conf (1.3 -> 1.4) , reboot-opts.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/dracut/dracut.spec diff -u packages/dracut/dracut.spec:1.21 packages/dracut/dracut.spec:1.22 --- packages/dracut/dracut.spec:1.21 Wed May 30 08:38:27 2012 +++ packages/dracut/dracut.spec Fri Jun 8 00:26:38 2012 @@ -1,12 +1,12 @@ # $Revision$, $Date$ Summary: Initramfs generator using udev Name: dracut -Version: 018 -Release: 6 +Version: 019 +Release: 1 License: GPL v2+ Group: Base Source0: ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: e65f2a54b6d64619334f501a346f7823 +# Source0-md5: ff7766d1fdb00f47af6c66f6a2ae8cea Source1: pld.conf Patch0: no-rh.patch Patch1: bash-sh.patch @@ -133,7 +133,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -156,8 +156,6 @@ sysconfdir=%{_sysconfdir} \ mandir=%{_mandir} -echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version - 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 @@ -201,9 +199,6 @@ %{dracutlibdir}/modules.d/10i18n/README %{dracutlibdir}/modules.d/10i18n/*.rules %attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh -%dir %{dracutlibdir}/modules.d/10rpmversion -%{dracutlibdir}/modules.d/10rpmversion/dracut-version -%attr(755,root,root) %{dracutlibdir}/modules.d/10rpmversion/*.sh %dir %{dracutlibdir}/modules.d/30convertfs %attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh %dir %{dracutlibdir}/modules.d/50plymouth @@ -255,6 +250,8 @@ %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 @@ -276,6 +273,10 @@ %{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 %dir %{dracutlibdir}/modules.d/98usrmount %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh %dir %{dracutlibdir}/modules.d/99base @@ -286,8 +287,11 @@ %attr(755,root,root) %{dracutlibdir}/modules.d/99img-lib/*.sh %dir %{dracutlibdir}/modules.d/99shutdown %attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh +%attr(755,root,root) %{dracutlibdir}/dracut-version.sh + %dir /var/lib/initramfs %{systemdunitdir}/*.service +%{systemdunitdir}/*.target %{systemdunitdir}/*/*.service %{_mandir}/man8/dracut.8* %{_mandir}/man7/dracut.kernel.7* @@ -350,6 +354,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2012/06/07 22:26:38 cactus +- up to 019; with systemd support module, rpmversion module droped + Revision 1.21 2012/05/30 06:38:27 baggins - rel 6 - disabled S:biosdevname ================================================================ Index: packages/dracut/pld.conf diff -u packages/dracut/pld.conf:1.3 packages/dracut/pld.conf:1.4 --- packages/dracut/pld.conf:1.3 Mon Mar 26 20:26:45 2012 +++ packages/dracut/pld.conf Fri Jun 8 00:26:38 2012 @@ -2,5 +2,4 @@ # i18n i18n_vars="/etc/sysconfig/console:KEYTABLE-KEYMAP,CONSOLEFONT-FONT,CONSOLEMAP-FONT_MAP,CONSOLESCREENFONTMAP-FONT_UNIMAP" -add_dracutmodules+=" rpmversion " install_items+=" vi /etc/vim/vimrc ps grep cat rm open " ================================================================ Index: packages/dracut/reboot-opts.patch diff -u packages/dracut/reboot-opts.patch:1.1 packages/dracut/reboot-opts.patch:1.2 --- packages/dracut/reboot-opts.patch:1.1 Mon Apr 16 20:30:13 2012 +++ packages/dracut/reboot-opts.patch Fri Jun 8 00:26:38 2012 @@ -1,9 +1,9 @@ --- dracut-018/modules.d/99shutdown/shutdown.sh~ 2012-04-05 13:54:38.000000000 +0200 +++ dracut-018/modules.d/99shutdown/shutdown.sh 2012-04-16 14:04:49.481733793 +0200 -@@ -98,7 +98,7 @@ +@@ -56,7 +56,7 @@ _check_shutdown final - getarg 'rd.break=shutdown' && emergency_shell -n cmdline "Break before shutdown" + getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown" -[ "$1" = "reboot" ] && reboot -f -d -n --no-wall -[ "$1" = "poweroff" ] && poweroff -f -d -n --no-wall -[ "$1" = "halt" ] && halt -f -d -n --no-wall ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/dracut/dracut.spec?r1=1.21&r2=1.22 http://cvs.pld-linux.org/packages/dracut/pld.conf?r1=1.3&r2=1.4 http://cvs.pld-linux.org/packages/dracut/reboot-opts.patch?r1=1.1&r2=1.2 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
