From ac1548eb997739ada28f18a2df63d8ea4422eed75df46f192f88469e4ec72e93 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 28 Jul 2013 08:57:34 +0000 Subject: [PATCH] Accepting request 184505 from home:elvigia:branches:Base:System - version 030_git201307241235 * systemd: Replace prefdm.service with display-manager.service * modsign: do not install, if no keys present * bcache: add support for bcache * Use systemd-cat for logging on systemd systems, if logfile is empty OBS-URL: https://build.opensuse.org/request/show/184505 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=48 --- correct-paths-for-opensuse.patch | 26 +++++++++++----------- dracut-029_git201307171236.tar.xz | 3 --- dracut-030_git201307241235.tar.xz | 3 +++ dracut.changes | 9 ++++++++ dracut.spec | 10 ++++++--- use_all_paths_udev.patch | 6 +++--- use_initrd_insteadof_initramfs.patch | 32 ++++++++++++++-------------- use_sysconfig_values_correctly.patch | 4 ++-- 8 files changed, 53 insertions(+), 40 deletions(-) delete mode 100644 dracut-029_git201307171236.tar.xz create mode 100644 dracut-030_git201307241235.tar.xz diff --git a/correct-paths-for-opensuse.patch b/correct-paths-for-opensuse.patch index 3a6870b..2ba7340 100644 --- a/correct-paths-for-opensuse.patch +++ b/correct-paths-for-opensuse.patch @@ -1,5 +1,5 @@ ---- dracut-029_git201307171236.orig/dracut.sh -+++ dracut-029_git201307171236/dracut.sh +--- dracut-030_git201307241235.orig/dracut.sh ++++ dracut-030_git201307241235/dracut.sh @@ -643,7 +643,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l @@ -9,8 +9,8 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $compress_l ]] && compress=$compress_l ---- dracut-029_git201307171236.orig/modules.d/10i18n/module-setup.sh -+++ dracut-029_git201307171236/modules.d/10i18n/module-setup.sh +--- dracut-030_git201307241235.orig/modules.d/10i18n/module-setup.sh ++++ dracut-030_git201307241235/modules.d/10i18n/module-setup.sh @@ -94,6 +94,8 @@ install() { install_base() { @@ -20,8 +20,8 @@ if ! dracut_module_included "systemd"; then inst ${moddir}/console_init.sh /lib/udev/console_init ---- dracut-029_git201307171236.orig/modules.d/50plymouth/module-setup.sh -+++ dracut-029_git201307171236/modules.d/50plymouth/module-setup.sh +--- dracut-030_git201307241235.orig/modules.d/50plymouth/module-setup.sh ++++ dracut-030_git201307241235/modules.d/50plymouth/module-setup.sh @@ -12,12 +12,12 @@ depends() { } @@ -38,9 +38,9 @@ fi inst_hook emergency 50 "$moddir"/plymouth-emergency.sh ---- dracut-029_git201307171236.orig/modules.d/90kernel-modules/module-setup.sh -+++ dracut-029_git201307171236/modules.d/90kernel-modules/module-setup.sh -@@ -74,7 +74,7 @@ installkernel() { +--- dracut-030_git201307241235.orig/modules.d/90kernel-modules/module-setup.sh ++++ dracut-030_git201307241235/modules.d/90kernel-modules/module-setup.sh +@@ -75,7 +75,7 @@ installkernel() { } install() { @@ -49,8 +49,8 @@ [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf if ! dracut_module_included "systemd"; then inst_hook cmdline 01 "$moddir/parse-kernel.sh" ---- dracut-029_git201307171236.orig/modules.d/95udev-rules/module-setup.sh -+++ dracut-029_git201307171236/modules.d/95udev-rules/module-setup.sh +--- dracut-030_git201307241235.orig/modules.d/95udev-rules/module-setup.sh ++++ dracut-030_git201307241235/modules.d/95udev-rules/module-setup.sh @@ -11,6 +11,8 @@ install() { dracut_install udevadm cat uname blkid \ /etc/udev/udev.conf @@ -60,8 +60,8 @@ [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do [ -x "$_i" ] || continue ---- dracut-029_git201307171236.orig/modules.d/98systemd/rescue.service -+++ dracut-029_git201307171236/modules.d/98systemd/rescue.service +--- dracut-030_git201307241235.orig/modules.d/98systemd/rescue.service ++++ dracut-030_git201307241235/modules.d/98systemd/rescue.service @@ -16,7 +16,7 @@ Environment=HOME=/ Environment=DRACUT_SYSTEMD=1 Environment=NEWROOT=/sysroot diff --git a/dracut-029_git201307171236.tar.xz b/dracut-029_git201307171236.tar.xz deleted file mode 100644 index 78f79d2..0000000 --- a/dracut-029_git201307171236.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01f1bd815e2c6b3622140b62631aedc4751469f0342b4c8aa10078d3a9048797 -size 207144 diff --git a/dracut-030_git201307241235.tar.xz b/dracut-030_git201307241235.tar.xz new file mode 100644 index 0000000..9691af0 --- /dev/null +++ b/dracut-030_git201307241235.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f86d22a340bbe0acdd54bdbc296d911f1c430f2340380e68c4717340006114a2 +size 208032 diff --git a/dracut.changes b/dracut.changes index 2d0e8f2..307fbf8 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jul 28 00:39:55 UTC 2013 - crrodriguez@opensuse.org + +- version 030_git201307241235 +* systemd: Replace prefdm.service with display-manager.service +* modsign: do not install, if no keys present +* bcache: add support for bcache +* Use systemd-cat for logging on systemd systems, if logfile is empty + ------------------------------------------------------------------- Sun Jul 21 17:17:58 UTC 2013 - tittiatcoke@gmail.com diff --git a/dracut.spec b/dracut.spec index 2b8fdd2..3a76d64 100644 --- a/dracut.spec +++ b/dracut.spec @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 029_git201307171236 +Version: 030_git201307241235 Release: 0 Summary: Initramfs generator using udev @@ -177,8 +177,6 @@ rm %{buildroot}%{_mandir}/man1/lsinitrd* mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 0644 dracut.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/dracut -find %buildroot -type f -name "*.service" -exec sed -i -e 's@prefdm.service@display-manager.service@g' {} + - %clean rm -rf %{buildroot} @@ -282,6 +280,12 @@ rm -rf %{buildroot} %{dracutlibdir}/modules.d/99img-lib %{dracutlibdir}/modules.d/99shutdown %{dracutlibdir}/modules.d/99suse +%dir %{dracutlibdir}/modules.d/03modsign +%{dracutlibdir}/modules.d/03modsign/load-modsign-keys.sh +%{dracutlibdir}/modules.d/03modsign/module-setup.sh +%dir %{dracutlibdir}/modules.d/90bcache +%{dracutlibdir}/modules.d/90bcache/module-setup.sh + %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %if %{defined _unitdir} diff --git a/use_all_paths_udev.patch b/use_all_paths_udev.patch index 667255a..a859e39 100644 --- a/use_all_paths_udev.patch +++ b/use_all_paths_udev.patch @@ -1,6 +1,6 @@ ---- dracut-029_git201307171236.orig/dracut-functions.sh -+++ dracut-029_git201307171236/dracut-functions.sh -@@ -955,7 +955,7 @@ inst_rules() { +--- dracut-030_git201307241235.orig/dracut-functions.sh ++++ dracut-030_git201307241235/dracut-functions.sh +@@ -954,7 +954,7 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then diff --git a/use_initrd_insteadof_initramfs.patch b/use_initrd_insteadof_initramfs.patch index 78019e2..ebffd13 100644 --- a/use_initrd_insteadof_initramfs.patch +++ b/use_initrd_insteadof_initramfs.patch @@ -1,5 +1,5 @@ ---- dracut-029_git201307171236.orig/dracut.8.asc -+++ dracut-029_git201307171236/dracut.8.asc +--- dracut-030_git201307241235.orig/dracut.8.asc ++++ dracut-030_git201307241235/dracut.8.asc @@ -18,7 +18,7 @@ DESCRIPTION Create an initramfs for the kernel with the version . If is omitted, then the version of the actual running @@ -18,8 +18,8 @@ contains the kernel modules of the currently active kernel with version _++++_. ---- dracut-029_git201307171236.orig/dracut.asc -+++ dracut-029_git201307171236/dracut.asc +--- dracut-030_git201307241235.orig/dracut.asc ++++ dracut-030_git201307241235/dracut.asc @@ -153,7 +153,7 @@ To create a initramfs image, the most si This will generate a general purpose initramfs image, with all possible @@ -107,8 +107,8 @@ ---- This will reduce the size of the initramfs image significantly. ---- dracut-029_git201307171236.orig/dracut-initramfs-restore.sh -+++ dracut-029_git201307171236/dracut-initramfs-restore.sh +--- dracut-030_git201307241235.orig/dracut-initramfs-restore.sh ++++ dracut-030_git201307241235/dracut-initramfs-restore.sh @@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)" if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" @@ -118,8 +118,8 @@ cd /run/initramfs ---- dracut-029_git201307171236.orig/dracut.sh -+++ dracut-029_git201307171236/dracut.sh +--- dracut-030_git201307241235.orig/dracut.sh ++++ dracut-030_git201307241235/dracut.sh @@ -490,7 +490,7 @@ if ! [[ $outfile ]]; then if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then outfile="/boot/${MACHINE_ID}/$kernel/initrd" @@ -129,8 +129,8 @@ fi fi ---- dracut-029_git201307171236.orig/mkinitrd-dracut.sh -+++ dracut-029_git201307171236/mkinitrd-dracut.sh +--- dracut-030_git201307241235.orig/mkinitrd-dracut.sh ++++ dracut-030_git201307241235/mkinitrd-dracut.sh @@ -11,7 +11,7 @@ usage () { $cmd " [--nocompress]" $cmd " " @@ -140,8 +140,8 @@ [[ $1 = '-n' ]] && exit 0 exit 1 ---- dracut-029_git201307171236.orig/lsinitrd.1.asc -+++ dracut-029_git201307171236/lsinitrd.1.asc +--- dracut-030_git201307241235.orig/lsinitrd.1.asc ++++ dracut-030_git201307241235/lsinitrd.1.asc @@ -18,7 +18,7 @@ DESCRIPTION ----------- lsinitrd shows the contents of an initramfs image. if is omitted, then @@ -151,8 +151,8 @@ OPTIONS ------- ---- dracut-029_git201307171236.orig/lsinitrd.sh -+++ dracut-029_git201307171236/lsinitrd.sh +--- dracut-030_git201307241235.orig/lsinitrd.sh ++++ dracut-030_git201307241235/lsinitrd.sh @@ -84,7 +84,7 @@ else && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" @@ -162,8 +162,8 @@ fi fi ---- dracut-029_git201307171236.orig/51-dracut-rescue-postinst.sh -+++ dracut-029_git201307171236/51-dracut-rescue-postinst.sh +--- dracut-030_git201307241235.orig/51-dracut-rescue-postinst.sh ++++ dracut-030_git201307241235/51-dracut-rescue-postinst.sh @@ -18,7 +18,7 @@ fi [[ $MACHINE_ID ]] || exit 1 [[ -f $KERNEL_IMAGE ]] || exit 1 diff --git a/use_sysconfig_values_correctly.patch b/use_sysconfig_values_correctly.patch index 6866050..c3d4493 100644 --- a/use_sysconfig_values_correctly.patch +++ b/use_sysconfig_values_correctly.patch @@ -1,5 +1,5 @@ ---- dracut-029_git201307171236.orig/modules.d/10i18n/module-setup.sh -+++ dracut-029_git201307171236/modules.d/10i18n/module-setup.sh +--- dracut-030_git201307241235.orig/modules.d/10i18n/module-setup.sh ++++ dracut-030_git201307241235/modules.d/10i18n/module-setup.sh @@ -155,6 +155,9 @@ install() { # Gentoo user may have KEYMAP set to something like "-u pl2", KEYMAP=${KEYMAP#-* }