diff --git a/.gitignore b/.gitignore index 0ad93dd..5766766 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /dracut-032.tar.bz2 /dracut-033.tar.bz2 /dracut-034.tar.bz2 +/dracut-036.tar.xz diff --git a/0001-NEWS-update-for-version-036.patch b/0001-NEWS-update-for-version-036.patch new file mode 100644 index 0000000..40de065 --- /dev/null +++ b/0001-NEWS-update-for-version-036.patch @@ -0,0 +1,21 @@ +From d50a99c5ceeb7107f624c5d3238d37509b2217a8 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 29 Jan 2014 08:37:43 +0100 +Subject: [PATCH] NEWS: update for version 036 + +--- + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/NEWS b/NEWS +index 5b88600..ccf279f 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,7 @@ ++dracut-036 ++========== ++- fixed skipcpio signature checking ++ + dracut-035 + ========== + - changed dracut tarball compression to xz diff --git a/0001-lvm-install-thin-utils-for-non-hostonly.patch b/0001-lvm-install-thin-utils-for-non-hostonly.patch deleted file mode 100644 index 5c584b4..0000000 --- a/0001-lvm-install-thin-utils-for-non-hostonly.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a3c0cef9a79608a45fee94ff6b31f9c63864923f Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 8 Oct 2013 10:30:00 +0200 -Subject: [PATCH] lvm: install thin utils for non-hostonly - ---- - modules.d/90lvm/module-setup.sh | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index f98ffff..514addc 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -52,13 +52,17 @@ install() { - - inst lvm - -- get_host_lvs | while read line; do -- printf "%s" " rd.lvm.lv=$line" -- if ! [[ $_needthin ]]; then -- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 -- fi -- done >> "${initdir}/etc/cmdline.d/90lvm.conf" -- echo >> "${initdir}/etc/cmdline.d/90lvm.conf" -+ if [[ $hostonly ]]; then -+ get_host_lvs | while read line; do -+ printf "%s" " rd.lvm.lv=$line" -+ if ! [[ $_needthin ]]; then -+ [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 -+ fi -+ done >> "${initdir}/etc/cmdline.d/90lvm.conf" -+ echo >> "${initdir}/etc/cmdline.d/90lvm.conf" -+ else -+ _needthin=1 -+ fi - - inst_rules "$moddir/64-lvm.rules" - diff --git a/0002-module-setup.sh-add-comments-for-dracut-called-funct.patch b/0002-module-setup.sh-add-comments-for-dracut-called-funct.patch deleted file mode 100644 index 28b4173..0000000 --- a/0002-module-setup.sh-add-comments-for-dracut-called-funct.patch +++ /dev/null @@ -1,1781 +0,0 @@ -From 8bcfd683bd0c533708d8e1367373932d42b64b59 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 8 Oct 2013 10:37:56 +0200 -Subject: [PATCH] */module-setup.sh: add comments for dracut called functions - ---- - modules.d/00bash/module-setup.sh | 3 +++ - modules.d/00bootchart/module-setup.sh | 3 +++ - modules.d/00dash/module-setup.sh | 3 +++ - modules.d/00systemd-bootchart/module-setup.sh | 3 +++ - modules.d/01fips/module-setup.sh | 4 ++++ - modules.d/02caps/module-setup.sh | 3 +++ - modules.d/02fips-aesni/module-setup.sh | 4 ++++ - modules.d/03modsign/module-setup.sh | 3 +++ - modules.d/03rescue/module-setup.sh | 3 +++ - modules.d/04watchdog/module-setup.sh | 3 +++ - modules.d/05busybox/module-setup.sh | 3 +++ - modules.d/10i18n/module-setup.sh | 3 +++ - modules.d/30convertfs/module-setup.sh | 3 +++ - modules.d/40network/module-setup.sh | 4 ++++ - modules.d/45ifcfg/module-setup.sh | 3 +++ - modules.d/45url-lib/module-setup.sh | 3 +++ - modules.d/50drm/module-setup.sh | 3 +++ - modules.d/50gensplash/module-setup.sh | 3 +++ - modules.d/50plymouth/module-setup.sh | 3 +++ - modules.d/80cms/module-setup.sh | 4 ++++ - modules.d/90btrfs/module-setup.sh | 4 ++++ - modules.d/90crypt/module-setup.sh | 5 +++++ - modules.d/90dm/module-setup.sh | 4 ++++ - modules.d/90dmraid/module-setup.sh | 4 ++++ - modules.d/90dmsquash-live/module-setup.sh | 4 ++++ - modules.d/90kernel-modules/module-setup.sh | 2 ++ - modules.d/90livenet/module-setup.sh | 3 +++ - modules.d/90lvm/module-setup.sh | 4 ++++ - modules.d/90mdraid/module-setup.sh | 5 +++++ - modules.d/90multipath/module-setup.sh | 4 ++++ - modules.d/90qemu-net/module-setup.sh | 2 ++ - modules.d/90qemu/module-setup.sh | 2 ++ - modules.d/91crypt-gpg/module-setup.sh | 3 +++ - modules.d/91crypt-loop/module-setup.sh | 4 ++++ - modules.d/95cifs/module-setup.sh | 4 ++++ - modules.d/95dasd/module-setup.sh | 4 ++++ - modules.d/95dasd_mod/module-setup.sh | 4 ++++ - modules.d/95debug/module-setup.sh | 3 +++ - modules.d/95fcoe/module-setup.sh | 4 ++++ - modules.d/95fstab-sys/module-setup.sh | 3 +++ - modules.d/95iscsi/module-setup.sh | 4 ++++ - modules.d/95nbd/module-setup.sh | 4 ++++ - modules.d/95nfs/module-setup.sh | 4 ++++ - modules.d/95resume/module-setup.sh | 2 ++ - modules.d/95rootfs-block/module-setup.sh | 4 ++++ - modules.d/95ssh-client/module-setup.sh | 3 +++ - modules.d/95terminfo/module-setup.sh | 1 + - modules.d/95udev-rules/module-setup.sh | 1 + - modules.d/95virtfs/module-setup.sh | 4 ++++ - modules.d/95zfcp/module-setup.sh | 4 ++++ - modules.d/95znet/module-setup.sh | 4 ++++ - modules.d/96securityfs/module-setup.sh | 3 +++ - modules.d/97biosdevname/module-setup.sh | 3 +++ - modules.d/97masterkey/module-setup.sh | 4 ++++ - modules.d/98ecryptfs/module-setup.sh | 4 ++++ - modules.d/98integrity/module-setup.sh | 3 +++ - modules.d/98pollcdrom/module-setup.sh | 3 +++ - modules.d/98selinux/module-setup.sh | 3 +++ - modules.d/98syslog/module-setup.sh | 3 +++ - modules.d/98systemd/module-setup.sh | 3 +++ - modules.d/98usrmount/module-setup.sh | 3 +++ - modules.d/99base/module-setup.sh | 3 +++ - modules.d/99fs-lib/module-setup.sh | 4 ++++ - modules.d/99img-lib/module-setup.sh | 3 +++ - modules.d/99shutdown/module-setup.sh | 3 +++ - 65 files changed, 216 insertions(+) - -diff --git a/modules.d/00bash/module-setup.sh b/modules.d/00bash/module-setup.sh -index e874e73..f599940 100755 ---- a/modules.d/00bash/module-setup.sh -+++ b/modules.d/00bash/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [ -x /bin/bash ] - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - # If another shell is already installed, do not use bash - [[ -x $initdir/bin/sh ]] && return -diff --git a/modules.d/00bootchart/module-setup.sh b/modules.d/00bootchart/module-setup.sh -index 72b6063..107ee5b 100755 ---- a/modules.d/00bootchart/module-setup.sh -+++ b/modules.d/00bootchart/module-setup.sh -@@ -2,16 +2,19 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ "$mount_needs" ]] && return 1 - [ -x /sbin/bootchartd ] || return 1 - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_symlink /init /sbin/init - inst_dir /lib/bootchart/tmpfs -diff --git a/modules.d/00dash/module-setup.sh b/modules.d/00dash/module-setup.sh -index dfd4d7b..47f7b03 100755 ---- a/modules.d/00dash/module-setup.sh -+++ b/modules.d/00dash/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [ -x /bin/dash ] - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - # If another shell is already installed, do not use dash - [[ -x $initdir/bin/sh ]] && return -diff --git a/modules.d/00systemd-bootchart/module-setup.sh b/modules.d/00systemd-bootchart/module-setup.sh -index 3eb4de1..a897cef 100755 ---- a/modules.d/00systemd-bootchart/module-setup.sh -+++ b/modules.d/00systemd-bootchart/module-setup.sh -@@ -2,16 +2,19 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ "$mount_needs" ]] && return 1 - [ -x $systemdutildir/systemd-bootchart ] || return 1 - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_symlink /init /sbin/init - inst_multiple $systemdutildir/systemd-bootchart -diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index d08e3f7..6493290 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - local _fipsmodules _mod - _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm " -@@ -28,6 +31,7 @@ installkernel() { - done - } - -+# called by dracut - install() { - local _dir - inst_hook pre-trigger 01 "$moddir/fips-boot.sh" -diff --git a/modules.d/02caps/module-setup.sh b/modules.d/02caps/module-setup.sh -index c9d94ee..6019188 100755 ---- a/modules.d/02caps/module-setup.sh -+++ b/modules.d/02caps/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - type -P capsh >/dev/null 2>&1 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_hook pre-pivot 00 "$moddir/caps.sh" - inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh -diff --git a/modules.d/02fips-aesni/module-setup.sh b/modules.d/02fips-aesni/module-setup.sh -index fb4010d..002b7d4 100755 ---- a/modules.d/02fips-aesni/module-setup.sh -+++ b/modules.d/02fips-aesni/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - local _fipsmodules _mod - _fipsmodules="aesni-intel ghash_clmulni_intel" -@@ -24,6 +27,7 @@ installkernel() { - done - } - -+# called by dracut - install() { - return 0 - } -diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh -index 730cd86..5dfd90c 100644 ---- a/modules.d/03modsign/module-setup.sh -+++ b/modules.d/03modsign/module-setup.sh -@@ -7,6 +7,7 @@ - # Copyright 2013 Red Hat, Inc. - # Peter Jones - -+# called by dracut - check() { - [[ -x /usr/bin/keyctl ]] || return 1 - -@@ -20,10 +21,12 @@ check() { - return 0 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_dir /lib/modules/keys - inst_binary /usr/bin/keyctl -diff --git a/modules.d/03rescue/module-setup.sh b/modules.d/03rescue/module-setup.sh -index 72a4287..289c934 100755 ---- a/modules.d/03rescue/module-setup.sh -+++ b/modules.d/03rescue/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # do not add this module by default - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_multiple -o ps grep more cat rm strace free showmount \ - ping netstat rpcinfo vi scp ping6 ssh \ -diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index b7725ef..44dce61 100755 ---- a/modules.d/04watchdog/module-setup.sh -+++ b/modules.d/04watchdog/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_hook cmdline 00 "$moddir/watchdog.sh" - inst_hook cmdline 50 "$moddir/watchdog.sh" -diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh -index edcc8da..6e508a6 100755 ---- a/modules.d/05busybox/module-setup.sh -+++ b/modules.d/05busybox/module-setup.sh -@@ -2,16 +2,19 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - type -P busybox >/dev/null || return 1 - - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - local _i _progs _path _busybox - _busybox=$(type -P busybox) -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index 2a83728..0741c64 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ "$mount_needs" ]] && return 1 - -@@ -12,10 +13,12 @@ check() { - return 0 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - if dracut_module_included "systemd"; then - [[ -f /etc/vconsole.conf ]] || return 0 -diff --git a/modules.d/30convertfs/module-setup.sh b/modules.d/30convertfs/module-setup.sh -index 9efd5dd..1e73455 100755 ---- a/modules.d/30convertfs/module-setup.sh -+++ b/modules.d/30convertfs/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ $mount_needs ]] && return 1 - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_multiple bash find ldconfig mv rm cp ln - inst_hook pre-pivot 99 "$moddir/do-convertfs.sh" -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index d2833d0..8a2898c 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _program - -@@ -15,10 +16,12 @@ check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - # Include wired net drivers, excluding wireless - -@@ -67,6 +70,7 @@ installkernel() { - instmods =drivers/net/phy ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net =drivers/net/team - } - -+# called by dracut - install() { - local _arch _i _dir - inst_multiple ip arping dhclient sed -diff --git a/modules.d/45ifcfg/module-setup.sh b/modules.d/45ifcfg/module-setup.sh -index ce53e5e..c407f45 100755 ---- a/modules.d/45ifcfg/module-setup.sh -+++ b/modules.d/45ifcfg/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ -d /etc/sysconfig/network-scripts ]] && return 0 - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_hook pre-pivot 85 "$moddir/write-ifcfg.sh" - } -diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh -index b5cf36f..1ed97ac 100755 ---- a/modules.d/45url-lib/module-setup.sh -+++ b/modules.d/45url-lib/module-setup.sh -@@ -1,16 +1,19 @@ - #!/bin/bash - # module-setup for url-lib - -+# called by dracut - check() { - command -v curl >/dev/null || return 1 - return 255 - } - -+# called by dracut - depends() { - echo network - return 0 - } - -+# called by dracut - install() { - local _dir _crt _found _lib - inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh" -diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh -index bf33c5b..e25fc9f 100644 ---- a/modules.d/50drm/module-setup.sh -+++ b/modules.d/50drm/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - local _modname - # Include KMS capable drm drivers -diff --git a/modules.d/50gensplash/module-setup.sh b/modules.d/50gensplash/module-setup.sh -index cfee55a..64e8162 100755 ---- a/modules.d/50gensplash/module-setup.sh -+++ b/modules.d/50gensplash/module-setup.sh -@@ -2,16 +2,19 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # TODO: splash_geninitramfs - # TODO: /usr/share/splashutils/initrd.splash - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - local _opts - local _splash_theme -diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh -index e0e6936..1360924 100755 ---- a/modules.d/50plymouth/module-setup.sh -+++ b/modules.d/50plymouth/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ "$mount_needs" ]] && return 1 - type -P plymouthd >/dev/null && type -P plymouth >/dev/null - } - -+# called by dracut - depends() { - echo drm - } - -+# called by dracut - install() { - if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \ - || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then -diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh -index c99f236..0b921d8 100755 ---- a/modules.d/80cms/module-setup.sh -+++ b/modules.d/80cms/module-setup.sh -@@ -2,12 +2,14 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - arch=$(uname -m) - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 - return 255 - } - -+# called by dracut - depends() { - arch=$(uname -m) - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -@@ -15,10 +17,12 @@ depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods zfcp - } - -+# called by dracut - install() { - inst_hook pre-trigger 30 "$moddir/cmssetup.sh" - inst_hook pre-pivot 95 "$moddir/cms-write-ifcfg.sh" -diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh -index a280594..80a538f 100755 ---- a/modules.d/90btrfs/module-setup.sh -+++ b/modules.d/90btrfs/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # if we don't have btrfs installed on the host system, -@@ -18,15 +19,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo udev-rules - return 0 - } - -+# called by dracut - installkernel() { - instmods btrfs - } - -+# called by dracut - install() { - if ! inst_rules 64-btrfs.rules; then - inst_rules "$moddir/80-btrfs.rules" -diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index 1858391..7d18e33 100755 ---- a/modules.d/90crypt/module-setup.sh -+++ b/modules.d/90crypt/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # if cryptsetup is not installed, then we cannot support encrypted devices. -@@ -17,15 +18,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo dm rootfs-block - return 0 - } - -+# called by dracut - installkernel() { - instmods dm_crypt =crypto - } - -+# called by dracut - cmdline() { - local dev UUID - for dev in "${!host_fs_types[@]}"; do -@@ -44,6 +48,7 @@ cmdline() { - done - } - -+# called by dracut - install() { - - cmdline >> "${initdir}/etc/cmdline.d/90crypt.conf" -diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh -index fa38e85..bafad67 100755 ---- a/modules.d/90dm/module-setup.sh -+++ b/modules.d/90dm/module-setup.sh -@@ -2,20 +2,24 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - type -P dmsetup >/dev/null || return 1 - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods =drivers/md - instmods dm_mod - } - -+# called by dracut - install() { - modinfo -k $kernel dm_mod >/dev/null 2>&1 && \ - inst_hook pre-udev 30 "$moddir/dm-pre-udev.sh" -diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh -index 11181cf..a9e27a6 100755 ---- a/modules.d/90dmraid/module-setup.sh -+++ b/modules.d/90dmraid/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # if we don't have dmraid installed on the host system, no point -@@ -27,11 +28,13 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo dm rootfs-block - return 0 - } - -+# called by dracut - cmdline() { - local _activated - declare -A _activated -@@ -58,6 +61,7 @@ cmdline() { - done - } - -+# called by dracut - install() { - local _i - -diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh -index c6d1f9d..851fd1a 100755 ---- a/modules.d/90dmsquash-live/module-setup.sh -+++ b/modules.d/90dmsquash-live/module-setup.sh -@@ -2,12 +2,14 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # a live host-only image doesn't really make a lot of sense - [[ $hostonly ]] && return 1 - return 255 - } - -+# called by dracut - depends() { - # if dmsetup is not installed, then we cannot support fedora/red hat - # style live images -@@ -15,10 +17,12 @@ depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods squashfs loop iso9660 - } - -+# called by dracut - install() { - inst_multiple umount dmsetup blkid dd losetup grep blockdev - inst_multiple -o checkisomd5 -diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index e7e2ca0..f6d1c3d 100755 ---- a/modules.d/90kernel-modules/module-setup.sh -+++ b/modules.d/90kernel-modules/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - installkernel() { - if [[ -z $drivers ]]; then - block_module_filter() { -@@ -73,6 +74,7 @@ installkernel() { - : - } - -+# called by dracut - install() { - inst_multiple -o /lib/modprobe.d/*.conf - [[ $hostonly ]] && inst_multiple -o /etc/modprobe.d/*.conf /etc/modprobe.conf -diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh -index be7832b..f1e757e 100755 ---- a/modules.d/90livenet/module-setup.sh -+++ b/modules.d/90livenet/module-setup.sh -@@ -1,15 +1,18 @@ - #!/bin/bash - # module-setup.sh for livenet - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - echo network url-lib dmsquash-live img-lib - return 0 - } - -+# called by dracut - install() { - inst_hook cmdline 29 "$moddir/parse-livenet.sh" - inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh" -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 514addc..f8b598d 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # No point trying to support lvm if the binaries are missing - type -P lvm >/dev/null || return 1 -@@ -16,6 +17,7 @@ check() { - return 0 - } - -+# called by dracut - depends() { - # We depend on dm_mod being loaded - echo rootfs-block dm -@@ -41,12 +43,14 @@ get_host_lvs() { - done - } - -+# called by dracut - cmdline() { - get_host_lvs | while read line; do - printf " rd.lvm.lv=$line" - done - } - -+# called by dracut - install() { - local _i _needthin - -diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh -index 34aae1e..61483f2 100755 ---- a/modules.d/90mdraid/module-setup.sh -+++ b/modules.d/90mdraid/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # No mdadm? No mdraid support. -@@ -26,15 +27,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo rootfs-block - return 0 - } - -+# called by dracut - installkernel() { - instmods =drivers/md - } - -+# called by dracut - cmdline() { - local _activated dev line UUID - declare -A _activated -@@ -58,6 +62,7 @@ cmdline() { - done - } - -+# called by dracut - install() { - local rule rule_path - inst_multiple cat -diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh -index feb58dc..261a957 100755 ---- a/modules.d/90multipath/module-setup.sh -+++ b/modules.d/90multipath/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # if there's no multipath binary, no go. -@@ -21,12 +22,14 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo rootfs-block - echo dm - return 0 - } - -+# called by dracut - installkernel() { - local _ret - local _arch=$(uname -m) -@@ -67,6 +70,7 @@ installkernel() { - find_kernel_modules_by_path drivers/md ) | mp_mod_filter | instmods - } - -+# called by dracut - install() { - local _f - inst_multiple -o \ -diff --git a/modules.d/90qemu-net/module-setup.sh b/modules.d/90qemu-net/module-setup.sh -index 522a7b5..273d849 100755 ---- a/modules.d/90qemu-net/module-setup.sh -+++ b/modules.d/90qemu-net/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - if type -P systemd-detect-virt >/dev/null 2>&1; then - vm=$(systemd-detect-virt --vm >/dev/null 2>&1) -@@ -21,6 +22,7 @@ check() { - return 255 - } - -+# called by dracut - installkernel() { - # qemu specific modules - hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci -diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh -index 0dbf081..b005f6f 100755 ---- a/modules.d/90qemu/module-setup.sh -+++ b/modules.d/90qemu/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - if type -P systemd-detect-virt >/dev/null 2>&1; then - vm=$(systemd-detect-virt --vm >/dev/null 2>&1) -@@ -20,6 +21,7 @@ check() { - return 255 - } - -+# called by dracut - installkernel() { - # qemu specific modules - hostonly='' instmods virtio_blk virtio virtio_ring virtio_pci ata_piix ata_generic pata_acpi cdrom sr_mod ahci virtio_scsi -diff --git a/modules.d/91crypt-gpg/module-setup.sh b/modules.d/91crypt-gpg/module-setup.sh -index 43a5a00..90c7bc2 100755 ---- a/modules.d/91crypt-gpg/module-setup.sh -+++ b/modules.d/91crypt-gpg/module-setup.sh -@@ -3,16 +3,19 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh - - # GPG support is optional -+# called by dracut - check() { - type -P gpg >/dev/null || return 1 - - return 255 - } - -+# called by dracut - depends() { - echo crypt - } - -+# called by dracut - install() { - inst_multiple gpg - inst "$moddir/crypt-gpg-lib.sh" "/lib/dracut-crypt-gpg-lib.sh" -diff --git a/modules.d/91crypt-loop/module-setup.sh b/modules.d/91crypt-loop/module-setup.sh -index c14fd45..00052d3 100644 ---- a/modules.d/91crypt-loop/module-setup.sh -+++ b/modules.d/91crypt-loop/module-setup.sh -@@ -1,17 +1,21 @@ -+# called by dracut - check() { - type -P losetup >/dev/null || return 1 - - return 255 - } - -+# called by dracut - depends() { - echo crypt - } - -+# called by dracut - installkernel() { - instmods loop - } - -+# called by dracut - install() { - inst_multiple losetup - inst "$moddir/crypt-loop-lib.sh" "/lib/dracut-crypt-loop-lib.sh" -diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh -index c17b973..546d2ff 100755 ---- a/modules.d/95cifs/module-setup.sh -+++ b/modules.d/95cifs/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # If our prerequisites are not met, fail anyways. - type -P mount.cifs >/dev/null || return 1 -@@ -16,15 +17,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - # We depend on network modules being loaded - echo network - } - -+# called by dracut - installkernel() { - instmods cifs ipv6 - } - -+# called by dracut - install() { - local _i - local _nsslibs -diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh -index 3b8396d..861df29 100755 ---- a/modules.d/95dasd/module-setup.sh -+++ b/modules.d/95dasd/module-setup.sh -@@ -2,20 +2,24 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _arch=$(uname -m) - [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 - return 0 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods dasd_mod dasd_eckd_mod dasd_fba_mod dasd_diag_mod - } - -+# called by dracut - install() { - inst_hook cmdline 30 "$moddir/parse-dasd.sh" - inst_multiple dasdinfo dasdconf.sh normalize_dasd_arg -diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh -index 9c9eeea..011010d 100755 ---- a/modules.d/95dasd_mod/module-setup.sh -+++ b/modules.d/95dasd_mod/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _arch=$(uname -m) - [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 -@@ -9,14 +10,17 @@ check() { - return 0 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods dasd_mod dasd_eckd_mod dasd_fba_mod dasd_diag_mod - } - -+# called by dracut - install() { - inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh" - inst_multiple dasd_cio_free grep sed seq -diff --git a/modules.d/95debug/module-setup.sh b/modules.d/95debug/module-setup.sh -index 1a554c6..88de833 100755 ---- a/modules.d/95debug/module-setup.sh -+++ b/modules.d/95debug/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # do not add this module by default - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_multiple -o ps grep more cat rm strace free showmount \ - ping netstat rpcinfo vi scp ping6 ssh \ -diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 08ba4ea..7ada2ee 100755 ---- a/modules.d/95fcoe/module-setup.sh -+++ b/modules.d/95fcoe/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # FIXME - # If hostonly was requested, fail the check until we have some way of -@@ -15,15 +16,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo network rootfs-block - return 0 - } - -+# called by dracut - installkernel() { - instmods fcoe 8021q edd - } - -+# called by dracut - install() { - inst_multiple ip dcbtool fipvlan lldpad readlink - -diff --git a/modules.d/95fstab-sys/module-setup.sh b/modules.d/95fstab-sys/module-setup.sh -index ca66005..c31358c 100755 ---- a/modules.d/95fstab-sys/module-setup.sh -+++ b/modules.d/95fstab-sys/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - test -f /etc/fstab.sys || [[ -n $add_fstab || -n $fstab_lines ]] - } - -+# called by dracut - depends() { - echo fs-lib - } - -+# called by dracut - install() { - [ -f /etc/fstab.sys ] && inst_simple /etc/fstab.sys - inst_hook pre-pivot 00 "$moddir/mount-sys.sh" -diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 502e834..c8051bd 100755 ---- a/modules.d/95iscsi/module-setup.sh -+++ b/modules.d/95iscsi/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # If our prerequisites are not met, fail anyways. -@@ -29,10 +30,12 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo network rootfs-block - } - -+# called by dracut - installkernel() { - local _arch=$(uname -m) - -@@ -75,6 +78,7 @@ installkernel() { - | iscsi_module_filter | instmods - } - -+# called by dracut - install() { - inst_multiple umount iscsistart hostname iscsi-iname - inst_multiple -o iscsiuio -diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh -index 7b78180..ac30823 100755 ---- a/modules.d/95nbd/module-setup.sh -+++ b/modules.d/95nbd/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _rootdev - # If our prerequisites are not met, fail. -@@ -20,15 +21,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - # We depend on network modules being loaded - echo network rootfs-block - } - -+# called by dracut - installkernel() { - instmods nbd - } - -+# called by dracut - install() { - inst nbd-client - inst_hook cmdline 90 "$moddir/parse-nbdroot.sh" -diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh -index 75beb74..345810a 100755 ---- a/modules.d/95nfs/module-setup.sh -+++ b/modules.d/95nfs/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # If our prerequisites are not met, fail anyways. - type -P rpcbind >/dev/null || type -P portmap >/dev/null || return 1 -@@ -19,15 +20,18 @@ check() { - return 0 - } - -+# called by dracut - depends() { - # We depend on network modules being loaded - echo network - } - -+# called by dracut - installkernel() { - instmods nfs sunrpc ipv6 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files - } - -+# called by dracut - install() { - local _i - local _nsslibs -diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index 518ebf0..b6d2c48 100755 ---- a/modules.d/95resume/module-setup.sh -+++ b/modules.d/95resume/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # No point trying to support resume, if no swap partition exist - [[ $hostonly ]] || [[ $mount_needs ]] && { -@@ -14,6 +15,7 @@ check() { - return 0 - } - -+# called by dracut - install() { - local _bin - # Optional uswsusp support -diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh -index 7e714eb..7bd0d2f 100755 ---- a/modules.d/95rootfs-block/module-setup.sh -+++ b/modules.d/95rootfs-block/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 0 - } - -+# called by dracut - depends() { - echo fs-lib - } - -+# called by dracut - cmdline() { - local dev=/dev/block/$(find_root_block_device) - if [ -e $dev ]; then -@@ -19,6 +22,7 @@ cmdline() { - fi - } - -+# called by dracut - install() { - - if [[ $hostonly ]]; then -diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh -index 66e5307..1f2b733 100755 ---- a/modules.d/95ssh-client/module-setup.sh -+++ b/modules.d/95ssh-client/module-setup.sh -@@ -4,6 +4,7 @@ - - # fixme: assume user is root - -+# called by dracut - check() { - # If our prerequisites are not met, fail. - type -P ssh >/dev/null || return 1 -@@ -20,6 +21,7 @@ check() { - return 255 - } - -+# called by dracut - depends() { - # We depend on network modules being loaded - echo network -@@ -46,6 +48,7 @@ inst_sshenv() - return 0 - } - -+# called by dracut - install() { - inst_multiple ssh scp - inst_sshenv -diff --git a/modules.d/95terminfo/module-setup.sh b/modules.d/95terminfo/module-setup.sh -index 4656cd3..6848cb9 100755 ---- a/modules.d/95terminfo/module-setup.sh -+++ b/modules.d/95terminfo/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - install() { - local _terminfodir - # terminfo bits make things work better if you fall into interactive mode -diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh -index 2cdcc1b..88c3da2 100755 ---- a/modules.d/95udev-rules/module-setup.sh -+++ b/modules.d/95udev-rules/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - install() { - local _i - -diff --git a/modules.d/95virtfs/module-setup.sh b/modules.d/95virtfs/module-setup.sh -index 12bd354..7d6d0f1 100755 ---- a/modules.d/95virtfs/module-setup.sh -+++ b/modules.d/95virtfs/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ $hostonly ]] || [[ $mount_needs ]] && { - for fs in ${host_fs_types[@]}; do -@@ -27,14 +28,17 @@ check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods 9p 9pnet_virtio virtio_pci - } - -+# called by dracut - install() { - inst_hook cmdline 95 "$moddir/parse-virtfs.sh" - inst_hook mount 99 "$moddir/mount-virtfs.sh" -diff --git a/modules.d/95zfcp/module-setup.sh b/modules.d/95zfcp/module-setup.sh -index 9906695..5d9b506 100755 ---- a/modules.d/95zfcp/module-setup.sh -+++ b/modules.d/95zfcp/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - arch=$(uname -m) - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -@@ -9,6 +10,7 @@ check() { - return 0 - } - -+# called by dracut - depends() { - arch=$(uname -m) - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -@@ -16,10 +18,12 @@ depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods zfcp - } - -+# called by dracut - install() { - inst_hook cmdline 30 "$moddir/parse-zfcp.sh" - inst_multiple zfcp_cio_free grep sed seq -diff --git a/modules.d/95znet/module-setup.sh b/modules.d/95znet/module-setup.sh -index 16f8493..4c211a9 100755 ---- a/modules.d/95znet/module-setup.sh -+++ b/modules.d/95znet/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - arch=$(uname -m) - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -@@ -9,14 +10,17 @@ check() { - return 0 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods ctcm lcs qeth qeth_l2 qeth_l3 - } - -+# called by dracut - install() { - inst_hook cmdline 30 "$moddir/parse-ccw.sh" - inst_rules 81-ccw.rules -diff --git a/modules.d/96securityfs/module-setup.sh b/modules.d/96securityfs/module-setup.sh -index fbe3aa3..d4e6118 100755 ---- a/modules.d/96securityfs/module-setup.sh -+++ b/modules.d/96securityfs/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_hook cmdline 60 "$moddir/securityfs.sh" - } -diff --git a/modules.d/97biosdevname/module-setup.sh b/modules.d/97biosdevname/module-setup.sh -index 4a0b4f4..b51c472 100755 ---- a/modules.d/97biosdevname/module-setup.sh -+++ b/modules.d/97biosdevname/module-setup.sh -@@ -2,16 +2,19 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ "$mount_needs" ]] && return 1 - type -P biosdevname >/dev/null || return 1 - return 0 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_multiple biosdevname - inst_rules 71-biosdevname.rules -diff --git a/modules.d/97masterkey/module-setup.sh b/modules.d/97masterkey/module-setup.sh -index a94c4f5..e6e3690 100755 ---- a/modules.d/97masterkey/module-setup.sh -+++ b/modules.d/97masterkey/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ $hostonly ]] && { - [ -x "/bin/keyctl" ] || return 1 -@@ -10,14 +11,17 @@ check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - installkernel() { - instmods trusted encrypted - } - -+# called by dracut - install() { - inst_multiple keyctl uname - inst_hook pre-pivot 60 "$moddir/masterkey.sh" -diff --git a/modules.d/98ecryptfs/module-setup.sh b/modules.d/98ecryptfs/module-setup.sh -index b0d6754..e12fad4 100755 ---- a/modules.d/98ecryptfs/module-setup.sh -+++ b/modules.d/98ecryptfs/module-setup.sh -@@ -2,19 +2,23 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - echo masterkey - return 0 - } - -+# called by dracut - installkernel() { - instmods ecryptfs - } - -+# called by dracut - install() { - inst_hook pre-pivot 63 "$moddir/ecryptfs-mount.sh" - } -diff --git a/modules.d/98integrity/module-setup.sh b/modules.d/98integrity/module-setup.sh -index ff1b4aa..f8f30ed 100755 ---- a/modules.d/98integrity/module-setup.sh -+++ b/modules.d/98integrity/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - echo masterkey securityfs selinux - return 0 - } - -+# called by dracut - install() { - inst_hook pre-pivot 61 "$moddir/evm-enable.sh" - inst_hook pre-pivot 62 "$moddir/ima-policy-load.sh" -diff --git a/modules.d/98pollcdrom/module-setup.sh b/modules.d/98pollcdrom/module-setup.sh -index e80ae16..94ff952 100755 ---- a/modules.d/98pollcdrom/module-setup.sh -+++ b/modules.d/98pollcdrom/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_hook initqueue/settled 99 "$moddir/pollcdrom.sh" - } -diff --git a/modules.d/98selinux/module-setup.sh b/modules.d/98selinux/module-setup.sh -index 4d5147b..90bf34b 100755 ---- a/modules.d/98selinux/module-setup.sh -+++ b/modules.d/98selinux/module-setup.sh -@@ -2,14 +2,17 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh" - inst_multiple setenforce -diff --git a/modules.d/98syslog/module-setup.sh b/modules.d/98syslog/module-setup.sh -index daa9021..b8494c8 100755 ---- a/modules.d/98syslog/module-setup.sh -+++ b/modules.d/98syslog/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - # do not add this module by default - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - local _i - local _installs -diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index a5ac2a5..748e25b 100755 ---- a/modules.d/98systemd/module-setup.sh -+++ b/modules.d/98systemd/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - [[ $mount_needs ]] && return 1 - if [[ -x $systemdutildir/systemd ]]; then -@@ -13,10 +14,12 @@ check() { - return 1 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - local _mods - -diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh -index a668069..1af789f 100755 ---- a/modules.d/98usrmount/module-setup.sh -+++ b/modules.d/98usrmount/module-setup.sh -@@ -2,6 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - local _init - [[ $mount_needs ]] && return 1 -@@ -10,10 +11,12 @@ check() { - return 0 - } - -+# called by dracut - depends() { - echo 'fs-lib' - } - -+# called by dracut - install() { - if ! dracut_module_included "systemd"; then - inst_hook pre-pivot 50 "$moddir/mount-usr.sh" -diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index d33a0fb..e53cf2e 100755 ---- a/modules.d/99base/module-setup.sh -+++ b/modules.d/99base/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 0 - } - -+# called by dracut - depends() { - echo udev-rules - return 0 - } - -+# called by dracut - install() { - local _d - -diff --git a/modules.d/99fs-lib/module-setup.sh b/modules.d/99fs-lib/module-setup.sh -index c9c88b7..7979bab 100755 ---- a/modules.d/99fs-lib/module-setup.sh -+++ b/modules.d/99fs-lib/module-setup.sh -@@ -2,10 +2,12 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 0 - } - -+# called by dracut - depends() { - return 0 - } -@@ -44,6 +46,7 @@ include_fs_helper_modules() { - esac - } - -+# called by dracut - installkernel() { - # xfs and btrfs needs crc32c... - if [[ $hostonly ]]; then -@@ -54,6 +57,7 @@ installkernel() { - fi - } - -+# called by dracut - install() { - local _helpers - -diff --git a/modules.d/99img-lib/module-setup.sh b/modules.d/99img-lib/module-setup.sh -index 28bfc2a..2c3c992 100755 ---- a/modules.d/99img-lib/module-setup.sh -+++ b/modules.d/99img-lib/module-setup.sh -@@ -1,6 +1,7 @@ - #!/bin/bash - # module-setup for img-lib - -+# called by dracut - check() { - for cmd in tar gzip dd; do - command -v $cmd >/dev/null || return 1 -@@ -8,10 +9,12 @@ check() { - return 255 - } - -+# called by dracut - depends() { - return 0 - } - -+# called by dracut - install() { - inst_multiple tar gzip dd bash - # TODO: make this conditional on a cmdline flag / config option -diff --git a/modules.d/99shutdown/module-setup.sh b/modules.d/99shutdown/module-setup.sh -index 5361936..c09d886 100755 ---- a/modules.d/99shutdown/module-setup.sh -+++ b/modules.d/99shutdown/module-setup.sh -@@ -2,15 +2,18 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - -+# called by dracut - check() { - return 0 - } - -+# called by dracut - depends() { - echo base - return 0 - } - -+# called by dracut - install() { - local _d - inst_multiple umount poweroff reboot halt losetup diff --git a/0002-network-understand-ip-.-dns1-dns2.patch b/0002-network-understand-ip-.-dns1-dns2.patch new file mode 100644 index 0000000..ef256e0 --- /dev/null +++ b/0002-network-understand-ip-.-dns1-dns2.patch @@ -0,0 +1,50 @@ +From 66bfe863f551389add3a3a53067264ce32eba302 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 30 Jan 2014 13:50:02 +0100 +Subject: [PATCH] network: understand ip=.....:: + +--- + modules.d/40network/net-lib.sh | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 7544401..36fad12 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -339,7 +339,7 @@ ip_to_var() { + fi + done + +- unset ip srv gw mask hostname dev autoconf macaddr mtu ++ unset ip srv gw mask hostname dev autoconf macaddr mtu dns1 dns2 + case $# in + 0) autoconf="error" ;; + 1) autoconf=$1 ;; +@@ -347,11 +347,22 @@ ip_to_var() { + 3) [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3 ;; + 4) [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3; [ -n "$4" ] && macaddr=$4 ;; + *) [ -n "$1" ] && ip=$1; [ -n "$2" ] && srv=$2; [ -n "$3" ] && gw=$3; [ -n "$4" ] && mask=$4; +- [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7; [ -n "$8" ] && mtu=$8; +- if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then +- macaddr="${9}:${10}:${11}:${12}:${13}:${14}" +- fi +- ;; ++ [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7; ++ case "$8" in ++ [0-9]*:*|[0-9]*.[0-9]*.[0-9]*.[0-9]*) ++ dns1="$mtu"; unset $mtu ++ [ -n "$9" ] && dns2="$9" ++ ;; ++ [0-9]*) ++ mtu="$8" ++ ;; ++ *) ++ if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then ++ macaddr="${9}:${10}:${11}:${12}:${13}:${14}" ++ fi ++ ;; ++ esac ++ ;; + esac + + # ip= means anaconda-style static config argument cluster: diff --git a/0003-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch b/0003-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch deleted file mode 100644 index 2a53292..0000000 --- a/0003-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6c8fc6e377b94e26e6d03cddbf174cb27caad0a6 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 8 Oct 2013 15:02:14 +0200 -Subject: [PATCH] 10i18n/parse-i18n.sh: parse rd.vconsole and rd.locale - -and removed systemd part, because parse-i18n.sh is not even installed in -systemd driven initramfs images. ---- - modules.d/10i18n/parse-i18n.sh | 22 ++++++++-------------- - 1 file changed, 8 insertions(+), 14 deletions(-) - -diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh -index 348c5bc..416a746 100755 ---- a/modules.d/10i18n/parse-i18n.sh -+++ b/modules.d/10i18n/parse-i18n.sh -@@ -19,24 +19,18 @@ inst_key_val() { - unset _value - } - --inst_key_val '' /etc/vconsole.conf vconsole.keymap KEYMAP -d KEYTABLE --inst_key_val '' /etc/vconsole.conf vconsole.font FONT -d SYSFONT --inst_key_val '' /etc/vconsole.conf vconsole.font.map FONT_MAP -d CONTRANS --inst_key_val '' /etc/vconsole.conf vconsole.font.unimap FONT_UNIMAP -d UNIMAP --inst_key_val 1 /etc/vconsole.conf vconsole.font.unicode UNICODE vconsole.unicode --inst_key_val '' /etc/vconsole.conf vconsole.keymap.ext EXT_KEYMAP -+inst_key_val '' /etc/vconsole.conf rd.vconsole.keymap vconsole.keymap KEYMAP -d KEYTABLE -+inst_key_val '' /etc/vconsole.conf rd.vconsole.font vconsole.font FONT -d SYSFONT -+inst_key_val '' /etc/vconsole.conf rd.vconsole.font.map vconsole.font.map FONT_MAP -d CONTRANS -+inst_key_val '' /etc/vconsole.conf rd.vconsole.font.unimap vconsole.font.unimap FONT_UNIMAP -d UNIMAP -+inst_key_val 1 /etc/vconsole.conf rd.vconsole.font.unicode vconsole.font.unicode UNICODE vconsole.unicode -+inst_key_val '' /etc/vconsole.conf rd.vconsole.keymap.ext vconsole.keymap.ext EXT_KEYMAP - --inst_key_val '' /etc/locale.conf locale.LANG LANG --inst_key_val '' /etc/locale.conf locale.LC_ALL LC_ALL -+inst_key_val '' /etc/locale.conf rd.locale.LANG locale.LANG LANG -+inst_key_val '' /etc/locale.conf rd.locale.LC_ALL locale.LC_ALL LC_ALL - - if [ -f /etc/locale.conf ]; then - . /etc/locale.conf - export LANG - export LC_ALL - fi -- --if [ -n "$DRACUT_SYSTEMD" ]; then -- rm -f -- /etc/udev/rules.d/10-console.rules -- rm -f -- /lib/udev/rules.d/10-console.rules -- rm -f -- /lib/udev/console_init --fi diff --git a/0003-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch b/0003-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch new file mode 100644 index 0000000..3c59bae --- /dev/null +++ b/0003-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch @@ -0,0 +1,36 @@ +From c8a9a6b4a7dff76c66e84f65b2717632e1bb4505 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 30 Jan 2014 16:11:40 +0100 +Subject: [PATCH] dracut.sh: only set the owner of files to 0:0, if generated + as non-root + +If the root user generates the initramfs image, preserve the ownership +of the files. This of course cannot be done for non-root users +generating an initramfs image. +--- + dracut.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 9b715ab..ccff358 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1462,13 +1462,16 @@ fi + + rm -f -- "$outfile" + dinfo "*** Creating image file ***" ++ ++[[ "$UID" != 0 ]] && cpio_owner_root="-R 0:0" ++ + if [[ $create_early_cpio = yes ]]; then + echo 1 > "$early_cpio_dir/d/early_cpio" + # The microcode blob is _before_ the initramfs blob, not after +- (cd "$early_cpio_dir/d"; find . -print0 | cpio --null -R 0:0 -H newc -o --quiet >../early.cpio) ++ (cd "$early_cpio_dir/d"; find . -print0 | cpio --null $cpio_owner_root -H newc -o --quiet >../early.cpio) + mv $early_cpio_dir/early.cpio $outfile.$$ + fi +-if ! ( umask 077; cd "$initdir"; find . -print0 | cpio --null -R 0:0 -H newc -o --quiet | \ ++if ! ( umask 077; cd "$initdir"; find . -print0 | cpio --null $cpio_owner_root -H newc -o --quiet | \ + $compress >> "$outfile.$$"; ); then + dfatal "dracut: creation of $outfile.$$ failed" + exit 1 diff --git a/0004-dracut-functions.sh-also-search-in-the-updates-direc.patch b/0004-dracut-functions.sh-also-search-in-the-updates-direc.patch new file mode 100644 index 0000000..8a50d04 --- /dev/null +++ b/0004-dracut-functions.sh-also-search-in-the-updates-direc.patch @@ -0,0 +1,22 @@ +From f57850d7e8800cc28c766c77ad0a881a9b6a1f36 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 30 Jan 2014 14:27:18 +0100 +Subject: [PATCH] dracut-functions.sh: also search in the updates directory + +--- + dracut-functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 7cfa097..c766ca3 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -1551,7 +1551,7 @@ find_kernel_modules_by_path () { + _OLDIFS=$IFS + IFS=: + while read a rest; do +- [[ $a = */$1/* ]] || continue ++ [[ $a = */$1/* ]] || [[ $a = */updates/* ]] || continue + printf "%s\n" "$srcmods/$a" + done < "$srcmods/modules.dep" + IFS=$_OLDIFS diff --git a/0004-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch b/0004-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch deleted file mode 100644 index 956a70a..0000000 --- a/0004-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 05214a0bedc084a41c35a128609745ad04a0c6cf Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 8 Oct 2013 15:03:40 +0200 -Subject: [PATCH] dracut.sh: do not bail out, if kernel modules dir is missing - -and only print a warning message ---- - dracut.sh | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index e135dfc..d9533dd 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -496,17 +496,18 @@ if [[ $regenerate_all == "yes" ]]; then - ((ret+=$?)) - done - exit $ret --elif [[ $kernel ]]; then -- if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then -- printf -- "Kernel version $kernel has no modules in /lib/modules/$kernel\n" >&2 -- exit 1 -- fi - fi - - if ! [[ $kernel ]]; then - kernel=$(uname -r) - fi - -+if [[ $kernel ]]; then -+ if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then -+ printf -- "Kernel version $kernel has no module directory /lib/modules/$kernel\n" >&2 -+ fi -+fi -+ - if ! [[ $outfile ]]; then - [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id - diff --git a/0005-Doc-cleanup-extend-and-split-and-reuse.patch b/0005-Doc-cleanup-extend-and-split-and-reuse.patch deleted file mode 100644 index 9babc72..0000000 --- a/0005-Doc-cleanup-extend-and-split-and-reuse.patch +++ /dev/null @@ -1,3212 +0,0 @@ -From b6c8976811caec5cc352bb8f27cc6f53202ee9be Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 8 Oct 2013 14:59:47 +0200 -Subject: [PATCH] Doc: cleanup, extend and split and reuse - ---- - Makefile | 8 +- - dracut.8.asc | 61 +--- - dracut.asc | 888 +-------------------------------------------------- - dracut.cmdline.7.asc | 414 ++++++++++++++---------- - dracut.css | 434 +------------------------ - dracut.modules.7.asc | 293 +++++++++++++++++ - dracut.spec | 1 + - dracut.usage.asc | 526 ++++++++++++++++++++++++++++++ - 8 files changed, 1084 insertions(+), 1541 deletions(-) - create mode 100644 dracut.modules.7.asc - create mode 100644 dracut.usage.asc - -diff --git a/Makefile b/Makefile -index 124a41b..e7da948 100644 ---- a/Makefile -+++ b/Makefile -@@ -21,7 +21,8 @@ man1pages = lsinitrd.1 - man5pages = dracut.conf.5 - - man7pages = dracut.cmdline.7 \ -- dracut.bootup.7 -+ dracut.bootup.7 \ -+ dracut.modules.7 - - man8pages = dracut.8 \ - dracut-catimages.8 \ -@@ -37,7 +38,6 @@ man8pages = dracut.8 \ - - manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages) - -- - .PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh - - all: dracut-version.sh dracut-install -@@ -76,7 +76,9 @@ endif - %.xml: %.asc - asciidoc -d manpage -b docbook -o $@ $< - --dracut.html: dracut.asc $(manpages) dracut.css -+dracut.8: dracut.usage.asc dracut.8.asc -+ -+dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc - asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc - xsltproc -o dracut.html --xinclude -nonet \ - --stringparam custom.css.source dracut.css \ -diff --git a/dracut.8.asc b/dracut.8.asc -index 76fc75c..584514c 100644 ---- a/dracut.8.asc -+++ b/dracut.8.asc -@@ -10,7 +10,7 @@ dracut - low-level tool for generating an initramfs image - - SYNOPSIS - -------- --*dracut* ['OPTION...'] [ [__]] -+*dracut* [__OPTION...__] [____ [____]] - - DESCRIPTION - ----------- -@@ -37,53 +37,10 @@ Additional debugging info can be produced by adding **rd.debug** to the kernel c - _/run/initramfs/rdsosreport.txt_ contains all logs and the output of some tools. - It should be attached to any report about dracut problems. - --EXAMPLE --------- -- --To create a initramfs image, the most simple command is: ------ --# dracut ------ -- --This will generate a general purpose initramfs image, with all possible --functionality resulting of the combination of the installed dracut modules and --system tools. The image is /boot/initramfs-_++++_.img and --contains the kernel modules of the currently active kernel with version --_++++_. -- --If the initramfs image already exists, dracut will display an error message, and --to overwrite the existing image, you have to use the --force option. ------ --# dracut --force ------ -- --If you want to specify another filename for the resulting image you would issue --a command like: ------ --# dracut foobar.img ------ -- --To generate an image for a specific kernel version, the command would be: ------ --# dracut foobar.img 2.6.40-1.rc5.f20 ------ -- --A shortcut to generate the image at the default location for a specific kernel --version is: ------ --# dracut --kver 2.6.40-1.rc5.f20 ------ -- --If you want to create lighter, smaller initramfs images, you may want to specify --the --hostonly or -H option. Using this option, the resulting image will --contain only those dracut modules, kernel modules and filesystems, which are --needed to boot this specific machine. This has the drawback, that you can't put --the disk on another controller or machine, and that you can't switch to another --root filesystem, without recreating the initramfs image. The usage of the ----hostonly option is only for experts and you will have to keep the broken --pieces. At least keep a copy of a general purpose image (and corresponding --kernel) as a fallback to rescue your system. -+USAGE -+----- - -+include::dracut.usage.asc[] - - OPTIONS - ------- -@@ -337,7 +294,7 @@ provide a valid _/etc/fstab_. - **-N, --no-hostonly**:: - Disable Host-Only mode - --**--persistent-policy** __:: -+**--persistent-policy** __:: - Use __ to address disks and partitions. - __ can be any directory name found in /dev/disk. - E.g. "by-uuid", "by-label" -@@ -345,7 +302,7 @@ provide a valid _/etc/fstab_. - **--fstab**:: - Use _/etc/fstab_ instead of _/proc/self/mountinfo_. - --**--add-fstab** __ :: -+**--add-fstab** __:: - Add entries of __ to the initramfs /etc/fstab. - - **--mount** "__ __ __ __":: -@@ -358,13 +315,13 @@ provide a valid _/etc/fstab_. - LVM or an encrypted partition. - [NB --device can be used for compatibility with earlier releases] - --**-i, --include** __ __:: -+**-i, --include** __ __:: - include the files in the SOURCE directory into the - TARGET directory in the final initramfs. If SOURCE is a file, it will be - installed to TARGET in the final initramfs. This parameter can be specified - multiple times. - --**-I, --install** __:: -+**-I, --install** __:: - install the space separated list of files into the initramfs. - + - [NOTE] -@@ -481,7 +438,7 @@ _/etc/conf.d/_:: - _/etc/cmdline_:: - Can contain additional command line options. Deprecated, better use /etc/cmdline.d/*.conf. - --_/etc/cmdline.d/*.conf:: -+_/etc/cmdline.d/*.conf_:: - Can contain additional command line options. - - AVAILABILITY -diff --git a/dracut.asc b/dracut.asc -index c011658..031b201 100644 ---- a/dracut.asc -+++ b/dracut.asc -@@ -1,7 +1,7 @@ - dracut - ====== - Harald Hoyer --v2.0, March 2011 -+v3.0, October 2013 - - :language: bash - -@@ -145,885 +145,10 @@ This ensures, that all devices are disassembled and unmounted cleanly. - - = User Manual - --== Creating an initramfs Image --To create a initramfs image, the most simple command is: ------ --# dracut ------ -- --This will generate a general purpose initramfs image, with all possible --functionality resulting of the combination of the installed dracut modules and --system tools. The image is /boot/initramfs-_++++_.img and --contains the kernel modules of the currently active kernel with version --_++++_. -- --If the initramfs image already exists, dracut will display an error message, and --to overwrite the existing image, you have to use the --force option. ------ --# dracut --force ------ -- --If you want to specify another filename for the resulting image you would issue --a command like: ------ --# dracut foobar.img ------ -- --To generate an image for a specific kernel version, the command would be: ------ --# dracut foobar.img 2.6.40-1.rc5.f20 ------ -- --A shortcut to generate the image at the default location for a specific kernel --version is: ------ --# dracut --kver 2.6.40-1.rc5.f20 ------ -- --If you want to create lighter, smaller initramfs images, you may want to specify --the --host-only or -H option. Using this option, the resulting image will --contain only those dracut modules, kernel modules and filesystems, which are --needed to boot this specific machine. This has the drawback, that you can't put --the disk on another controller or machine, and that you can't switch to another --root filesystem, without recreating the initramfs image. The usage of the ----host-only option is only for experts and you will have to keep the broken --pieces. At least keep a copy of a general purpose image (and corresponding --kernel) as a fallback to rescue your system. -- --=== Inspecting the Contents --To see the contents of the image created by dracut, you can use the lsinitrd tool. ------ --# lsinitrd /boot/initramfs-$(uname -r).img | less ------ -- --To display the contents of a file in the initramfs also use the lsinitrd tool: ------ --# lsinitrd /boot/initramfs-$(uname -r).img /etc/ld.so.conf --include ld.so.conf.d/*.conf ------ -- --=== Adding dracut Modules --Some dracut modules are turned off by default and have to be activated manually. --You can do this by adding the dracut modules to the configuration file --_/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See <>. --You can also add dracut modules on the command line --by using the -a or --add option: ------ --# dracut --add bootchart initramfs-bootchart.img ------ -- --To see a list of available dracut modules, use the --list-modules option: ------ --# dracut --list-modules ------ -- --or, if you have a dracut version earlier than +008+, issue the command: ------ --# for mod in /usr/lib/dracut/modules.d/*; do echo ${mod##*/??}; done ------ -- --=== Omitting dracut Modules --Sometimes you don't want a dracut module to be included for reasons of speed, --size or functionality. To do this, either specify the omit_dracutmodules --variable in the _dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_ configuration --file (see <>), or use the -o or --omit option --on the command line: ------ --# dracut -o "multipath lvm" no-multipath-lvm.img ------ -- --=== Adding Kernel Modules --If you need a special kernel module in the initramfs, which is not --automatically picked up by dracut, you have the use the --add-drivers option --on the command line or the drivers vaiable in the _/etc/dracut.conf_ --or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <>): ------ --# dracut --add-drivers mymod initramfs-with-mymod.img ------ -- --== Boot parameters --The generated initramfs.img file normally does not contain any system --configuration files (except for some special exceptions), so the configuration --has to be done on the kernel command line. With this flexibility, you can easily --boot from a changed root partition, without the need to recompile the initramfs --image. So, you could completly change your root partition (move it inside a md --raid with encryption and LVM on top), as long as you specify the correct --filesystem LABEL or UUID on the kernel command line for your root device, dracut --will find it and boot from it. -- --The kernel command line usually can be configured in _/boot/grub/grub.conf_, if --grub is your bootloader and it also can be edited in the real boot process in --the grub menu. -- --The kernel command line can also be provided by the dhcp server with the --root-path option. See <>. -- --For a full reference of all kernel command line parameters, see <>. -- --=== Specifying the root Device --This is the only option dracut really needs to boot from your root partition. --Because your root partition can live in various environments, there are a lot of --formats for the root= option. The most basic one is root=_++++_: ------ --root=/dev/sda2 ------ -- --Because device node names can change, dependent on the drive ordering, you are --encouraged to use the filesystem identifier (UUID) or filesystem label (LABEL) --to specify your root partition: ------ --root=UUID=19e9dda3-5a38-484d-a9b0-fa6b067d0331 ------ -- --or -- ------ --root=LABEL=myrootpartitionlabel ------ -- --To see all UUIDs or LABELs on your system, do: ------ --# ls -l /dev/disk/by-uuid ------ -- --or -- ------ --# ls -l /dev/disk/by-label ------ -- --If your root partition is on the network see <>. -- --=== Keyboard Settings --If you have to input passwords for encrypted disk volumes, you might want to set --the keyboard layout and specify a display font. -- --A typical german kernel command would contain: ------ --vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys locale.LANG=de_DE.UTF-8 ------ -- --Setting these options can override the setting stored on your system, if you use --a modern init system, like systemd. -- --For dracut versions prior to version +008+ the line would look like: ------ --LANG=de_DE.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=de-latin1-nodeadkeys ------ -- --=== Blacklisting Kernel Modules --Sometimes it is required to prevent the automatic kernel module loading of a --specific kernel module. To do this, just add rd.blacklist=_++++_, with _++++_ not containing the _.ko_ --suffix, to the kernel command line. For example: ------ --rd.driver.blacklist=mptsas rd.driver.blacklist=nouveau ------ -- --The option can be specified multiple times on the kernel command line. -- --=== Speeding up the Boot Process --If you want to speed up the boot process, you can specify as much information --for dracut on the kernel command as possible. For example, you can tell dracut, --that you root partition is not on a LVM volume or not on a raid partition, or --that it lives inside a specific crypto LUKS encrypted volume. By default, dracut --searches everywhere. A typical dracut kernel command line for a plain primary or --logical partition would contain: ------ --rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 ------ -- --On systems with dracut version prior to +008+ the line would look like: ------ --rd_NO_LUKS rd_NO_LVM rd_NO_MD rd_NO_DM ------ -- --This turns off every automatic assembly of LVM, MD raids, DM raids and crypto LUKS. -- --Of course, you could also omit the dracut modules in the initramfs creation --process, but then you would lose the posibility to turn it on on demand. -- -- --[[Injecting]] --=== Injecting custom Files --To add your own files to the initramfs image, you have several possibilities. -- --The --include option let you specify a source path and a target path. For example ------ --# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img ------ --will create an initramfs image, where the file cmdline-preset will be copied --inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once. -- -- ------ --# mkdir rd.live.overlay --# mkdir rd.live.overlay/etc --# mkdir rd.live.overlay/etc/conf.d --# mkdir rd.live.overlay/etc/cmdline.d --# echo "ip=auto" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf --# echo export FOO=testtest >> rd.live.overlay/etc/conf.d/testvar.conf --# echo export BAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf --# tree rd.live.overlay/ --rd.live.overlay/ --└── etc -- ├── cmdline.d -- │   └── mycmdline.conf -- └── conf.d -- └── testvar.conf -- --# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img ------ -- --This will put the contents of the rd.live.overlay directory into the root of the --initramfs image. -- --The --install option let you specify several files, which will get installed in --the initramfs image at the same location, as they are present on initramfs --creation time. -- -- ------ --# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img ------ -- --This will create an initramfs with the strace, fsck.ext3 and ssh executables, --together with the libraries needed to start those. The --install option can be --specified multiple times. -- -- --[[NetworkBoot]] --== Network Boot -- --If your root partition is on a network drive, you have to have the network --dracut modules installed to create a network aware initramfs image. -- --On a Red Hat Enterprise Linux or Fedora system, this means, you have to install --the _dracut-network_ rpm package: -- -- ------ --# yum install dracut-network ------ -- --The resulting initramfs image can be served by a boot manager residing on your --local hard drive or it can be served by a PXE/TFTP server. -- --How to setup your PXE/TFTP server can be found in the --http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red --Hat Enterprise Linux Storage Administration Guide]. -- --If you specify ip=auto on the kernel command line, then dracut asks a dhcp --server about the ip adress for the machine. The dhcp server can also serve an --additional root-path, which will set the root device for dracut. With this --mechanism, you have static configuration on your client machine and a --centralized boot configuration on your TFTP/DHCP server. If you can't pass a --kernel command line, then you can inject _/etc/cmdline.d/mycmdline.conf_, with a method described --in <>. -- -- -- -- --=== Reducing the Image Size -- --To reduce the size of the initramfs, you should create it with by ommitting all --dracut modules, which you know, you don't need to boot the machine. -- --You can also specify the exact dracut and kernel modules to produce a very tiny --initramfs image. -- --For example for a NFS image, you would do: -- -- ------ --# dracut -m "nfs network base" initramfs-nfs-only.img ------ -- --Then you would boot from this image with your target machine and reduce the size --once more by creating it on the target machine with the --host-only option: -- -- ------ --# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img ------ -- --This will reduce the size of the initramfs image significantly. -- -- -- --=== NFS Root Device -- --FIXME -- --=== iSCSI Root Device -- --FIXME -- --=== FCoE Root Device -- --FIXME -- --== Troubleshooting -- --If the boot process does not succeed, you have several options to debug the --situation. Some of the basic operations are covered here. For more information --you should also visit: --http://fedoraproject.org/wiki/How_to_debug_Dracut_problems -- -- --[[identifying-your-problem-area]] --=== Identifying your problem area --. Remove ''rhgb'' and ''quiet'' from the kernel command line --. Add ''rd.shell'' to the kernel command line. This will present a shell should --dracut be unable to locate your root device --. Add ''rd.shell rd.debug log_buf_len=1M'' to the kernel command line so that --dracut shell commands are printed as they are executed --. With dracut >= 002-11, you can inspect the rd.debug output with: --+ ------ --# less /run/initramfs/init.log --# dmesg | less ------ --. With dracut >= 022 and systemd, you can inspect the rd.debug output with: ------ --# journalctl -ab ------ --. With dracut >= 025 the file /run/initramfs/rdsosreport.txt is generated, which contains all the logs and the output of all significant tools, which are mentioned later. -- --If you want to save that output, simply mount /boot by hand or insert an USB stick and mount that. --Then you can store the output for later inspection. -- --[[information-to-include-in-your-report]] --=== Information to include in your report -- --[[all-bug-reports]] --==== All bug reports --In all cases, the following should be mentioned and attached to your bug report: -- --* The exact kernel command-line used. Typically from the bootloader --configuration file (e.g. _/etc/grub.conf_) or from _/proc/cmdline_. --* A copy of your disk partition information from _/etc/fstab_, which might be --obtained booting an old working initramfs or a rescue medium. --* A device listing from device-mapper. This can be obtained by running the --command --+ ------ --# dmsetup ls --tree ------ --+ --* A list of block device attributes. This can be obtained by running the commands: --+ ------ --# blkid -p --# blkid -p -o udev ------ --* Turn on dracut debugging (see _the 'debugging dracut' section_), and attach --all relevant information from the boot log. This can be obtained by running the --command --+ ------ --# dmesg|grep dracut ------ --+ --* If you use a dracut configuration file, please include _/etc/dracut.conf_ and --all files in _/etc/dracut.conf.d/*.conf_ -- --[[logical-volume-management-related-problems]] --==== Logical Volume Management related problems --As well as the information from <> include the following --information: -- --* Include physical volume information by running the command: --+ ------ --# lvm pvdisplay ------ --+ --* Include volume group information by running the command: --+ ------ --# lvm vgdisplay ------ --+ --* Include logical volume information by running the command: --+ ------ --# lvm lvdisplay ------ -- --[[software-raid-related-problems]] --==== Software RAID related problems --As well as the information from <>, include the following --information: -- --* If using software RAID disk partitions, please include the output of --+ ------ --# cat /proc/mdstat ------ -- --[[network-root-device-related-problems]] --==== Network root device related problems --This section details information to include when experiencing problems on a --system whose root device is located on a network attached volume (e.g. iSCSI, --NFS or NBD). As well as the information from <>, include the --following information: -- -- --* Please include the output of --+ ------ --# /sbin/ifup --# ip addr show ------ -- --[[debugging-dracut]] --=== Debugging dracut -- -- --[[configure-a-serial-console]] --==== Configure a serial console -- --Successfully debugging dracut will require some form of console --logging during the system boot. This section documents configuring a --serial console connection to record boot messages. -- --. First, enable serial console output for both the kernel and the bootloader. --. Open the file _/etc/grub.conf_ for editing. Below the line ''timeout=5'', add --the following: --+ ------ --serial --unit=0 --speed=9600 --terminal --timeout=5 serial console ------ --+ --. Also in _/etc/grub.conf_, add the following boot arguemnts to the ''kernel'' --line: --+ ------ --console=tty0 console=ttyS0,9600 ------ --+ --. When finished, the _/etc/grub.conf_ file should look similar to the example --below. --+ ------ --default=0 --timeout=5 --serial --unit=0 --speed=9600 --terminal --timeout=5 serial console --title Fedora (2.6.29.5-191.fc11.x86_64) -- root (hd0,0) -- kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 console=ttyS0,9600 -- initrd /dracut-2.6.29.5-191.fc11.x86_64.img ------ --+ --. More detailed information on how to configure the kernel for console output --can be found at --http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL. --. Redirecting non-interactive output --+ ---- --NOTE: You can redirect all non-interactive output to _/dev/kmsg_ and the kernel --will put it out on the console when it reaches the kernel buffer by doing -- ------ --# exec >/dev/kmsg 2>&1 >). -- --[[accessing-the-root-volume-from-the-dracut-shell]] --==== Accessing the root volume from the dracut shell --From the dracut debug shell, you can manually perform the task of locating and --preparing your root volume for boot. The required steps will depend on how your --root volume is configured. Common scenarios include: -- --* A block device (e.g. _/dev/sda7_) --* A LVM logical volume (e.g. _/dev/VolGroup00/LogVol00_) --* An encrypted device (e.g. _/dev/mapper/luks-4d5972ea-901c-4584-bd75-1da802417d83_) --* A network attached device (e.g. netroot=iscsi:@192.168.0.4::3260::iqn.2009-02.org.fedoraproject:for.all) -- --The exact method for locating and preparing will vary. However, to continue with --a successful boot, the objective is to locate your root volume and create a --symlink _/dev/root_ which points to the file system. For example, the following --example demonstrates accessing and booting a root volume that is an encrypted --LVM Logical volume. -- --. Inspect your partitions using parted --+ ------ --# parted /dev/sda -s p --Model: ATA HTS541060G9AT00 (scsi) --Disk /dev/sda: 60.0GB --Sector size (logical/physical): 512B/512B --Partition Table: msdos --Number Start End Size Type File system Flags --1 32.3kB 10.8GB 107MB primary ext4 boot --2 10.8GB 55.6GB 44.7GB logical lvm ------ --+ --. You recall that your root volume was a LVM logical volume. Scan and activate --any logical volumes. --+ ------ --# lvm vgscan --# lvm vgchange -ay ------ --+ --. You should see any logical volumes now using the command blkid: --+ ------ --# blkid --/dev/sda1: UUID="3de247f3-5de4-4a44-afc5-1fe179750cf7" TYPE="ext4" --/dev/sda2: UUID="Ek4dQw-cOtq-5MJu-OGRF-xz5k-O2l8-wdDj0I" TYPE="LVM2_member" --/dev/mapper/linux-root: UUID="def0269e-424b-4752-acf3-1077bf96ad2c" TYPE="crypto_LUKS" --/dev/mapper/linux-home: UUID="c69127c1-f153-4ea2-b58e-4cbfa9257c5e" TYPE="ext3" --/dev/mapper/linux-swap: UUID="47b4d329-975c-4c08-b218-f9c9bf3635f1" TYPE="swap" ------ --+ --. From the output above, you recall that your root volume exists on an encrypted --block device. Following the guidance disk encryption guidance from the --Installation Guide, you unlock your encrypted root volume. --+ ------ --# UUID=$(cryptsetup luksUUID /dev/mapper/linux-root) --# cryptsetup luksOpen /dev/mapper/linux-root luks-$UUID --Enter passphrase for /dev/mapper/linux-root: --Key slot 0 unlocked. ------ --+ --. Next, make a symbolic link to the unlocked root volume --+ ------ --# ln -s /dev/mapper/luks-$UUID /dev/root ------ --+ --. With the root volume available, you may continue booting the system by exiting --the dracut shell --+ ------ --# exit ------ -- --[[additional-dracut-boot-parameters]] --==== Additional dracut boot parameters --For more debugging options, see <> in <>. -- -- --[[debugging-dracut-on-shutdown]] --==== Debugging dracut on shutdown -- --To debug the shutdown sequence on systemd systems, you can _rd.break_ --on _pre-shutdown_ or _shutdown_. -- --To do this from an already booted system: ------ --# mkdir -p /run/initramfs/etc/cmdline.d --# echo "rd.break=pre-shutdown" > /run/initramfs/etc/cmdline.d/debug.conf --# touch /run/initramfs/.need_shutdown ------ -- --This will give you a dracut shell after the system pivot'ed back in the initramfs. -- -- --= Developer Manual -- --== dracut Components -- --dracut uses a modular system to build and extend the initramfs image. All --modules are located in _/usr/lib/dracut/modules.d_ or in _/modules.d_. --The most basic dracut module is _99base_. In _99base_ the initial shell script --init is defined, which gets run by the kernel after initramfs loading. Although --you can replace init with your own version of _99base_, this is not encouraged. --Instead you should use, if possible, the hooks of dracut. All hooks, and the --point of time in which they are executed, are described in <>. -- --The main script, which creates the initramfs is dracut itsself. It parses all --arguments and sets up the directory, in which everything is installed. It then --executes all check, install, installkernel scripts found in the modules, which --are to be processed. After everything is installed, the install directory is --archived and compressed to the final initramfs image. All helper functions used --by check, install and installkernel are found in in the file _dracut-functions_. --These shell functions are available to all module installer (install, --installkernel) scripts, without the need to source _dracut-functions_. -- --A module can check the preconditions for install and installkernel with the --check script. Also dependencies can be expressed with check. If a module passed --check, install and installkernel will be called to install all of the necessary --files for the module. To split between kernel and non-kernel parts of the --installation, all kernel module related parts have to be in installkernel. All --other files found in a module directory are module specific and mostly are hook --scripts and udev rules. -- -- --[[stages]] --== Boot Process Stages -- --dracut modules can insert custom script at various points, to control the boot --process. --These hooks are plain directories containing shell scripts ending with ".sh", --which are sourced by init. --Common used functions are in _dracut-lib.sh_, which can be sourced by any script. -- --=== Hook: cmdline -- --The _cmdline_ hook is a place to insert scripts to parse the kernel command line --and prepare the later actions, like setting up udev rules and configuration --files. -- --In this hook the most important environment variable is defined: root. The --second one is rootok, which indicates, that a module claimed to be able to parse --the root defined. So for example, **root=**__iscsi:....__ will be claimed by the --iscsi dracut module, which then sets rootok. -- --=== Hook: pre-udev -- --This hook is executed right after the cmdline hook and a check if root and --rootok were set. Here modules can take action with the final root, and before --udev has been run. -- --=== Start Udev -- --Now udev is started and the logging for udev is setup. -- --=== Hook: pre-trigger -- --In this hook, you can set udev environment variables with **udevadm control ----property=KEY=_value_** or control the further execution of udev with --udevadm. -- --=== Trigger Udev -- --udev is triggered by calling udevadm trigger, which sends add events for all --devices and subsystems. -- --=== Main Loop -- --In the main loop of dracut loops until udev has settled and --all scripts in _initqueue/finished_ returned true. --In this loop there are three hooks, where scripts can be inserted --by calling /sbin/initqueue. -- --==== Initqueue -- --This hook gets executed every time a script is inserted here, regardless of the --udev state. -- --==== Initqueue settled -- --This hooks (initqueue/settled) gets executed every time udev has settled. -- -- --==== Initqueue timeout -- --This hooks (initqueue/timeout) gets executed, when the main loop counter becomes half of the --rd.retry counter. -- --==== Initqueue finished -- --This hook (initqueue/finished) is called after udev has settled and --if all scripts herein return 0 the main loop will be ended. --Abritary scripts can be added here, to loop in the --initqueue until something happens, which a dracut module wants to wait for. -- --=== Hook: pre-mount -- --Before the root device is mounted all scripts in the hook pre-mount are --executed. In some cases (e.g. NFS) the real root device is already mounted, --though. -- --=== Hook: mount -- --This hook is mainly to mount the real root device. -- --=== Hook: pre-pivot -- --This hook is called before cleanup hook, This is a good place for --actions other than cleanups which need to be called before pivot. -- --=== Hook: cleanup -- --This hook is the last hook and is called before init finally switches root to --the real root device. This is a good place to clean up and kill processes not --needed anymore. -- -- --=== Cleanup and switch_root -- --Init (or systemd) kills all udev processes, cleans up the environment, --sets up the arguments for the real init process and finally calls switch_root. --switch_root removes the whole filesystem hierarchy of the initramfs, --chroot()s to the real root device and calls /sbin/init with the specified arguments. -- --To ensure all files in the initramfs hierarchy can be removed, all processes --still running from the initramfs should not have any open file descriptors left. -- --== Network Infrastructure -- --FIXME -- --== Writing a Module -- --A simple example module is _96insmodpost_, which modprobes a kernel module after --udev has settled and the basic device drivers have been loaded. -- --All module installation information is in the file module-setup.sh. -- --First we create a check() function, which just exits with 0 indicating that this --module should be included by default. -- --check(): ------ --return 0 ------ -- --The we create the install() function, which installs a cmdline hook with --priority number 20 called _parse-insmodpost.sh_. It also installs the --_insmodpost.sh_ script in _/sbin_. -- --install(): ------ --inst_hook cmdline 20 "$moddir/parse-insmodpost.sh" --inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh ------ -- --The _pase-instmodpost.sh_ parses the kernel command line for a argument --rd.driver.post, blacklists the module from being autoloaded and installs the --hook _insmodpost.sh_ in the _initqueue/settled_. -- --_parse-insmodpost.sh_: ------ --for p in $(getargs rd.driver.post=); do -- echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf -- _do_insmodpost=1 --done -- --[ -n "$_do_insmodpost" ] && /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh --unset _do_insmodpost -- ------ -- --_insmodpost.sh_, which is called in the _initqueue/settled_ hook will just --modprobe the kernel modules specified in all rd.driver.post kernel command line --parameters. It runs after udev has settled and is only called once (--onetime). -- --_insmodpost.sh_: ------ --. /lib/dracut-lib.sh -- --for p in $(getargs rd.driver.post=); do -- modprobe $p --done -- ------ -- -- -- --=== check() -- --_check()_ is called by dracut to evaluate the inclusion of a dracut module in --the initramfs. -- --$hostonly:: If the $hostonly variable is set, then the module check() function --should be in "hostonly" mode, which means, that the check() should only return --0, if the module is really needed to boot this specific host. -- --check() should return with: -- --0:: Include the dracut module in the initramfs. -- --1:: Do not include the dracut module. The requirements are not fullfilled --(missing tools, etc.) -- --255:: Only include the dracut module, if another module requires it or if --explicitly specified in the config file or on the argument list. -- -- -- --=== depends() -- --The function depends() should echo all other dracut module names the module --depends on. -- -- -- --=== install() -- --inst_multiple -- --inst -- --inst_hook -- --inst_rules -- -- -- -- -- --=== installkernel() -- --instmods -- -- -- --=== Creation Functions -- --FIXME -- -- --=== Initramfs Functions -- --FIXME -- -- --=== Network Modules -- --FIXME -- - :leveloffset: 1 --[[dracutbootup7]] --include::dracut.bootup.7.asc[] -- --:leveloffset: 1 --[[dracut8]] - include::dracut.8.asc[] - -+:leveloffset: 1 - [[dracutconf5]] - include::dracut.conf.5.asc[] - -@@ -1036,6 +161,15 @@ include::lsinitrd.1.asc[] - [[mkinitrd8]] - include::mkinitrd.8.asc[] - -+= Developer Manual -+ -+:leveloffset: 1 -+[[dracutmodules7]] -+include::dracut.modules.7.asc[] -+ -+[[dracutbootup7]] -+include::dracut.bootup.7.asc[] -+ - :leveloffset: 0 - [appendix] - License -diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 4b2ab03..19bfb93 100644 ---- a/dracut.cmdline.7.asc -+++ b/dracut.cmdline.7.asc -@@ -31,16 +31,16 @@ line is the value, which is honored. - - Standard - ~~~~~~~~ --**init=**__:: -+**init=**____:: - specify the path to the init programm to be started after the initramfs has - finished - --**root=**__:: -+**root=**____:: - specify the block device to use as the root filesystem. - + --E.g.: --+ ------ -+[listing] -+.Example -+-- - root=/dev/sda1 - root=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1 - root=/dev/disk/by-label/Root -@@ -48,15 +48,17 @@ root=LABEL=Root - root=/dev/disk/by-uuid/3f5ad593-4546-4a94-a374-bcfb68aa11f7 - root=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 - root=PARTUUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 ------ -+-- - --**rootfstype=**__:: "auto" if not specified, e.g.: -+**rootfstype=**____:: "auto" if not specified. - + ------ -+[listing] -+.Example -+-- - rootfstype=ext3 ------ -+-- - --**rootflags=**__:: -+**rootflags=**____:: - specify additional mount options for the root filesystem. If not set, - _/etc/fstab_ of the real root will be parsed for special mount options and - mounted accordingly. -@@ -69,7 +71,7 @@ rootfstype=ext3 - force mounting _/_ and _/usr_ (if it is a separate device) read-write. - See also ro option. - --**rootfallback=**__:: -+**rootfallback=**____:: - specify the block device to use as the root filesystem, if the normal root cannot be found. - This can only be a simple block device with a simple file system, for which the filesystem - driver is either compiled in, or added manually to the initramfs. -@@ -83,16 +85,16 @@ rootfstype=ext3 - do not honor special mount options for the root filesystem found in - _/etc/fstab_ of the real root. - --**resume=**__:: -+**resume=**____:: - resume from a swap partition - + --E.g.: --+ ------ -+[listing] -+.Example -+-- - resume=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1 - resume=/dev/disk/by-uuid/3f5ad593-4546-4a94-a374-bcfb68aa11f7 - resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 ------ -+-- - - **rd.skipfsck**:: - skip fsck for rootfs and _/usr_. If you're mounting _/usr_ read-only and -@@ -102,19 +104,19 @@ resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 - - Misc - ~~~~ --**rd.driver.blacklist=**_[,,...]_:: -+**rd.driver.blacklist=**____[,____,...]:: - do not load kernel module . This parameter can be specified - multiple times. - --**rd.driver.pre=**_[,,...]_:: -+**rd.driver.pre=**____[,____,...]:: - force loading kernel module . This parameter can be specified - multiple times. - --**rd.driver.post=**_[,,...]_:: -+**rd.driver.post=**____[,____,...]:: - force loading kernel module after all automatic loading modules - have been loaded. This parameter can be specified multiple times. - --**rd.retry=**__:: -+**rd.retry=**____:: - specify how long dracut should wait for devices to appear. - The default is 30 seconds. After 2/3 of the time, degraded raids are force - started. If you have hardware, which takes a very long time to announce its -@@ -123,7 +125,7 @@ Misc - **rd.noverifyssl**:: - accept self-signed certificates for ssl downloads. - --**rd.ctty=**__**:: -+**rd.ctty=**____:: - specify the controlling terminal for the console. - This is useful, if you have multiple "console=" arguments. - -@@ -150,17 +152,20 @@ It should be attached to any report about dracut problems. - If "quiet" is set, it also logs to the console. - - **rd.memdebug=[0-3]**:: -- Print memory usage info at various points, set the verbose level from 0 to 3 -+ Print memory usage info at various points, set the verbose level from 0 to 3. + - Higher level means more debugging output: -++ -+---- - 0 - no output - 1 - partial /proc/meminfo - 2 - /proc/meminfo - 3 - /proc/meminfo + /proc/slabinfo -+---- - - **rd.break**:: - drop to a shell at the end - --**rd.break=**_{cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot|cleanup}_:: -+**rd.break=**__{cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot|cleanup}__:: - drop to a shell on defined breakpoint - - **rd.udev.info**:: -@@ -171,50 +176,56 @@ It should be attached to any report about dracut problems. - - I18N - ~~~~ --**vconsole.keymap=**__:: -+**rd.vconsole.keymap=**____:: - keyboard translation table loaded by loadkeys; taken from keymaps directory; -- will be written as KEYMAP to _/etc/vconsole.conf_ in the initramfs, e.g.: -+ will be written as KEYMAP to _/etc/vconsole.conf_ in the initramfs. - + ------ --vconsole.keymap=de-latin1-nodeadkeys ------ -+[listing] -+.Example -+-- -+rd.vconsole.keymap=de-latin1-nodeadkeys -+-- - --**vconsole.keymap.ext=**__:: -+**rd.vconsole.keymap.ext=**____:: - list of extra keymaps to bo loaded (sep. by space); will be written as - EXT_KEYMAP to _/etc/vconsole.conf_ in the initramfs - --**vconsole.unicode**[=_{0|1}_]:: -+**rd.vconsole.unicode**:: - boolean, indicating UTF-8 mode; will be written as UNICODE to - _/etc/vconsole.conf_ in the initramfs - --**vconsole.font=**__:: -+**rd.vconsole.font=**____:: - console font; taken from consolefonts directory; will be written as FONT to -- _/etc/vconsole.conf_ in the initramfs; e.g.: -+ _/etc/vconsole.conf_ in the initramfs. - + ------ --vconsole.font=LatArCyrHeb-16 ------ -+[listing] -+.Example -+-- -+rd.vconsole.font=LatArCyrHeb-16 -+-- - --**vconsole.font.map=**__:: -+**rd.vconsole.font.map=**____:: - see description of '-m' parameter in setfont manual; taken from consoletrans - directory; will be written as FONT_MAP to _/etc/vconsole.conf_ in the - initramfs - --**vconsole.font.unimap=**__:: -+**rd.vconsole.font.unimap=**____:: - see description of '-u' parameter in setfont manual; taken from unimaps - directory; will be written as FONT_UNIMAP to _/etc/vconsole.conf_ in the - initramfs - --**locale.LANG=**__:: -+**rd.locale.LANG=**____:: - taken from the environment; if no UNICODE is defined we set its value in - basis of LANG value (whether it ends with ".utf8" (or similar) or not); will -- be written as LANG to _/etc/locale.conf_ in the initramfs; e.g.: -+ be written as LANG to _/etc/locale.conf_ in the initramfs. - + ------ --locale.LANG=pl_PL.utf8 ------ -+[listing] -+.Example -+-- -+rd.locale.LANG=pl_PL.utf8 -+-- - --**locale.LC_ALL=**__:: -+**rd.locale.LC_ALL=**____:: - taken from the environment; will be written as LC_ALL to _/etc/locale.conf_ - in the initramfs - -@@ -223,11 +234,11 @@ LVM - **rd.lvm=0**:: - disable LVM detection - --**rd.lvm.vg=**__:: -+**rd.lvm.vg=**____:: - only activate the volume groups with the given name. rd.lvm.vg can be - specified multiple times on the kernel command line. - --**rd.lvm.lv=**__:: -+**rd.lvm.lv=**____:: - only activate the logical volumes with the given name. rd.lvm.lv can be - specified multiple times on the kernel command line. - -@@ -239,14 +250,14 @@ crypto LUKS - **rd.luks=0**:: - disable crypto LUKS detection - --**rd.luks.uuid=**__:: -+**rd.luks.uuid=**____:: - only activate the LUKS partitions with the given UUID. Any "luks-" of the - LUKS UUID is removed before comparing to __. - The comparisons also matches, if __ is only the beginning of the - LUKS UUID, so you don't have to specify the full UUID. - This parameter can be specified multiple times. - --**rd.luks.allow-discards=**__:: -+**rd.luks.allow-discards=**____:: - Allow using of discards (TRIM) requests for LUKS partitions with the given UUID. - Any "luks-" of the LUKS UUID is removed before comparing to __. - The comparisons also matches, if __ is only the beginning of the -@@ -261,16 +272,18 @@ crypto LUKS - - crypto LUKS - key on removable device support - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --**rd.luks.key=**_::_:: -+**rd.luks.key=**____:____:____:: - _keypath_ is a path to key file to look for. It's REQUIRED. When _keypath_ ends with '.gpg' it's considered to be key encrypted symmetrically with GPG. You will be prompted for password on boot. GPG support comes with 'crypt-gpg' module which needs to be added explicitly. - + - _keydev_ is a device on which key file resides. It might be kernel name of devices (should start with "/dev/"), UUID (prefixed with "UUID=") or label (prefix with "LABEL="). You don't have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time. - + - If _luksdev_ is given, the specified key will only be applied for that LUKS device. Possible values are the same as for _keydev_. Unless you have several LUKS devices, you don't have to specify this parameter. The simplest usage is: - + ------ -+[listing] -+.Example -+-- - rd.luks.key=/foo/bar.key ------ -+-- - + - As you see, you can skip colons in such a case. - + -@@ -281,20 +294,20 @@ to crypsetup luksFormat with _-d -_, too! - - Here follows example for key encrypted with GPG: - ------ --gpg --quiet --decrypt rootkey.gpg \ --| cryptsetup -d - -v \ ----cipher serpent-cbc-essiv:sha256 \ -+[listing] -+-- -+gpg --quiet --decrypt rootkey.gpg | \ -+cryptsetup -d - -v --cipher serpent-cbc-essiv:sha256 \ - --key-size 256 luksFormat /dev/sda3 ------ -+-- - - If you use plain keys, just add path to _-d_ option: - ------ --cryptsetup -d rootkey.key -v \ ----cipher serpent-cbc-essiv:sha256 \ ----key-size 256 luksFormat /dev/sda3 ------ -+[listing] -+-- -+cryptsetup -d rootkey.key -v --cipher serpent-cbc-essiv:sha256 \ -+ --key-size 256 luksFormat /dev/sda3 -+-- - =============================== - - MD RAID -@@ -314,7 +327,7 @@ MD RAID - **rd.md.waitclean=1**:: - wait for any resync, recovery, or reshape activity to finish before continuing - --**rd.md.uuid=**__:: -+**rd.md.uuid=**____:: - only activate the raid sets with the given UUID. This parameter can be - specified multiple times. - -@@ -323,7 +336,7 @@ DM RAID - **rd.dm=0**:: - disable DM RAID detection - --**rd.dm.uuid=**__:: -+**rd.dm.uuid=**____:: - only activate the raid sets with the given UUID. This parameter can be - specified multiple times. - -@@ -332,15 +345,17 @@ FIPS - **rd.fips**:: - enable FIPS - --**boot=**__:: -- specify the device, where /boot is located. e.g. -+**boot=**____:: -+ specify the device, where /boot is located. - + ------ -+[listing] -+.Example -+-- - boot=/dev/sda1 - boot=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1 - boot=UUID= - boot=LABEL=