On 05/30/2013 07:07 AM, Dave Young wrote: > On 05/28/2013 06:53 PM, Harald Hoyer wrote: >> On 05/16/2013 07:15 AM, dyoung@xxxxxxxxxx wrote: >>> >>> Kdump test failed since below commits >>> dbfaae0e34507d2d1f3c186ffe26af3e8028b9f8 >>> >>> Fedora bug is here: >>> https://bugzilla.redhat.com/show_bug.cgi?id=963159 >>> >>> The reason is the hooks afterwards need NEWROOT env which >>> is set in dracut-cmdline.sh. >>> >>> In this case there's no files under /etc/cmdline.d/ and >>> /lib/dracut/hooks/cmdline/. Conditions checking failed, so >>> the cmdline service failed to startup. >>> >>> Fix this issue by remove the Conditions thus cmdline service >>> always run if /etc/initrd-release exists. >>> >>> Signed-off-by: Dave Young <dyoung@xxxxxxxxxx> >>> --- >>> modules.d/98systemd/dracut-cmdline.service | 5 ----- >>> 1 file changed, 5 deletions(-) >>> >>> --- dracut.orig/modules.d/98systemd/dracut-cmdline.service >>> +++ dracut/modules.d/98systemd/dracut-cmdline.service >>> @@ -16,11 +16,6 @@ Before=systemd-vconsole-setup.service >>> After=systemd-journald.socket >>> Wants=systemd-journald.socket >>> ConditionPathExists=/etc/initrd-release >>> -ConditionPathExistsGlob=|/etc/cmdline.d/*.conf >>> -ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cmdline >>> -ConditionKernelCommandLine=|rd.break=cmdline >>> -ConditionKernelCommandLine=|resume >>> -ConditionKernelCommandLine=|noresume >>> >>> [Service] >>> Type=oneshot >> >> Will be fixed by setting >> >> Environment=DRACUT_SYSTEMD=1 >> Environment=NEWROOT=/sysroot >> >> in the service files. >> > > Hi, Harald > > Kdump test still fails, looks like pre-pivot hooks scripts do not get > the NEWROOT value. > > How about move the NEWROOT= to dracut-lib.sh, any hooks want to use > NEWROOT should source dracut-lib.sh? > --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -2,6 +2,9 @@ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh +export DRACUT_SYSTEMD +export NEWROOT -- To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
