Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-11-26 10:35:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-10-18 09:08:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-11-26 10:35:30.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Nov 22 06:26:37 UTC 2014 - [email protected] + +- add 0165-Order-root-fsck-after-pre-mount.patch + ensure root fsck runs after dracut-pre-mount.service which calls + resume (bnc#906592) + +------------------------------------------------------------------- New: ---- 0165-Order-root-fsck-after-pre-mount.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.g4EhsF/_old 2014-11-26 10:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.g4EhsF/_new 2014-11-26 10:35:32.000000000 +0100 @@ -185,6 +185,7 @@ Patch162: 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch Patch163: 0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch Patch164: 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch +Patch165: 0165-Order-root-fsck-after-pre-mount.patch BuildRequires: asciidoc BuildRequires: bash @@ -392,6 +393,7 @@ %patch162 -p1 %patch163 -p1 %patch164 -p1 +%patch165 -p1 %build %configure\ ++++++ 0165-Order-root-fsck-after-pre-mount.patch ++++++ From: Andrei Borzenkov <[email protected]> Subject: ensure pre-mount (and resume) run before root fsck References: bnc#906592 Index: dracut-037/modules.d/98systemd/rootfs-generator.sh =================================================================== --- dracut-037.orig/modules.d/98systemd/rootfs-generator.sh +++ dracut-037/modules.d/98systemd/rootfs-generator.sh @@ -66,6 +66,23 @@ generator_mount_rootfs() fi } +generator_fsck_after_pre_mount() +{ + local _name + + [ -z "$1" ] && return 0 + + _name=$(dev_unit_name "$1") + [ -d /run/systemd/generator/systemd-fsck@${_name}.service.d ] || mkdir -p /run/systemd/generator/systemd-fsck@${_name}.service.d + if ! [ -f /run/systemd/generator/systemd-fsck@${_name}.service.d/after-pre-mount.conf ]; then + { + echo "[Unit]" + echo "After=dracut-pre-mount.service" + } > /run/systemd/generator/systemd-fsck@${_name}.service.d/after-pre-mount.conf + fi + +} + root=$(getarg root=) case "$root" in block:LABEL=*|LABEL=*) @@ -94,6 +111,7 @@ esac if [ "${root%%:*}" = "block" ]; then generator_wait_for_dev "${root#block:}" "$RDRETRY" + generator_fsck_after_pre_mount "${root#block:}" grep -q 'root=' /proc/cmdline || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)" fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
