diff options
| author | Harald Hoyer <harald@redhat.com> | 2014-03-20 12:31:00 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2014-03-20 12:31:00 +0100 |
| commit | 534e2b9806a03ee51c8adc878fcf7e5b3b405187 (patch) | |
| tree | 4625dff406d795be1b14b8e0a076de908f9be54b | |
| parent | 1678c4f3ca2f366b7d3fa96cf59784bd88f95130 (diff) | |
| download | dracut-534e2b9806a03ee51c8adc878fcf7e5b3b405187.tar.gz dracut-534e2b9806a03ee51c8adc878fcf7e5b3b405187.tar.xz dracut-534e2b9806a03ee51c8adc878fcf7e5b3b405187.zip | |
dracut-037
82 files changed, 34 insertions, 8783 deletions
@@ -21,3 +21,4 @@ /dracut-032.tar.bz2 /dracut-033.tar.bz2 /dracut-034.tar.bz2 +/dracut-037.tar.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 <harald@redhat.com> -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 <harald@redhat.com> -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 <pjones@redhat.com> - -+# 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/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 <harald@redhat.com> -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/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 <harald@redhat.com> -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 <harald@redhat.com> -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...'] [<image> [_<kernel version>_]] -+*dracut* [__OPTION...__] [__<image>__ [__<kernel version>__]] - - 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-_++<kernel version>++_.img and --contains the kernel modules of the currently active kernel with version --_++<kernel 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** _<policy>_:: -+**--persistent-policy** _<policy>_:: - Use _<policy>_ to address disks and partitions. - _<policy>_ 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** _<filename>_ :: -+**--add-fstab** _<filename>_:: - Add entries of _<filename>_ to the initramfs /etc/fstab. - - **--mount** "_<device>_ _<mountpoint>_ _<filesystem type>_ _<filesystem options>_":: -@@ -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** _<SOURCE>_ _<TARGET>_:: -+**-i, --include** _<SOURCE>_ _<TARGET>_:: - 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** _<file list>_:: -+**-I, --install** _<file list>_:: - 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 <harald@redhat.com> --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-_++<kernel version>++_.img and --contains the kernel modules of the currently active kernel with version --_++<kernel 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 <<dracutconf5>>. --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 <<dracutconf5>>), 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 <<dracutconf5>>): ------ --# 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 <<NetworkBoot>>. -- --For a full reference of all kernel command line parameters, see <<dracut8>>. -- --=== 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=_++<path to device --node>++_: ------ --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 <<NetworkBoot>>. -- --=== 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=_++<kernel module --name>++_, with _++<kernel module name>++_ 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 <<Injecting>>. -- -- -- -- --=== 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 <<all-bug-reports>> 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 <<all-bug-reports>>, 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 <<all-bug-reports>>, include the --following information: -- -- --* Please include the output of --+ ------ --# /sbin/ifup <interfacename> --# 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 </dev/console ------ ---- -- --[[using-the-dracut-shell]] --==== Using the dracut shell -- --dracut offers a shell for interactive debugging in the event dracut fails to --locate your root filesystem. To enable the shell: -- --. Add the boot parameter ''rd.shell'' to your bootloader configuration file --(e.g. _/etc/grub.conf_) --. Remove the boot arguments ''rhgb'' and ''quiet'' --+ --A sample _/etc/grub.conf_ bootloader configuration file is listed 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 rd.shell -- initrd /dracut-2.6.29.5-191.fc11.x86_64.img ------ --+ --. If system boot fails, you will be dropped into a shell as seen in the example below. --+ ------ --No root device found --Dropping to debug shell. -- --# ------ --+ --. Use this shell prompt to gather the information requested above (see <<all-bug-reports>>). -- --[[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 <<dracutkerneldebug>> in <<dracutcmdline7>>. -- -- --[[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 _<git-src>/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 <<stages>>. -- --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=**_<path to real init>_:: -+**init=**__<path to real init>__:: - specify the path to the init programm to be started after the initramfs has - finished - --**root=**_<path to blockdevice>_:: -+**root=**__<path to blockdevice>__:: - 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=**_<filesystem type>_:: "auto" if not specified, e.g.: -+**rootfstype=**__<filesystem type>__:: "auto" if not specified. - + ------ -+[listing] -+.Example -+-- - rootfstype=ext3 ------ -+-- - --**rootflags=**_<mount options>_:: -+**rootflags=**__<mount options>__:: - 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=**_<path to blockdevice>_:: -+**rootfallback=**__<path to blockdevice>__:: - 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=**_<path to resume partition>_:: -+**resume=**__<path to resume partition>__:: - 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=**_<drivername>[,<drivername>,...]_:: -+**rd.driver.blacklist=**__<drivername>__[,__<drivername>__,...]:: - do not load kernel module <drivername>. This parameter can be specified - multiple times. - --**rd.driver.pre=**_<drivername>[,<drivername>,...]_:: -+**rd.driver.pre=**__<drivername>__[,__<drivername>__,...]:: - force loading kernel module <drivername>. This parameter can be specified - multiple times. - --**rd.driver.post=**_<drivername>[,<drivername>,...]_:: -+**rd.driver.post=**__<drivername>__[,__<drivername>__,...]:: - force loading kernel module <drivername> after all automatic loading modules - have been loaded. This parameter can be specified multiple times. - --**rd.retry=**_<seconds>_:: -+**rd.retry=**__<seconds>__:: - 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=**_<terminal device>_**:: -+**rd.ctty=**__<terminal device>__:: - 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=**_<keymap base file name>_:: -+**rd.vconsole.keymap=**__<keymap base file name>__:: - 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=**_<list of keymap base file names>_:: -+**rd.vconsole.keymap.ext=**__<list of keymap base file names>__:: - 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=**_<font base file name>_:: -+**rd.vconsole.font=**__<font base file name>__:: - 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=**_<console map base file name>_:: -+**rd.vconsole.font.map=**__<console map base file name>__:: - 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=**_<unicode table base file name>_:: -+**rd.vconsole.font.unimap=**__<unicode table base file name>__:: - 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=**_<locale>_:: -+**rd.locale.LANG=**__<locale>__:: - 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=**_<locale>_:: -+**rd.locale.LC_ALL=**__<locale>__:: - 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=**_<volume group name>_:: -+**rd.lvm.vg=**__<volume group name>__:: - 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=**_<logical volume name>_:: -+**rd.lvm.lv=**__<logical volume name>__:: - 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=**_<luks uuid>_:: -+**rd.luks.uuid=**__<luks uuid>__:: - only activate the LUKS partitions with the given UUID. Any "luks-" of the - LUKS UUID is removed before comparing to _<luks uuid>_. - The comparisons also matches, if _<luks uuid>_ 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=**_<luks uuid>_:: -+**rd.luks.allow-discards=**__<luks uuid>__:: - Allow using of discards (TRIM) requests for LUKS partitions with the given UUID. - Any "luks-" of the LUKS UUID is removed before comparing to _<luks uuid>_. - The comparisons also matches, if _<luks uuid>_ is only the beginning of the -@@ -261,16 +272,18 @@ crypto LUKS - - crypto LUKS - key on removable device support - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --**rd.luks.key=**_<keypath>:<keydev>:<luksdev>_:: -+**rd.luks.key=**__<keypath>__:__<keydev>__:__<luksdev>__:: - _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=**_<md raid uuid>_:: -+**rd.md.uuid=**__<md raid 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=**_<dm raid uuid>_:: -+**rd.dm.uuid=**__<dm raid 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=**_<boot device>_:: -- specify the device, where /boot is located. e.g. -+**boot=**__<boot device>__:: -+ 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=<uuid> - boot=LABEL=<label> ------ -+-- - - **rd.fips.skipkernel**:: - skip checksum check of the kernel image. Useful, if the kernel image is not -@@ -348,7 +363,66 @@ boot=LABEL=<label> - - Network - ~~~~~~~ --**ip=**_{dhcp|on|any|dhcp6|auto6|ibft}_:: -+ -+[IMPORTANT] -+===================== -+It is recommended to either bind an interface to a MAC with the **ifname** argument, -+or to use the systemd-udevd predictable network interface names. -+ -+Predictable network interface device names based on: -+ -+- firmware/bios-provided index numbers for on-board devices -+- firmware-provided pci-express hotplug slot index number -+- physical/geographical location of the hardware -+- the interface's MAC address -+ -+See: http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames -+ -+Two character prefixes based on the type of interface: -+ -+en:: ethernet -+wl:: wlan -+ww:: wwan -+ -+Type of names: -+ -+o<index>:: on-board device index number -+s<slot>[f<function>][d<dev_id>]:: hotplug slot index number -+x<MAC>:: MAC address -+[P<domain>]p<bus>s<slot>[f<function>][d<dev_id>]:: PCI geographical location -+[P<domain>]p<bus>s<slot>[f<function>][u<port>][..][c<config>][i<interface>]:: USB port number chain -+ -+All multi-function PCI devices will carry the [f<function>] number in the -+device name, including the function 0 device. -+ -+When using PCI geography, The PCI domain is only prepended when it is not 0. -+ -+For USB devices the full chain of port numbers of hubs is composed. If the -+name gets longer than the maximum number of 15 characters, the name is not -+exported. -+The usual USB configuration == 1 and interface == 0 values are suppressed. -+ -+PCI ethernet card with firmware index "1":: -+* eno1 -+ -+PCI ethernet card in hotplug slot with firmware index number:: -+* ens1 -+ -+PCI ethernet multi-function card with 2 ports:: -+* enp2s0f0 -+* enp2s0f1 -+ -+PCI wlan card:: -+* wlp3s0 -+ -+USB built-in 3G modem:: -+* wwp0s29u1u4i6 -+ -+USB Android phone:: -+* enp0s29u1u2 -+===================== -+ -+**ip=**__{dhcp|on|any|dhcp6|auto6|ibft}__:: - dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp, loop - sequentially through all interfaces (eth0, eth1, ...) and use the first with - a valid DHCP root-path. -@@ -359,7 +433,7 @@ Network - - ibft::: iBFT autoconfiguration - --**ip=**_<interface>_:_{dhcp|on|any|dhcp6|auto6}_[:[_<mtu>_][:_<macaddr>_]]:: -+**ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6}__[:[__<mtu>__][:__<macaddr>__]]:: - This parameter can be specified multiple times. - + - ===================== -@@ -370,16 +444,7 @@ cannot be used in conjunction with the **ifname** argument for the - same <interface>. - ===================== - --[IMPORTANT] --===================== --It is recommended to either bind <interface> to a MAC with the **ifname** --argument. Or use biosdevname to name your interfaces, which will then have names according to their hardware location. -- --em<port>::: for embedded NICs --p<slot>#<port>_<virtual instance>::: for cards in PCI slots --===================== -- --**ip=**_<client-IP>_:_<server-IP>_:_<gateway-IP>_:_<netmask>_:_<client_hostname>_:_<interface>_:_{none|off|dhcp|on|any|dhcp6|auto6|ibft}_[:[_<mtu>_][:_<macaddr>_]]:: -+**ip=**__<client-IP>__:__<server-IP>__:__<gateway-IP>__:__<netmask>__:__<client_hostname>__:__<interface>__:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__:[:[__<mtu>__][:__<macaddr>__]]:: - explicit network configuration. If you want do define a IPv6 address, put it - in brackets (e.g. [2001:DB8::1]). This parameter can be specified multiple - times. -@@ -390,25 +455,14 @@ cannot be used in conjunction with the **ifname** argument for the - same <interface>. - ===================== - --[IMPORTANT] --===================== --It is recommended to either bind <interface> to a MAC with the **ifname** --argument. Or use biosdevname to name your interfaces, which will then have names according to their hardware location. -- --em<port>::: for embedded NICs --p<slot>#<port>_<virtual instance>::: for cards in PCI slots --===================== -- --**ifname=**_<interface>_:_<MAC>_:: -+**ifname=**__<interface>__:__<MAC>__:: - Assign network device name <interface> (ie "bootnet") to the NIC with MAC <MAC>. - + --[IMPORTANT] -- --Do **not** use the default kernel naming scheme for the interface name, -+WARNING: Do **not** use the default kernel naming scheme for the interface name, - as it can conflict with the kernel names. So, don't use "eth[0-9]+" for the - interface name. Better name it "bootnet" or "bluesocket". - --**bootdev=**_<interface>_:: -+**bootdev=**__<interface>__:: - specify network interface to use routing and netroot information from. - Required if multiple ip= lines are used. - -@@ -421,12 +475,12 @@ interface name. Better name it "bootnet" or "bluesocket". - **rd.neednet=1**:: - boolean, bring up network even without netroot set - --**vlan=_<vlanname>_:_<phydevice>_**:: -+**vlan=**__<vlanname>__:__<phydevice>__:: - Setup vlan device named <vlanname> on <phydeivce>. - We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5), - DEV_PLUS_VID (eth0.0005), DEV_PLUS_VID_NO_PAD (eth0.5) - --**bond=_<bondname>_[:_<bondslaves>_:[:_<options>_]]**:: -+**bond=**__<bondname>__[:__<bondslaves>__:[:__<options>__]]:: - Setup bonding device <bondname> on top of <bondslaves>. - <bondslaves> is a comma-separated list of physical (ethernet) interfaces. - <options> is a comma-separated list on bonding options (modinfo bonding for details) -@@ -434,68 +488,63 @@ interface name. Better name it "bootnet" or "bluesocket". - then its values should be separated by semicolon. - Bond without parameters assumes bond=bond0:eth0,eth1:mode=balance-rr - --**team =_<teammaster>_:_<teamslaves>_**:: -+**team=**__<teammaster>__:__<teamslaves>__:: - Setup team device <teammaster> on top of <teamslaves>. - <teamslaves> is a comma-separated list of physical (ethernet) interfaces. - --**bridge=_<bridgename>_:_<ethnames>_**:: -+**bridge=**__<bridgename>__:__<ethnames>__:: - Setup bridge <bridgename> with <ethnames>. <ethnames> is a comma-separated - list of physical (ethernet) interfaces. Bridge without parameters assumes bridge=br0:eth0 - -- - NFS - ~~~ --**root=**[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_]:: -+**root=**\[_<server-ip>_:]__<root-dir>__[:__<nfs-options>__]:: - mount nfs share from <server-ip>:/<root-dir>, if no server-ip is given, use - dhcp next_server. if server-ip is an IPv6 address it has to be put in - brackets, e.g. [2001:DB8::1]. NFS options can be appended with the prefix - ":" or "," and are seperated by ",". - --**root=**nfs:[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_], **root=**nfs4:[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_], **root=**_{dhcp|dhcp6}_:: -+**root=**nfs:\[_<server-ip>_:]__<root-dir>__[:__<nfs-options>__], **root=**nfs4:\[_<server-ip>_:]__<root-dir>__[:__<nfs-options>__], **root=**__{dhcp|dhcp6}__:: - root=dhcp alone directs initrd to look at the DHCP root-path where NFS - options can be specified. - + ------ -+[listing] -+.Example -+-- - root-path=<server-ip>:<root-dir>[,<nfs-options>] - root-path=nfs:<server-ip>:<root-dir>[,<nfs-options>] - root-path=nfs4:<server-ip>:<root-dir>[,<nfs-options>] ------ -+-- - --**root=**_/dev/nfs_ nfsroot=[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_]:: -+**root=**_/dev/nfs_ nfsroot=\[_<server-ip>_:]__<root-dir>__[:__<nfs-options>__]:: - _Deprecated!_ kernel Documentation_/filesystems/nfsroot.txt_ defines this - method. This is supported by dracut, but not recommended. - --**rd.nfs.domain=**_<NFSv4 domain name>_:: -+**rd.nfs.domain=**__<NFSv4 domain name>__:: - Set the NFSv4 domain name. Will overwrite the settings in _/etc/idmap.conf_. - - CIFS - ~~~ --**root=**cifs://[_<username>_[:_<password>_]@]_<server-ip>_:_<root-dir>_:: -+**root=**cifs://[__<username>__[:__<password>__]@]__<server-ip>__:__<root-dir>__:: - mount cifs share from <server-ip>:/<root-dir>, if no server-ip is given, use - dhcp next_server. if server-ip is an IPv6 address it has to be put in - brackets, e.g. [2001:DB8::1]. If a username or password are not specified - as part of the root, then they must be passed on the command line through - cifsuser/cifspass. - + --[WARNING] --==== --Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. --==== -+WARNING: Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. - --**cifsuser=_<username>_:: -+**cifsuser**=__<username>__:: - Set the cifs username, if not specified as part of the root. - --**cifspass=_<password>_:: -+**cifspass**=__<password>__:: - Set the cifs password, if not specified as part of the root. - + --[WARNING] --==== --Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. --==== -+WARNING: Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. - - iSCSI - ~~~~~ --**root=**iscsi:[_<username>_:_<password>_[:_<reverse>_:_<password>_]@][_<servername>_]:[_<protocol>_]:[_<port>_][:[_<iscsi_iface_name>_]:[_<netdev_name>_]]:[_<LUN>_]:_<targetname>_:: -+**root=**iscsi:[__<username>__:__<password>__[:__<reverse>__:__<password>__]@][__<servername>__]:[__<protocol>__]:[__<port>__][:[__<iscsi_iface_name>__]:[__<netdev_name>__]]:[__<LUN>__]:__<targetname>__:: - protocol defaults to "6", LUN defaults to "0". If the "servername" field is - provided by BOOTP or DHCP, then that field is used in conjunction with other - associated fields to contact the boot server in the Boot stage. However, if -@@ -503,85 +552,84 @@ iSCSI - used in the Discovery Service stage in conjunction with other associated - fields. See - link:$$http://tools.ietf.org/html/rfc4173#section-5$$[rfc4173]. -- e.g.: - + ------ -+WARNING: Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. -++ -+[listing] -+.Example -+-- - root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0 ------ -+-- - + --If servername is an IPv6 address, it has to be put in brackets. e.g.: -+If servername is an IPv6 address, it has to be put in brackets: - + ------ -+[listing] -+.Example -+-- - root=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0 ------ --+ --[WARNING] --==== --Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. --==== -+-- - --**root=**_???_ **netroot=**iscsi:[_<username>_:_<password>_[:_<reverse>_:_<password>_]@][_<servername>_]:[_<protocol>_]:[_<port>_][:[_<iscsi_iface_name>_]:[_<netdev_name>_]]:[_<LUN>_]:_<targetname>_ ...:: -- multiple netroot options allow setting up multiple iscsi disks. e.g.: -+**root=**__???__ **netroot=**iscsi:[__<username>__:__<password>__[:__<reverse>__:__<password>__]@][__<servername>__]:[__<protocol>__]:[__<port>__][:[__<iscsi_iface_name>__]:[__<netdev_name>__]]:[__<LUN>__]:__<targetname>__ ...:: -+ multiple netroot options allow setting up multiple iscsi disks: - + ------ -+[listing] -+.Example -+-- - root=UUID=12424547 - netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0 - netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1 ------ -+-- - + --If servername is an IPv6 address, it has to be put in brackets. e.g.: -+If servername is an IPv6 address, it has to be put in brackets: - + ------ -+[listing] -+.Example -+-- - netroot=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0 ------ -+-- - + --[WARNING] --==== --Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. You may want to use rd.iscsi.firmware. --==== -+WARNING: Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. You may want to use rd.iscsi.firmware. - --**root=**_???_ **rd.iscsi.initiator=**_<initiator>_ **rd.iscsi.target.name=**_<target name>_ **rd.iscsi.target.ip=**_<target ip>_ **rd.iscsi.target.port=**_<target port>_ **rd.iscsi.target.group=**_<target group>_ **rd.iscsi.username=**_<username>_ **rd.iscsi.password=**_<password>_ **rd.iscsi.in.username=**_<in username>_ **rd.iscsi.in.password=**_<in password>_:: -+**root=**__???__ **rd.iscsi.initiator=**__<initiator>__ **rd.iscsi.target.name=**__<target name>__ **rd.iscsi.target.ip=**__<target ip>__ **rd.iscsi.target.port=**__<target port>__ **rd.iscsi.target.group=**__<target group>__ **rd.iscsi.username=**__<username>__ **rd.iscsi.password=**__<password>__ **rd.iscsi.in.username=**__<in username>__ **rd.iscsi.in.password=**__<in password>__:: - manually specify all iscsistart parameter (see **+iscsistart --help+**) - + --[WARNING] --==== --Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. You may want to use rd.iscsi.firmware. --==== -+WARNING: Passwords specified on the kernel command line are visible for all users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the network, when using DHCP with DHCP root-path. You may want to use rd.iscsi.firmware. - - **root=**_???_ **netroot=**iscsi **rd.iscsi.firmware=1**:: - will read the iscsi parameter from the BIOS firmware - --**rd.iscsi.param=**_<param>_:: -+**rd.iscsi.param=**__<param>__:: - <param> will be passed as "--param <param>" to iscsistart. - This parameter can be specified multiple times. -- e.g.: - + ------ -+[listing] -+.Example -+-- - "netroot=iscsi rd.iscsi.firmware=1 rd.iscsi.param=node.session.timeo.replacement_timeout=30" ------ -+-- - + - will result in - + ------ -+[listing] -+-- - iscsistart -b --param node.session.timeo.replacement_timeout=30 ------ -+-- - - FCoE - ~~~~ --**fcoe=**_<edd|interface|MAC>_:_{dcb|nodcb}_:: -+**fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__:: - Try to connect to a FCoE SAN through the NIC specified by _<interface>_ or - _<MAC>_ or EDD settings. For the second argument, currently only nodcb is - supported. This parameter can be specified multiple times. - + --[NOTE] --letters in the MAC-address must be lowercase! -+NOTE: letters in the MAC-address must be lowercase! - - NBD - ~~~ --**root=**??? **netroot=**nbd:_<server>_:_<port>_[:_<fstype>_[:_<mountopts>_[:_<nbdopts>_]]]:: -+**root=**??? **netroot=**nbd:__<server>__:__<port>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]:: - mount nbd share from <server> - --**root=dhcp** with **dhcp** **root-path=**nbd:_<server>_:_<port>_[:_<fstype>_[:_<mountopts>_[:_<nbdopts>_]]]:: -+**root=dhcp** with **dhcp** **root-path=**nbd:__<server>__:__<port>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]:: - root=dhcp alone directs initrd to look at the DHCP root-path where NBD - options can be specified. This syntax is only usable in cases where you are - directly mounting the volume as the rootfs. -@@ -593,25 +641,29 @@ DASD - - ZFCP - ~~~~ --**rd.zfcp=**_<zfcp adaptor device bus ID>_,_<WWPN>_,_<FCPLUN>_:: -- rd.zfcp can be specified multiple times on the kernel command line. e.g.: -+**rd.zfcp=**__<zfcp adaptor device bus ID>__,__<WWPN>__,__<FCPLUN>__:: -+ rd.zfcp can be specified multiple times on the kernel command line. - + ------ -+[listing] -+.Example -+-- - rd.zfcp=0.0.4000,0x5005076300C213e9,0x5022000000000000 ------ -+-- - - **rd.zfcp.conf=0**:: - ignore zfcp.conf included in the initramfs - - ZNET - ~~~~ --**rd.znet=**_<nettype>_,_<subchannels>_,_<options>_:: -- rd.znet can be specified multiple times on the kernel command line. e.g.: -+**rd.znet=**__<nettype>__,__<subchannels>__,__<options>__:: -+ rd.znet can be specified multiple times on the kernel command line. - + ------ -+[listing] -+.Example -+-- - rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo - rd.znet=ctc,0.0.0600,0.0.0601,protocol=bar ------ -+-- - - Plymouth Boot Splash - ~~~~~~~~~~~~~~~~~~~~ -@@ -623,33 +675,41 @@ Plymouth Boot Splash - - Kernel keys - ~~~~~~~~~~~ --**masterkey=**_<kernel master key path name>_:: -- Set the path name of the kernel master key. e.g.: -+**masterkey=**__<kernel master key path name>__:: -+ Set the path name of the kernel master key. - + ------ -+[listing] -+.Example -+-- - masterkey=/etc/keys/kmk-trusted.blob ------ -+-- - --**masterkeytype=**_<kernel master key type>_:: -- Set the type of the kernel master key. e.g.: -+**masterkeytype=**__<kernel master key type>__:: -+ Set the type of the kernel master key. - + ------ -+[listing] -+.Example -+-- - masterkeytype=trusted ------ -+-- - --**evmkey=**_<EVM key path name>_:: -- Set the path name of the EVM key. e.g.: -+**evmkey=**__<EVM key path name>__:: -+ Set the path name of the EVM key. - + ------ -+[listing] -+.Example -+-- - evmkey=/etc/keys/evm-trusted.blob ------ -+-- - --**ecryptfskey=**_<eCryptfs key path name>_:: -- Set the path name of the eCryptfs key. e.g.: -+**ecryptfskey=**__<eCryptfs key path name>__:: -+ Set the path name of the eCryptfs key. - + ------ -+[listing] -+.Example -+-- - ecryptfskey=/etc/keys/ecryptfs-trusted.blob ------ -+-- - - Deprecated, renamed Options - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -diff --git a/dracut.css b/dracut.css -index e419a06..357ede1 100644 ---- a/dracut.css -+++ b/dracut.css -@@ -14,45 +14,6 @@ body { - color:black; - } - --body.toc_embeded { -- /*for web hosting system only*/ -- margin-left: 300px; --} -- --object.toc, iframe.toc { -- /*for web hosting system only*/ -- border-style:none; -- position:fixed; -- width:290px; -- height:99.99%; -- top:0; -- left:0; -- z-index: 100; -- border-style:none; -- border-right:1px solid #999; --} -- --/* Hide web menu */ -- --body.notoc { -- margin-left: 3em; --} -- --iframe.notoc { -- border-style:none; -- border: none; -- padding: 0em; -- position:fixed; -- width: 21px; -- height: 29px; -- top: 0px; -- left:0; -- overflow: hidden; -- margin: 0em; -- margin-left: -3px; --} --/* End hide web menu */ -- - /* desktop styles */ - body.desktop { - margin-left: 26em; -@@ -166,7 +127,6 @@ h1 { - margin-bottom: 0em; - font-size: 3.0em; - font-weight: bold; -- background: #003d6e url(../images/h1-bg.png) top left repeat-x; - color: white; - text-align: center; - padding: 0.7em; -@@ -480,106 +440,14 @@ h3.author { - font-weight:bold; - } - --/* inline syntax highlighting */ --.perl_Alert { -- color: #0000ff; --} -- --.perl_BaseN { -- color: #007f00; --} -- --.perl_BString { -- color: #5C3566; --} -- --.perl_Char { -- color: #ff00ff; --} -- --.perl_Comment { -- color: #FF00FF; --} -- -- --.perl_DataType { -- color: #0000ff; --} -- -- --.perl_DecVal { -- color: #00007f; --} -- -- --.perl_Error { -- color: #ff0000; --} -- -- --.perl_Float { -- color: #00007f; --} -- -- --.perl_Function { -- color: #007f00; --} -- -- --.perl_IString { -- color: #5C3566; --} -- -- --.perl_Keyword { -- color: #002F5D; --} -- -- --.perl_Operator { -- color: #ffa500; --} -- -- --.perl_Others { -- color: #b03060; --} -- -- --.perl_RegionMarker { -- color: #96b9ff; --} -- -- --.perl_Reserved { -- color: #9b30ff; --} -- -- --.perl_String { -- color: #5C3566; --} -- -- --.perl_Variable { -- color: #0000ff; --} -- -- --.perl_Warning { -- color: #0000ff; --} - - /*Lists*/ - ul { - padding-left:1.6em; -- list-style-image:url(../images/dot.png); - list-style-type: circle; - } - - ul ul { -- list-style-image:url(../images/dot2.png); - list-style-type: circle; - } - -@@ -769,21 +637,6 @@ code { - word-wrap: break-word; /* Internet Explorer 5.5+ */ - } - --/*Notifications*/ --div.warning:before { -- content:url(../images/warning.png); -- padding-left: 5px; --} -- --div.note:before { -- content:url(../images/note.png); -- padding-left: 5px; --} -- --div.important:before { -- content:url(../images/important.png); -- padding-left: 5px; --} - - div.warning, div.note, div.important { - color: black; -@@ -792,7 +645,8 @@ div.warning, div.note, div.important { - background: none; - background-color: white; - margin-bottom: 1em; -- border-bottom: 1px solid #aaaaaa; -+ padding-left: 1em; -+ border-left: 2px solid #aaaaaa; - } - - div.warning h2, div.note h2,div.important h2 { -@@ -817,20 +671,6 @@ div.admonition_header { - font-size: 1.0em; - } - --div.warning div.admonition_header { -- background: url(../images/red.png) top left repeat-x; -- background-color: #590000; --} -- --div.note div.admonition_header { -- background: url(../images/green.png) top right repeat-x; -- background-color: #597800; --} -- --div.important div.admonition_header { -- background: url(../images/yellow.png) top right repeat-x; -- background-color: #a6710f; --} - - div.warning p, div.warning div.para, - div.note p, div.note div.para, -@@ -1131,266 +971,6 @@ ul li p:last-child, ul li div.para:last-child { - padding-bottom:0em; - } - --/*document navigation*/ --.docnav a, .docnav strong { -- border:none; -- text-decoration:none; -- font-weight:normal; --} -- --.docnav { -- list-style:none; -- margin:0em; -- padding:0em; -- position:relative; -- width:100%; -- padding-bottom:2em; -- padding-top:1em; -- border-top:1px dotted #ccc; --} -- --.docnav li { -- list-style:none; -- margin:0em; -- padding:0em; -- display:inline; -- font-size:.8em; --} -- --.docnav li:before { -- content:" "; --} -- --.docnav li.previous, .docnav li.next { -- position:absolute; -- top:1em; --} -- --.docnav li.up, .docnav li.home { -- margin:0em 1.5em; --} -- --.docnav li.previous { -- left:0px; -- text-align:left; --} -- --.docnav li.next { -- right:0px; -- text-align:right; --} -- --.docnav li.previous strong, .docnav li.next strong { -- height:22px; -- display:block; --} -- --.docnav { -- margin:0 auto; -- text-align:center; --} -- --.docnav li.next a strong { -- background: url(../images/stock-go-forward.png) top right no-repeat; -- padding-top:3px; -- padding-bottom:4px; -- padding-right:28px; -- font-size:1.2em; --} -- --.docnav li.previous a strong { -- background: url(../images/stock-go-back.png) top left no-repeat; -- padding-top:3px; -- padding-bottom:4px; -- padding-left:28px; -- padding-right:0.5em; -- font-size:1.2em; --} -- --.docnav li.home a strong { -- background: url(../images/stock-home.png) top left no-repeat; -- padding:5px; -- padding-left:28px; -- font-size:1.2em; --} -- --.docnav li.up a strong { -- background: url(../images/stock-go-up.png) top left no-repeat; -- padding:5px; -- padding-left:28px; -- font-size:1.2em; --} -- --.docnav a:link, .docnav a:visited { -- color:#666; --} -- --.docnav a:hover, .docnav a:focus, .docnav a:active { -- color:black; --} -- --.docnav a { -- max-width: 10em; -- overflow:hidden; --} -- --.docnav a:link strong { -- text-decoration:none; --} -- --.docnav { -- margin:0 auto; -- text-align:center; --} -- --ul.docnav { -- margin-bottom: 1em; --} --/* Reports */ --.reports ul { -- list-style:none; -- margin:0em; -- padding:0em; --} -- --.reports li{ -- margin:0em; -- padding:0em; --} -- --.reports li.odd { -- background-color: #eeeeee; -- margin:0em; -- padding:0em; --} -- --.reports dl { -- display:inline; -- margin:0em; -- padding:0em; -- float:right; -- margin-right: 17em; -- margin-top:-1.3em; --} -- --.reports dt { -- display:inline; -- margin:0em; -- padding:0em; --} -- --.reports dd { -- display:inline; -- margin:0em; -- padding:0em; -- padding-right:.5em; --} -- --.reports h2, .reports h3{ -- display:inline; -- padding-right:.5em; -- font-size:10pt; -- font-weight:normal; --} -- --.reports div.progress { -- display:inline; -- float:right; -- width:16em; -- background:#c00 url(../images/shine.png) top left repeat-x; -- margin:0em; -- margin-top:-1.3em; -- padding:0em; -- border:none; --} -- --/*uniform*/ --body.results, body.reports { -- max-width:57em ; -- padding:0em; --} -- --/*Progress Bar*/ --div.progress { -- display:block; -- float:left; -- width:16em; -- background:#c00 url(../images/shine.png) top left repeat-x; -- height:1em; --} -- --div.progress span { -- height:1em; -- float:left; --} -- --div.progress span.translated { -- background:#6c3 url(../images/shine.png) top left repeat-x; --} -- --div.progress span.fuzzy { -- background:#ff9f00 url(../images/shine.png) top left repeat-x; --} -- -- --/*Results*/ -- --.results ul { -- list-style:none; -- margin:0em; -- padding:0em; --} -- --.results li{ -- margin:0em; -- padding:0em; --} -- --.results li.odd { -- background-color: #eeeeee; -- margin:0em; -- padding:0em; --} -- --.results dl { -- display:inline; -- margin:0em; -- padding:0em; -- float:right; -- margin-right: 17em; -- margin-top:-1.3em; --} -- --.results dt { -- display:inline; -- margin:0em; -- padding:0em; --} -- --.results dd { -- display:inline; -- margin:0em; -- padding:0em; -- padding-right:.5em; --} -- --.results h2, .results h3 { -- display:inline; -- padding-right:.5em; -- font-size:10pt; -- font-weight:normal; --} -- --.results div.progress { -- display:inline; -- float:right; -- width:16em; -- background:#c00 url(../images/shine.png) top left repeat-x; -- margin:0em; -- margin-top:-1.3em; -- padding:0em; -- border:none; --} - - /* Dirty EVIL Mozilla hack for round corners */ - pre { -@@ -1423,12 +1003,6 @@ span.remark { - background-color: #ff00ff; - } - --.draft { -- background-image: url(../images/watermark-draft.png); -- background-repeat: repeat-y; -- background-position: center; --} -- - .foreignphrase { - font-style: inherit; - } -@@ -1513,10 +1087,6 @@ h1 { - color:#3c6eb4 - } - --.producttitle { -- background: #3c6eb4 url(../images/h1-bg.png) top left repeat; --} -- - .section h1.title { - color:#3c6eb4; - } -diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc -new file mode 100644 -index 0000000..4cb2aa1 ---- /dev/null -+++ b/dracut.modules.7.asc -@@ -0,0 +1,293 @@ -+DRACUT.MODULES(7) -+================= -+:doctype: manpage -+:man source: dracut -+:man manual: dracut -+ -+NAME -+---- -+dracut.modules - dracut modules -+ -+DESCRIPTION -+----------- -+== 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 _<git-src>/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 <<stages>>. -+ -+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 -+ -+---- -+ -+ -+=== module-setup.sh: 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. -+ -+ -+=== module-setup.sh: depends() -+ -+The function depends() should echo all other dracut module names the module -+depends on. -+ -+=== module-setup.sh: cmdline() -+ -+This function should print the kernel command line options needed to boot the current -+machine setup. It should start with a space and should not print a newline. -+ -+=== module-setup.sh: install() -+ -+The install() function is called to install everything non-kernel related. To install -+binaries, scripts, and other files, you can use the functions mentioned in <<creation>>. -+ -+To address a file in the current module directory, use the variable "$moddir". -+ -+=== module-setup.sh: installkernel() -+ -+In installkernel() all kernel related files should be installed. You can use all of the functions -+mentioned in <<creation>> to install files. -+ -+=== [[creation]]Creation Functions -+ -+==== inst_multiple [-o] <file> [ <file> ...] -+ -+installs multiple binaries and files. If executables are specified without a path, dracut -+will search the path PATH=/usr/sbin:/sbin:/usr/bin:/bin for the binary. If the option "-o" -+is given as the first parameter, a missing file does not lead to an error. -+ -+==== inst <src> [<dst>] -+ -+installs _one_ file <src> either to the same place in the initramfs or to an optional <dst>. -+ -+==== inst_hook <hookdir> <prio> <src> -+ -+installs an executable/script <src> in the dracut hook <hookdir> with priority <prio>. -+ -+==== inst_rules <udevrule> [ <udevrule> ...] -+ -+installs one ore more udev rules. Non-existant udev rules are reported, but do not let dracut fail. -+ -+==== instmods <kernelmodule> [ <kernelmodule> ... ] -+ -+instmods should be used only in the installkernel() function. -+ -+instmods installs one or more kernel modules in the initramfs. <kernelmodule> can also be a whole -+subsystem, if prefixed with a "=", like "=drivers/net/team". -+ -+instmods will not install the kernel module, if $hostonly is set and the kernel module is not currently -+needed by any /sys/*...*/uevent MODALIAS. -+To install a kernel module regardless of the hostonly mode use the form: -+---- -+hostonly='' instmods <kernelmodule> -+---- -+ -+=== Initramfs Functions -+ -+FIXME -+ -+ -+=== Network Modules -+ -+FIXME -+ -+AUTHOR -+------ -+Harald Hoyer -+ -+SEE ALSO -+-------- -+*dracut*(8) -diff --git a/dracut.spec b/dracut.spec -index 44fff00..3ec0ec0 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -314,6 +314,7 @@ rm -rf -- $RPM_BUILD_ROOT - %endif - %{_mandir}/man7/dracut.kernel.7* - %{_mandir}/man7/dracut.cmdline.7* -+%{_mandir}/man7/dracut.modules.7* - %{_mandir}/man7/dracut.bootup.7* - %{_mandir}/man5/dracut.conf.5* - %if %{defined _unitdir} -diff --git a/dracut.usage.asc b/dracut.usage.asc -new file mode 100644 -index 0000000..6d37920 ---- /dev/null -+++ b/dracut.usage.asc -@@ -0,0 +1,526 @@ -+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-_++<kernel version>++_.img and -+contains the kernel modules of the currently active kernel with version -+_++<kernel 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. -+ -+=== Inspecting the Contents -+To see the contents of the image created by dracut, you can use the lsinitrd tool. -+---- -+# lsinitrd | less -+---- -+ -+To display the contents of a file in the initramfs also use the lsinitrd tool: -+---- -+# lsinitrd -f /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 *dracut.conf*(5). -+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 -+---- -+ -+=== 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 *dracut.conf*(5)), 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.conf*(5)): -+---- -+# dracut --add-drivers mymod initramfs-with-mymod.img -+---- -+ -+=== Boot parameters -+An initramfs generated without the "hostonly" mode, 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 <<NetworkBoot>>. -+ -+For a full reference of all kernel command line parameters, see *dracut.cmdline*(5). -+ -+To get a quick start for the suitable kernel command line on your system, use the -+__--print-cmdline__ option: -+---- -+# dracut --print-cmdline -+ root=UUID=8b8b6f91-95c7-4da2-831b-171e12179081 rootflags=rw,relatime,discard,data=ordered rootfstype=ext4 -+---- -+ -+==== 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=_++<path to device -+node>++_: -+---- -+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 <<NetworkBoot>>. -+ -+==== 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: -+---- -+rd.vconsole.font=latarcyrheb-sun16 rd.vconsole.keymap=de-latin1-nodeadkeys rd.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. -+ -+==== 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=_++<kernel module -+name>++_, with _++<kernel module name>++_ 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 -+---- -+ -+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 -p rd.live.overlay/etc/cmdline.d -+# mkdir -p rd.live.overlay/etc/conf.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 <<Injecting>>. -+ -+==== 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. -+ -+ -+== 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 -+. 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. -+* Turn on dracut debugging (see _the 'debugging dracut' section_), and attach -+the file /run/initramfs/rdsosreport.txt. -+* If you use a dracut configuration file, please include _/etc/dracut.conf_ and -+all files in _/etc/dracut.conf.d/*.conf_ -+ -+[[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 <<all-bug-reports>>, include the -+following information: -+ -+ -+* Please include the output of -++ -+---- -+# /sbin/ifup <interfacename> -+# 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 </dev/console -+---- -+-- -+ -+[[using-the-dracut-shell]] -+==== Using the dracut shell -+ -+dracut offers a shell for interactive debugging in the event dracut fails to -+locate your root filesystem. To enable the shell: -+ -+. Add the boot parameter ''rd.shell'' to your bootloader configuration file -+(e.g. _/etc/grub.conf_) -+. Remove the boot arguments ''rhgb'' and ''quiet'' -++ -+A sample _/etc/grub.conf_ bootloader configuration file is listed 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 rd.shell -+ initrd /dracut-2.6.29.5-191.fc11.x86_64.img -+---- -++ -+. If system boot fails, you will be dropped into a shell as seen in the example below. -++ -+---- -+No root device found -+Dropping to debug shell. -+ -+# -+---- -++ -+. Use this shell prompt to gather the information requested above (see <<all-bug-reports>>). -+ -+[[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 *dracut.cmdline*(7). -+ -+ -+[[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. -+ diff --git a/0006-dmsquash-live-add-dev-mapper-live-base.patch b/0006-dmsquash-live-add-dev-mapper-live-base.patch deleted file mode 100644 index ea9acd2..0000000 --- a/0006-dmsquash-live-add-dev-mapper-live-base.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3622d6d7b0806023d60f62fc90b859adaefe5e59 Mon Sep 17 00:00:00 2001 -From: "Brian C. Lane" <bcl@redhat.com> -Date: Tue, 8 Oct 2013 15:13:44 +0200 -Subject: [PATCH] dmsquash-live: add /dev/mapper/live-base - -This is similar to the reason for adding the -/run/initramfs/live-baseloop symlink -- access to the original live -image without overlays. - -livemedia-creator does not create a osmin.img, so there is no mountable -device for it to use when rsyncing the live image to the target. It -needs a device that points to the original live image without overlays. - -Note that lmc won't be creating osmin.img, since really isn't needed any -longer. Its purpose was to provide a minimal image that could be dd'd to -the target. Now that we use rsync this is no longer necessary. - -The included patch adds a /dev/mapper/live-base device that Anaconda can -use whether or not there is an osmin present. ---- - modules.d/90dmsquash-live/dmsquash-live-root.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 8951f80..5705e8d 100755 ---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh -+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh -@@ -144,6 +144,9 @@ do_live_overlay() { - over=$OVERLAY_LOOPDEV - fi - echo 0 $sz snapshot $base $over p 8 | dmsetup create live-rw -+ -+ # Create a device that always points to a ro base image -+ echo 0 $sz linear $base 0 | dmsetup create --readonly live-base - } - - # live cd helper function -@@ -225,9 +228,6 @@ if [ -n "$ROOTFLAGS" ]; then - ROOTFLAGS="-o $ROOTFLAGS" - fi - --if [ -b "$BASE_LOOPDEV" ]; then -- ln -s $BASE_LOOPDEV /run/initramfs/live-baseloop --fi - ln -s /dev/mapper/live-rw /dev/root - printf 'mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > $hookdir/mount/01-$$-live.sh - diff --git a/0007-base-init.sh-also-mkdir-run-lock.patch b/0007-base-init.sh-also-mkdir-run-lock.patch deleted file mode 100644 index 969ee48..0000000 --- a/0007-base-init.sh-also-mkdir-run-lock.patch +++ /dev/null @@ -1,21 +0,0 @@ -From ab2676d29144097239c189b1a6d938e0420eb580 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 9 Oct 2013 08:20:39 +0200 -Subject: [PATCH] base/init.sh: also mkdir /run/lock - ---- - modules.d/99base/init.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index ae73fd2..3ba440a 100755 ---- a/modules.d/99base/init.sh -+++ b/modules.d/99base/init.sh -@@ -90,6 +90,7 @@ trap "action_on_fail Signal caught!" 0 - - [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs - [ -d /run/log ] || mkdir -p -m 0755 /run/log -+[ -d /run/lock ] || mkdir -p -m 0755 /run/lock - - export UDEVVERSION=$(udevadm --version) - if [ $UDEVVERSION -gt 166 ]; then diff --git a/0008-resume-fix-swap-detection-in-hostonly.patch b/0008-resume-fix-swap-detection-in-hostonly.patch deleted file mode 100644 index f4fe886..0000000 --- a/0008-resume-fix-swap-detection-in-hostonly.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cfdec163f9dfd5e083f2c8a728c476381faa8baa Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Wed, 9 Oct 2013 06:39:46 +0400 -Subject: [PATCH] resume: fix swap detection in hostonly - -Check for other possible fs types. This fixes swap detection when using -TuxOnIce kernel. - -Note that parse-resume.sh generate udev rules with support for -ID_FS_TYPE=suspend, but we do not include it here, because it is -libvolume_id thing and host_fs_types is populated using blkid. ---- - modules.d/95resume/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index b6d2c48..8b37616 100755 ---- a/modules.d/95resume/module-setup.sh -+++ b/modules.d/95resume/module-setup.sh -@@ -7,7 +7,7 @@ check() { - # No point trying to support resume, if no swap partition exist - [[ $hostonly ]] || [[ $mount_needs ]] && { - for fs in "${host_fs_types[@]}"; do -- [[ $fs = swap ]] && return 0 -+ [[ $fs =~ ^(swap|swsuspend|swsupend)$ ]] && return 0 - done - return 255 - } diff --git a/0009-resume-remove-resume-genrules.sh.patch b/0009-resume-remove-resume-genrules.sh.patch deleted file mode 100644 index 91a0587..0000000 --- a/0009-resume-remove-resume-genrules.sh.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1aedbb788696f4ead7fa338edab4b3dcbbe3c8f0 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Wed, 9 Oct 2013 07:02:56 +0400 -Subject: [PATCH] resume: remove resume-genrules.sh - -parse-resume.sh already contains all the code from resume-genrules.sh. -Also parse-resume.sh is executed before resume-genrules.sh, so there is -no point to keep the latter. - -This fixes the following error messages: -dracut-initqueue: ln: failed to create symbolic link '/dev/resume': File exists -dracut-initqueue: rm: cannot remove '/lib/dracut/hooks/initqueue/settled/resume.sh': No such file or directory -dracut-initqueue: rm: cannot remove '/lib/dracut/hooks/initqueue/timeout/resume.sh': No such file or directory ---- - modules.d/95resume/module-setup.sh | 1 - - modules.d/95resume/resume-genrules.sh | 51 ----------------------------------- - 2 files changed, 52 deletions(-) - delete mode 100755 modules.d/95resume/resume-genrules.sh - -diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index 8b37616..a172c27 100755 ---- a/modules.d/95resume/module-setup.sh -+++ b/modules.d/95resume/module-setup.sh -@@ -32,7 +32,6 @@ install() { - inst_hook cmdline 10 "$moddir/parse-resume.sh" - else - inst_script "$moddir/parse-resume.sh" /lib/dracut/parse-resume.sh -- inst_hook pre-udev 30 "$moddir/resume-genrules.sh" - fi - - inst_script "$moddir/resume.sh" /lib/dracut/resume.sh -diff --git a/modules.d/95resume/resume-genrules.sh b/modules.d/95resume/resume-genrules.sh -deleted file mode 100755 -index c542c71..0000000 ---- a/modules.d/95resume/resume-genrules.sh -+++ /dev/null -@@ -1,51 +0,0 @@ --#!/bin/sh --# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- --# ex: ts=8 sw=4 sts=4 et filetype=sh -- --case "$splash" in -- quiet ) -- a_splash="-P splash=y" -- ;; -- * ) -- a_splash="-P splash=n" -- ;; --esac -- --if [ -n "$resume" ]; then -- { -- printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -- ${resume#/dev/}; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -- ${resume#/dev/}; -- } >> /etc/udev/rules.d/99-resume-link.rules -- -- { -- if [ -x /usr/sbin/resume ]; then -- printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ -- ${resume#/dev/} "$a_splash" "$resume"; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ -- ${resume#/dev/} "$a_splash" "$resume"; -- fi -- printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" \ -- ${resume#/dev/}; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" \ -- ${resume#/dev/}; -- } >> /etc/udev/rules.d/99-resume.rules -- -- printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job" "%s/initqueue/timeout/resume.sh"; }\n' \ -- "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh -- -- printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm "$job" "%s/initqueue/settled/resume.sh";' \ -- "$hookdir" >> $hookdir/initqueue/timeout/resume.sh -- -- wait_for_dev "/dev/resume" -- --elif ! getarg noresume; then -- { -- if [ -x /usr/sbin/resume ]; then -- printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \$tempnode\"\n" "$a_splash" -- fi -- echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," \ -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume\""; -- } >> /etc/udev/rules.d/99-resume.rules --fi diff --git a/0010-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch b/0010-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch deleted file mode 100644 index db525e7..0000000 --- a/0010-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 871c8e40d1c7bb1bace48ce19ea1b956f7065458 Mon Sep 17 00:00:00 2001 -From: P J P <ppandit@redhat.com> -Date: Fri, 11 Oct 2013 19:26:51 +0530 -Subject: [PATCH] Add lzo, lz4 compression and read INITRD_COMPRESS - -This patch adds support for lzop(1) & lz4(1) compression -algorithms to compress iniramfs image file. Both are supported -by the Linux kernel. - -Linux kernel exports user's choice of initramfs compression -algorithm as a shell environment variable: INITRD_COMPRESS. -This patch adds support to read this variable and duly compress -the initramfs image file. - -Environment variable INITRD_COMPRESS has less precedence than the -command line options --gzip, etc. Ie. command line options could -override the compression algorithm defined by $INITRD_COMPRESS. - -Signed-off-by: P J P <ppandit@redhat.com> - -[Edited-by: Harald Hoyer: add documentation about lzo and lz4] ---- - dracut.8.asc | 16 ++++++++++++++++ - dracut.sh | 13 +++++++++++++ - 2 files changed, 29 insertions(+) - -diff --git a/dracut.8.asc b/dracut.8.asc -index 584514c..2ea6744 100644 ---- a/dracut.8.asc -+++ b/dracut.8.asc -@@ -365,6 +365,22 @@ Make sure your kernel has xz decompression support compiled in, otherwise you - will not be able to boot. Equivalent to "lzma --compress=xz --check=crc32 --lzma2=dict=1MiB" - ==== - -+**--lzo**:: -+ Compress the generated initramfs using lzop. -+[WARNING] -+==== -+Make sure your kernel has lzo decompression support compiled in, otherwise you -+will not be able to boot. -+==== -+ -+**--lz4**:: -+ Compress the generated initramfs using lz4. -+[WARNING] -+==== -+Make sure your kernel has lz4 decompression support compiled in, otherwise you -+will not be able to boot. -+==== -+ - **--compress** _<compressor>_:: - Compress the generated initramfs using the passed compression program. If - you pass it just the name of a compression program, it will call that -diff --git a/dracut.sh b/dracut.sh -index d9533dd..173a259 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -165,6 +165,12 @@ Creates initial ramdisk images for preloading modules - --xz Compress the generated initramfs using xz. - Make sure that your kernel has xz support compiled - in, otherwise you will not be able to boot. -+ --lzo Compress the generated initramfs using lzop. -+ Make sure that your kernel has lzo support compiled -+ in, otherwise you will not be able to boot. -+ --lz4 Compress the generated initramfs using lz4. -+ Make sure that your kernel has lz4 support compiled -+ in, otherwise you will not be able to boot. - --compress [COMPRESSION] Compress the generated initramfs with the - passed compression program. Make sure your kernel - knows how to decompress the generated initramfs, -@@ -342,6 +348,8 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \ - --long bzip2 \ - --long lzma \ - --long xz \ -+ --long lzo \ -+ --long lz4 \ - --long no-compress \ - --long gzip \ - --long list-modules \ -@@ -430,6 +438,8 @@ while :; do - --bzip2) compress_l="bzip2";; - --lzma) compress_l="lzma";; - --xz) compress_l="xz";; -+ --lzo) compress_l="lzo";; -+ --lz4) compress_l="lz4";; - --no-compress) _no_compress_l="cat";; - --gzip) compress_l="gzip";; - --list-modules) do_list="yes";; -@@ -673,6 +683,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" - [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" - [[ $tmpdir ]] || tmpdir=/var/tmp -+[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS - [[ $compress_l ]] && compress=$compress_l - [[ $show_modules_l ]] && show_modules=$show_modules_l - [[ $nofscks_l ]] && nofscks="yes" -@@ -689,6 +700,8 @@ case $compress in - lzma) compress="lzma -9";; - xz) compress="xz --check=crc32 --lzma2=dict=1MiB";; - gzip) compress="gzip -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9";; -+ lzo) compress="lzop -9";; -+ lz4) compress="lz4 -9";; - esac - if [[ $_no_compress_l = "cat" ]]; then - compress="cat" diff --git a/0011-lvm-fix-thin-recognition.patch b/0011-lvm-fix-thin-recognition.patch deleted file mode 100644 index 4bb67db..0000000 --- a/0011-lvm-fix-thin-recognition.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aabea6f7b9c057571d1869c6974d4c4f42530e7e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 16 Oct 2013 11:30:08 +0200 -Subject: [PATCH] lvm: fix thin recognition - -The global var setting was happening in a pipe and did not have an -effect. - -Use <<<$() instead. - -< <() cannot be used, because dracut is called in chroot's environments, -where /dev/fd does not point to /proc/self/fd, but bash wants -/dev/fd/<num> for this construct. ---- - modules.d/90lvm/module-setup.sh | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index f8b598d..cbdf4a2 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -57,12 +57,13 @@ install() { - inst lvm - - if [[ $hostonly ]]; then -- get_host_lvs | while read line; do -+ while read line; do -+ [[ -n "$line" ]] || continue - 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" -+ done <<<$(get_host_lvs) >> "${initdir}/etc/cmdline.d/90lvm.conf" - echo >> "${initdir}/etc/cmdline.d/90lvm.conf" - else - _needthin=1 diff --git a/0012-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch b/0012-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch deleted file mode 100644 index bafba09..0000000 --- a/0012-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 68b736b50fbd6bb952d9499296ec70a218e1f5da Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 16 Oct 2013 11:31:54 +0200 -Subject: [PATCH] dracut.sh: also mkdir /run/lock, which is copied to - ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index 173a259..a6e3df3 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1094,7 +1094,7 @@ if [[ $kernel_only != yes ]]; then - fi - done - -- for d in dev proc sys sysroot root run run/lock run/initramfs; do -+ for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do - if [ -L "/$d" ]; then - inst_symlink "/$d" - else diff --git a/0013-dracut.sh-no-need-to-make-subdirs-in-run.patch b/0013-dracut.sh-no-need-to-make-subdirs-in-run.patch deleted file mode 100644 index 90c12af..0000000 --- a/0013-dracut.sh-no-need-to-make-subdirs-in-run.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8d89fc6bb1b5b1f4c8be0694a1e1200a09ae07d1 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 16 Oct 2013 11:39:17 +0200 -Subject: [PATCH] dracut.sh: no need to make subdirs in run - ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index a6e3df3..4613d5b 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1094,7 +1094,7 @@ if [[ $kernel_only != yes ]]; then - fi - done - -- for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do -+ for d in dev proc sys sysroot root run; do - if [ -L "/$d" ]; then - inst_symlink "/$d" - else diff --git a/0014-network-fcoe-only-redirect-output-to-loginit.pipe-if.patch b/0014-network-fcoe-only-redirect-output-to-loginit.pipe-if.patch deleted file mode 100644 index 132e5f1..0000000 --- a/0014-network-fcoe-only-redirect-output-to-loginit.pipe-if.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 879546753341a9b2b1ad391a14ebe9fd3f6c27c4 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 16 Oct 2013 11:39:34 +0200 -Subject: [PATCH] network/fcoe: only redirect output to loginit.pipe, if exists - ---- - modules.d/40network/dhclient-script.sh | 2 +- - modules.d/95fcoe/fcoe-up.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 07c3d9b..af483ac 100755 ---- a/modules.d/40network/dhclient-script.sh -+++ b/modules.d/40network/dhclient-script.sh -@@ -48,7 +48,7 @@ setup_interface() { - PATH=/usr/sbin:/usr/bin:/sbin:/bin - - export PS4="dhclient.$interface.$$ + " --exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe -+[ -e /run/initramfs/loginit.pipe ] && exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe - type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh - type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh - -diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index ecb1593..8cf39ec 100755 ---- a/modules.d/95fcoe/fcoe-up.sh -+++ b/modules.d/95fcoe/fcoe-up.sh -@@ -14,7 +14,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin - [ -z "$1" -o -z "$2" ] && exit 1 - - export PS4="fcoe-up.$1.$$ + " --exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe -+[ -e /run/initramfs/loginit.pipe ] && exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe - type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh - type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh - diff --git a/0015-mkdir-basic-dirs-in-run.patch b/0015-mkdir-basic-dirs-in-run.patch deleted file mode 100644 index 224db8d..0000000 --- a/0015-mkdir-basic-dirs-in-run.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 56903458d7e67f805a7e484cd025a059a5621d73 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 16 Oct 2013 11:47:01 +0200 -Subject: [PATCH] mkdir basic dirs in /run - -for systemd initramfs, /run is also mounted -for non-systemd the contents of /run is copied over, when mounting /run ---- - modules.d/98systemd/dracut-cmdline.sh | 5 ----- - modules.d/99base/dracut-lib.sh | 7 +++++++ - modules.d/99base/init.sh | 10 +++------- - 3 files changed, 10 insertions(+), 12 deletions(-) - -diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh -index 50b8d6c..aa8a02b 100755 ---- a/modules.d/98systemd/dracut-cmdline.sh -+++ b/modules.d/98systemd/dracut-cmdline.sh -@@ -2,11 +2,6 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - --[ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT --[ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs --[ -d /run/lock ] || mkdir -p -m 0755 /run/lock --[ -d /run/log ] || mkdir -p -m 0755 /run/log -- - if [ -f /dracut-state.sh ]; then - . /dracut-state.sh 2>/dev/null - fi -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 74d7d35..0670cf2 100755 ---- a/modules.d/99base/dracut-lib.sh -+++ b/modules.d/99base/dracut-lib.sh -@@ -4,6 +4,13 @@ - - export DRACUT_SYSTEMD - export NEWROOT -+if [ -n "$NEWROOT" ]; then -+ [ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT -+fi -+ -+[ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs -+[ -d /run/lock ] || mkdir -p -m 0755 /run/lock -+[ -d /run/log ] || mkdir -p -m 0755 /run/log - - debug_off() { - set +x -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index 3ba440a..2364f4f 100755 ---- a/modules.d/99base/init.sh -+++ b/modules.d/99base/init.sh -@@ -56,17 +56,17 @@ fi - - if ! ismounted /dev/pts; then - mkdir -m 0755 /dev/pts -- mount -t devpts -o gid=5,mode=620,noexec,nosuid devpts /dev/pts >/dev/null -+ mount -t devpts -o gid=5,mode=620,noexec,nosuid devpts /dev/pts >/dev/null - fi - - if ! ismounted /dev/shm; then - mkdir -m 0755 /dev/shm -- mount -t tmpfs -o mode=1777,nosuid,nodev,strictatime tmpfs /dev/shm >/dev/null -+ mount -t tmpfs -o mode=1777,nosuid,nodev,strictatime tmpfs /dev/shm >/dev/null - fi - - if ! ismounted /run; then - mkdir -m 0755 /newrun -- mount -t tmpfs -o mode=0755,nosuid,nodev,strictatime tmpfs /newrun >/dev/null -+ mount -t tmpfs -o mode=0755,nosuid,nodev,strictatime tmpfs /newrun >/dev/null - cp -a /run/* /newrun >/dev/null 2>&1 - mount --move /newrun /run - rm -fr -- /newrun -@@ -88,10 +88,6 @@ fi - - trap "action_on_fail Signal caught!" 0 - --[ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs --[ -d /run/log ] || mkdir -p -m 0755 /run/log --[ -d /run/lock ] || mkdir -p -m 0755 /run/lock -- - export UDEVVERSION=$(udevadm --version) - if [ $UDEVVERSION -gt 166 ]; then - # newer versions of udev use /run/udev/rules.d diff --git a/0016-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch b/0016-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch deleted file mode 100644 index 1a451a5..0000000 --- a/0016-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 96c6f6f3d101a16b70d0fe760abbf8ea77975bc4 Mon Sep 17 00:00:00 2001 -From: Marian Csontos <mcsontos@redhat.com> -Date: Fri, 18 Oct 2013 14:40:40 +0200 -Subject: [PATCH] dracut-functions.sh:check_block_and_slaves*() skip LVM - internal devs - -Not every device in /dev/mapper should be examined. -If it is an LVM device, touch only devices which have /dev/VG/LV symlink. ---- - dracut-functions.sh | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 45e0911..2e6e845 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -579,7 +579,7 @@ host_fs_all() - check_block_and_slaves() { - local _x - [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry. -- "$1" $2 && return -+ if ! lvm_internal_dev $2; then "$1" $2 && return; fi - check_vol_slaves "$@" && return 0 - if [[ -f /sys/dev/block/$2/../dev ]]; then - check_block_and_slaves $1 $(<"/sys/dev/block/$2/../dev") && return 0 -@@ -595,7 +595,7 @@ check_block_and_slaves() { - check_block_and_slaves_all() { - local _x _ret=1 - [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry. -- if "$1" $2; then -+ if ! lvm_internal_dev $2 && "$1" $2; then - _ret=0 - fi - check_vol_slaves "$@" && return 0 -@@ -1672,3 +1672,15 @@ get_ucode_file () - printf "%02x-%02x-%02x" ${family} ${model} ${stepping} - fi - } -+ -+# Not every device in /dev/mapper should be examined. -+# If it is an LVM device, touch only devices which have /dev/VG/LV symlink. -+lvm_internal_dev() { -+ local dev_dm_dir=/sys/dev/block/$1/dm -+ [[ ! -f $dev_dm_dir/uuid || $(<$dev_dm_dir/uuid) != LVM-* ]] && return 1 # Not an LVM device -+ local DM_VG_NAME DM_LV_NAME DM_LV_LAYER -+ eval $(dmsetup splitname --nameprefixes --noheadings --rows "$(<$dev_dm_dir/name)" 2>/dev/null) -+ [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 0 # Better skip this! -+ [[ ${DM_LV_LAYER} ]] || [[ ! -L /dev/${DM_VG_NAME}/${DM_LV_NAME} ]] -+} -+ diff --git a/0017-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch b/0017-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch deleted file mode 100644 index f34414b..0000000 --- a/0017-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 76a44782647c2693039d15a2d8073d70be9b6756 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 18 Oct 2013 14:56:51 +0200 -Subject: [PATCH] kernel-modules(ARM): add mmc_block usb_storage to statis list - of kernel mods - ---- - modules.d/90kernel-modules/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index f6d1c3d..2100336 100755 ---- a/modules.d/90kernel-modules/module-setup.sh -+++ b/modules.d/90kernel-modules/module-setup.sh -@@ -49,7 +49,7 @@ installkernel() { - # arm specific modules - hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm \ - omap_hsmmc panel-tfp410 sdhci_dove ahci_platform pata_imx sata_mv \ -- ehci-tegra -+ ehci-tegra mmc_block usb_storage - fi - - # install virtual machine support diff --git a/0018-lvm-always-install-thin-utils-for-lvm.patch b/0018-lvm-always-install-thin-utils-for-lvm.patch deleted file mode 100644 index e88869a..0000000 --- a/0018-lvm-always-install-thin-utils-for-lvm.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 5d623b1775ebc7dc17bc23f2839906f418b17383 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 21 Oct 2013 09:09:26 +0200 -Subject: [PATCH] lvm: always install thin utils for lvm - ---- - modules.d/90lvm/module-setup.sh | 33 +++++++-------------------------- - 1 file changed, 7 insertions(+), 26 deletions(-) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index cbdf4a2..87374da 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -24,7 +24,8 @@ depends() { - return 0 - } - --get_host_lvs() { -+# called by dracut -+cmdline() { - local _activated - declare -A _activated - -@@ -37,37 +38,20 @@ get_host_lvs() { - eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null) - [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1 - if ! [[ ${_activated[${DM_VG_NAME}/${DM_LV_NAME}]} ]]; then -- printf "%s\n" "${DM_VG_NAME}/${DM_LV_NAME} " -+ printf " rd.lvm.lv=%s\n" "${DM_VG_NAME}/${DM_LV_NAME} " - _activated["${DM_VG_NAME}/${DM_LV_NAME}"]=1 - fi - 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 -+ local _i - - inst lvm - -- if [[ $hostonly ]]; then -- while read line; do -- [[ -n "$line" ]] || continue -- printf "%s" " rd.lvm.lv=$line" -- if ! [[ $_needthin ]]; then -- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 -- fi -- done <<<$(get_host_lvs) >> "${initdir}/etc/cmdline.d/90lvm.conf" -- echo >> "${initdir}/etc/cmdline.d/90lvm.conf" -- else -- _needthin=1 -- fi -+ cmdline >> "${initdir}/etc/cmdline.d/90lvm.conf" -+ echo >> "${initdir}/etc/cmdline.d/90lvm.conf" - - inst_rules "$moddir/64-lvm.rules" - -@@ -103,9 +87,6 @@ install() { - - inst_libdir_file "libdevmapper-event-lvm*.so" - -- if [[ $_needthin ]]; then -- inst_multiple -o thin_dump thin_restore thin_check thin_repair -- fi -- -+ inst_multiple -o thin_dump thin_restore thin_check thin_repair - } - diff --git a/0019-usrmount-module-setup.sh-fixed-typo.patch b/0019-usrmount-module-setup.sh-fixed-typo.patch deleted file mode 100644 index 4cbedd5..0000000 --- a/0019-usrmount-module-setup.sh-fixed-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0106da599a227cf1c28c3648b7e77985f617b878 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Fri, 25 Oct 2013 17:06:44 +0200 -Subject: [PATCH] usrmount/module-setup.sh: fixed typo - ---- - modules.d/98usrmount/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh -index 1af789f..d8a0ec2 100755 ---- a/modules.d/98usrmount/module-setup.sh -+++ b/modules.d/98usrmount/module-setup.sh -@@ -7,7 +7,7 @@ check() { - local _init - [[ $mount_needs ]] && return 1 - _init=$(readlink -f /sbin/init) -- [[ "$init" == "${init##/usr}" ]] && return 255 -+ [[ "$_init" == "${_init##/usr}" ]] && return 255 - return 0 - } - diff --git a/0020-Handle-crypto-modules-with-and-without-modaliases.patch b/0020-Handle-crypto-modules-with-and-without-modaliases.patch deleted file mode 100644 index 132d772..0000000 --- a/0020-Handle-crypto-modules-with-and-without-modaliases.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4d7c18c7c0abf9c2347581d07a8e8be3d3969bd2 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 30 Oct 2013 12:22:52 +0100 -Subject: [PATCH] Handle crypto modules with and without modaliases - -If new kernels have modules split out, handle the case, where modules -have to modalias and just install them. - -Also add the crypto drivers and names to host_modalias. ---- - dracut-functions.sh | 14 ++++++++++---- - dracut.sh | 5 +++++ - modules.d/01fips/fips.sh | 1 - - 3 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 2e6e845..38095ba 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1480,7 +1480,7 @@ dracut_kernel_post() { - - module_is_host_only() { - local _mod=$1 -- local _modenc a i -+ local _modenc a i _k _s _v _aliases - _mod=${_mod##*/} - _mod=${_mod%.ko} - _modenc=${_mod//-/_} -@@ -1497,19 +1497,25 @@ module_is_host_only() { - # this covers the case, where a new module is introduced - # or a module was renamed - # or a module changed from builtin to a module -+ - if [[ -d /lib/modules/$kernel_current ]]; then - # if the modinfo can be parsed, but the module - # is not loaded, then we can safely return 1 - modinfo -F filename "$_mod" &>/dev/null && return 1 - fi - -- # Finally check all modalias, if we install for a kernel -- # different from the current one -- for a in $(modinfo -k $kernel -F alias $_mod 2>/dev/null); do -+ _aliases=$(modinfo -k $kernel -F alias $_mod 2>/dev/null) -+ -+ # if the module has no aliases, install it -+ [[ $_aliases ]] || return 0 -+ -+ # finally check all modalias -+ for a in $_aliases; do - for i in "${!host_modalias[@]}"; do - [[ $i == $a ]] && return 0 - done - done -+ - fi - - return 1 -diff --git a/dracut.sh b/dracut.sh -index 4613d5b..ae792c4 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -968,6 +968,11 @@ if [[ $hostonly ]]; then - - rm -f -- "$initdir/.modalias" - -+ while read _k _s _v; do -+ [ "$_k" != "name" -a "$_k" != "driver" ] && continue -+ host_modalias["$_v"]=1 -+ done </proc/crypto -+ - # check /proc/modules - declare -A host_modules - while read m rest; do -diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh -index f0a4c5c..98dd1c2 100755 ---- a/modules.d/01fips/fips.sh -+++ b/modules.d/01fips/fips.sh -@@ -96,7 +96,6 @@ do_fips() - _found=0 - while read _k _s _v; do - [ "$_k" != "name" -a "$_k" != "driver" ] && continue -- [ "$_k" = "driver" ] && _v=$(str_replace "$_v" "_" "-") - [ "$_v" != "$_module" ] && continue - _found=1 - break diff --git a/0021-fips-include-crct10dif_generic.patch b/0021-fips-include-crct10dif_generic.patch deleted file mode 100644 index 262ed42..0000000 --- a/0021-fips-include-crct10dif_generic.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0a8e91bb24de6eaf542ade0fffc941c3f072daec Mon Sep 17 00:00:00 2001 -From: Kyle McMartin <kmcmarti@redhat.com> -Date: Wed, 30 Oct 2013 12:35:27 +0100 -Subject: [PATCH] fips: include crct10dif_generic - -Resolves: rhbz#1024455 ---- - modules.d/01fips/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 6493290..fb5a5cd 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -16,7 +16,7 @@ depends() { - installkernel() { - local _fipsmodules _mod - _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm " -- _fipsmodules+="chainiv crc32c cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod " -+ _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod " - _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 " - _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic " - _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib" diff --git a/0022-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch b/0022-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch deleted file mode 100644 index 8236232..0000000 --- a/0022-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch +++ /dev/null @@ -1,61 +0,0 @@ -From fa9384b1c0414efd33d82a2e083346b35c378f50 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 30 Oct 2013 17:36:54 +0100 -Subject: [PATCH] iscsi/nbd: do not try to mount the whole disk, if root= is - missing - -only mount the whole disk for root=dhcp ---- - modules.d/95iscsi/iscsiroot.sh | 11 ++--------- - modules.d/95nbd/nbdroot.sh | 2 +- - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 5181f52..738fff4 100755 ---- a/modules.d/95iscsi/iscsiroot.sh -+++ b/modules.d/95iscsi/iscsiroot.sh -@@ -40,14 +40,6 @@ modprobe crc32c 2>/dev/null - [ -e /sys/module/bnx2i ] && iscsiuio - - if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then -- if [ -z "$root" -o -n "${root%%block:*}" ]; then -- # if root is not specified try to mount the whole iSCSI LUN -- printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules -- udevadm control --reload -- write_fs_tab /dev/root -- wait_for_dev /dev/root -- fi -- - for p in $(getargs rd.iscsi.param -d iscsi_param); do - iscsi_param="$iscsi_param --param $p" - done -@@ -55,6 +47,7 @@ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then - iscsistart -b $iscsi_param - echo 'started' > "/tmp/iscsistarted-iscsi" - echo 'started' > "/tmp/iscsistarted-firmware" -+ need_shutdown - exit 0 - fi - -@@ -137,7 +130,7 @@ handle_netroot() - - # FIXME $iscsi_protocol?? - -- if [ -z "$root" -o -n "${root%%block:*}" ]; then -+ if [ "$root" = "dhcp" ]; then - # if root is not specified try to mount the whole iSCSI LUN - printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules - udevadm control --reload -diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh -index 823da0e..2e9d917 100755 ---- a/modules.d/95nbd/nbdroot.sh -+++ b/modules.d/95nbd/nbdroot.sh -@@ -97,7 +97,7 @@ done - - # If we didn't get a root= on the command line, then we need to - # add the udev rules for mounting the nbd0 device --if [ -z "$root" -o -n "${root%%block:*}" -o "$root" = "block:/dev/root" ]; then -+if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then - printf 'KERNEL=="nbd0", ENV{DEVTYPE}!="partition", ENV{ID_FS_TYPE}=="?*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-nbd-root.rules - udevadm control --reload - type write_fs_tab >/dev/null 2>&1 || . /lib/fs-lib.sh diff --git a/0023-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch b/0023-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch deleted file mode 100644 index e6ff8c7..0000000 --- a/0023-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 06d418abd1a78c79ca11ce597d7dcfdb0091c96e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 21 Oct 2013 09:43:04 +0200 -Subject: [PATCH] dracut.spec: move /sbin/dracut to /usr/sbin/dracut - ---- - dracut.spec | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dracut.spec b/dracut.spec -index 3ec0ec0..44171d8 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -274,8 +274,8 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ - %endif - - # create compat symlink --mkdir -p $RPM_BUILD_ROOT/sbin --ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut -+mkdir -p $RPM_BUILD_ROOT%{_sbindir} -+ln -sr $RPM_BUILD_ROOT%{_bindir}/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut - - %clean - rm -rf -- $RPM_BUILD_ROOT -@@ -285,7 +285,7 @@ rm -rf -- $RPM_BUILD_ROOT - %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg - %{_bindir}/dracut - # compat symlink --/sbin/dracut -+%{_sbindir}/dracut - %{_datadir}/bash-completion/completions/dracut - %{_datadir}/bash-completion/completions/lsinitrd - %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999 diff --git a/0024-dracut.sh-fixed-PATH-shortener.patch b/0024-dracut.sh-fixed-PATH-shortener.patch deleted file mode 100644 index b295af4..0000000 --- a/0024-dracut.sh-fixed-PATH-shortener.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cf3fd99e72745b894a5c787277f90305f2ea1215 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Sat, 2 Nov 2013 13:14:40 +0100 -Subject: [PATCH] dracut.sh: fixed PATH shortener - ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index ae792c4..03472ba 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -533,7 +533,7 @@ for i in /usr/sbin /sbin /usr/bin /bin; do - if [ -L "$i" ]; then - rl=$(readlink -f $i) - fi -- if [[ "$NPATH" != "*:$rl*" ]] ; then -+ if [[ "$NPATH" != *:$rl* ]] ; then - NPATH+=":$rl" - fi - done diff --git a/0025-dracut.modules.7.asc-removed-empty-section.patch b/0025-dracut.modules.7.asc-removed-empty-section.patch deleted file mode 100644 index 8494e3a..0000000 --- a/0025-dracut.modules.7.asc-removed-empty-section.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 095fa1559178522029ad854017a0c83d4979e876 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Sat, 2 Nov 2013 13:20:32 +0100 -Subject: [PATCH] dracut.modules.7.asc: removed empty section - ---- - dracut.modules.7.asc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc -index 4cb2aa1..17acdb4 100644 ---- a/dracut.modules.7.asc -+++ b/dracut.modules.7.asc -@@ -10,7 +10,6 @@ dracut.modules - dracut modules - - DESCRIPTION - ----------- --== 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 _<git-src>/modules.d_. diff --git a/0026-fips-also-install-etc-system-fips-in-the-initramfs.patch b/0026-fips-also-install-etc-system-fips-in-the-initramfs.patch deleted file mode 100644 index 4f334c0..0000000 --- a/0026-fips-also-install-etc-system-fips-in-the-initramfs.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 185e940e27eb8c1658556d17b30ac60a16894502 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 4 Nov 2013 17:29:15 +0100 -Subject: [PATCH] fips: also install /etc/system-fips in the initramfs - ---- - modules.d/01fips/module-setup.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index fb5a5cd..a4081dc 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -45,5 +45,6 @@ install() { - libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 - - inst_multiple -o prelink -+ inst_simple /etc/system-fips - } - diff --git a/0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch b/0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch deleted file mode 100644 index f03ac35..0000000 --- a/0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1d50dfe6025126c38b1d23815360bd48e9e8c24c Mon Sep 17 00:00:00 2001 -From: Colin Guthrie <colin@mageia.org> -Date: Sat, 2 Nov 2013 11:26:30 +0000 -Subject: [PATCH] dracut-functions.sh: Avoid loading unnecessary 32-bit - libraries for 64-bit initrds - -Due to the 'inst_libdir_file "libnss_files*"' in the udev-rules module -this caues the /usr/lib/libnss_files-2.18.so* to be included. This is a -32-bit library and pulls in a 32-bit version of glibc also even on a -64-bit system. - -This is due to the fact that ldconfig -pN will print [/usr]/lib paths -from the cache as well as [/usr]/lib64. As we handle these paths -specifically we should ignore these results from the cache. - -Also there was a missing space when appending the ldconfig paths -onto our list meaning the last builtin and first ldconfig path -were unusable. ---- - dracut-functions.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 38095ba..2872516 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -65,6 +65,7 @@ ldconfig_paths() - printf "%s\n" ${d%/*}; - done - ); do -+ [[ "$i" = "/lib" || "$i" = "/usr/lib" || "$i" = "/lib64" || "$i" = "/usr/lib64" ]] && continue - a["$i"]=1; - done; - printf "%s\n" ${!a[@]} -@@ -81,7 +82,7 @@ if ! [[ $libdirs ]] ; then - [[ -d /usr/lib ]] && libdirs+=" /usr/lib" - fi - -- libdirs+="$(ldconfig_paths)" -+ libdirs+=" $(ldconfig_paths)" - - export libdirs - fi diff --git a/0028-iscsi-nbd-do-not-fail-in-hostonly-mode.patch b/0028-iscsi-nbd-do-not-fail-in-hostonly-mode.patch deleted file mode 100644 index 84f1a44..0000000 --- a/0028-iscsi-nbd-do-not-fail-in-hostonly-mode.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c2ab99093817d4694c0360b77845b8f2a8a10caf Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 11 Nov 2013 16:57:09 +0100 -Subject: [PATCH] iscsi,nbd: do not fail in hostonly mode - ---- - modules.d/95iscsi/module-setup.sh | 2 +- - modules.d/95nbd/module-setup.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index c8051bd..8379f4b 100755 ---- a/modules.d/95iscsi/module-setup.sh -+++ b/modules.d/95iscsi/module-setup.sh -@@ -24,7 +24,7 @@ check() { - - [[ $hostonly ]] || [[ $mount_needs ]] && { - pushd . >/dev/null -- for_each_host_dev_and_slaves is_iscsi || return 1 -+ for_each_host_dev_and_slaves is_iscsi || return 255 - popd >/dev/null - } - return 0 -diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh -index ac30823..37ace21 100755 ---- a/modules.d/95nbd/module-setup.sh -+++ b/modules.d/95nbd/module-setup.sh -@@ -15,7 +15,7 @@ check() { - - _rootdev=$(find_root_block_device) - [[ -b /dev/block/$_rootdev ]] || return 1 -- check_block_and_slaves is_nbd "$_rootdev" || return 1 -+ check_block_and_slaves is_nbd "$_rootdev" || return 255 - } - - return 0 diff --git a/0029-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch b/0029-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch deleted file mode 100644 index ecd10ac..0000000 --- a/0029-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7e4f74f5040fc3f4e7646695b54c5c11b0b95c62 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 11 Nov 2013 16:57:32 +0100 -Subject: [PATCH] systemd: do not exit the initqueue, if systemd asks a - password - -this prevents bailing out the initqueue, while passwords are still to be -asked ---- - modules.d/98systemd/dracut-initqueue.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index d7ebf2b..64e8154 100755 ---- a/modules.d/98systemd/dracut-initqueue.sh -+++ b/modules.d/98systemd/dracut-initqueue.sh -@@ -52,6 +52,10 @@ while :; do - # no more udev jobs and queues empty. - sleep 0.5 - -+ for i in /run/systemd/ask-password/ask.*; do -+ [ -e "$i" ] && continue -+ done -+ - if [ $main_loop -gt $((2*$RDRETRY/3)) ]; then - for job in $hookdir/initqueue/timeout/*.sh; do - [ -e "$job" ] || break diff --git a/0030-Run-xz-and-lzma-with-multiple-threads.patch b/0030-Run-xz-and-lzma-with-multiple-threads.patch deleted file mode 100644 index 2cb641f..0000000 --- a/0030-Run-xz-and-lzma-with-multiple-threads.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a3bfaa191958c4b70d6c674f972c3b911f8b1bfa Mon Sep 17 00:00:00 2001 -From: Vratislav Podzimek <vpodzime@redhat.com> -Date: Wed, 13 Nov 2013 13:20:39 +0100 -Subject: [PATCH] Run 'xz' and 'lzma' with multiple threads - -This speeds up compression a lot on multicore systems. - -https://bugzilla.redhat.com/show_bug.cgi?id=1029786 - -[Edited-by: Harald Hoyer: use getconf for cpu_count] ---- - dracut.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 03472ba..bce2662 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -693,12 +693,14 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - # eliminate IFS hackery when messing with fw_dir - fw_dir=${fw_dir//:/ } - -+cpu_count=$(getconf _NPROCESSORS_ONLN) -+ - # handle compression options. - [[ $compress ]] || compress="gzip" - case $compress in - bzip2) compress="bzip2 -9";; -- lzma) compress="lzma -9";; -- xz) compress="xz --check=crc32 --lzma2=dict=1MiB";; -+ lzma) compress="lzma -9 ${cpu_count:+-T$cpu_count}";; -+ xz) compress="xz --check=crc32 --lzma2=dict=1MiB ${cpu_count:+-T$cpu_count}";; - gzip) compress="gzip -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9";; - lzo) compress="lzop -9";; - lz4) compress="lz4 -9";; diff --git a/0031-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch b/0031-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch deleted file mode 100644 index 1351e71..0000000 --- a/0031-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 28609baf6e9581ea97c4550340e2a6031c1b6fbd Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 14 Nov 2013 10:07:04 +0100 -Subject: [PATCH] kernel-modules: add ohci-pci to the list of forced module - installs - ---- - modules.d/90kernel-modules/module-setup.sh | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index 2100336..d65e92b 100755 ---- a/modules.d/90kernel-modules/module-setup.sh -+++ b/modules.d/90kernel-modules/module-setup.sh -@@ -36,9 +36,12 @@ installkernel() { - return 0 - } - -- hostonly='' instmods sr_mod sd_mod scsi_dh ata_piix \ -- ehci-hcd ehci-pci ehci-platform ohci-hcd uhci-hcd xhci-hcd hid_generic \ -- unix -+ hostonly='' instmods \ -+ sr_mod sd_mod scsi_dh ata_piix hid_generic unix \ -+ ehci-hcd ehci-pci ehci-platform \ -+ ohci-hcd ohci-pci \ -+ uhci-hcd \ -+ xhci-hcd - - instmods yenta_socket scsi_dh_rdac scsi_dh_emc \ - atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \ diff --git a/0032-lvm-do-not-run-pvscan-for-lvmetad-update.patch b/0032-lvm-do-not-run-pvscan-for-lvmetad-update.patch deleted file mode 100644 index c424b93..0000000 --- a/0032-lvm-do-not-run-pvscan-for-lvmetad-update.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 297b8edc050715d563d54cfa34e42bf5909b9a7b Mon Sep 17 00:00:00 2001 -From: Peter Rajnoha <prajnoha@redhat.com> -Date: Mon, 25 Nov 2013 14:38:00 +0100 -Subject: [PATCH] lvm: do not run pvscan for lvmetad update - -The lvmetad daemon is not yet running in initramfs so there's no -need to run pvscan (or instantiate any lvm2-pvscan systemd service). -If pvscan was called in this case (either directly or via systemd -instantiated service), it would fail because there's no lvmetad -daemon to update. This could cause confusion, especially in systemd -instantiated service which is run only once! ---- - modules.d/90lvm/module-setup.sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 87374da..a220a55 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -76,6 +76,16 @@ install() { - fi - - inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules -+ -+ # Do not run lvmetad update via pvscan in udev rule - lvmetad is not running yet in dracut! -+ if grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then -+ sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules -+ sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules -+ sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules -+ else -+ sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules -+ fi -+ - # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules - # files, but provides the one below: - inst_rules 64-device-mapper.rules diff --git a/0033-fips-fix-RHEV-vmlinuz-check.patch b/0033-fips-fix-RHEV-vmlinuz-check.patch deleted file mode 100644 index 6388de3..0000000 --- a/0033-fips-fix-RHEV-vmlinuz-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 928da5744721842d3e02151323c3a1357baf0032 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 8 Nov 2013 15:06:18 +0100 -Subject: [PATCH] fips: fix RHEV vmlinuz check - ---- - modules.d/01fips/fips.sh | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh -index 98dd1c2..7fa48f1 100755 ---- a/modules.d/01fips/fips.sh -+++ b/modules.d/01fips/fips.sh -@@ -60,8 +60,8 @@ do_rhevh_check() - KERNEL=$(uname -r) - kpath=${1} - -- # If we're on RHEV-H, the kernel is in /dev/.initramfs/live/vmlinuz0 -- HMAC_SUM_ORIG=$(cat /boot/.vmlinuz-${KERNEL}.hmac | while read a b; do printf "%s\n" $a; done) -+ # If we're on RHEV-H, the kernel is in /run/initramfs/live/vmlinuz0 -+ HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b; do printf "%s\n" $a; done) - HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b; do printf "%s\n" $a; done || return 1) - if [ -z "$HMAC_SUM_ORIG" ] || [ -z "$HMAC_SUM_CALC" ] || [ "${HMAC_SUM_ORIG}" != "${HMAC_SUM_CALC}" ]; then - warn "HMAC sum mismatch" -@@ -111,10 +111,10 @@ do_fips() - rmmod tcrypt - - info "Checking integrity of kernel" -- if [ -e "$NEWROOT/dev/.initramfs/live/vmlinuz0" ]; then -- do_rhevh_check "$NEWROOT/dev/.initramfs/live/vmlinuz0" || return 1 -- elif [ -e "$NEWROOT/dev/.initramfs/live/isolinux/vmlinuz0" ]; then -- do_rhevh_check "$NEWROOT/dev/.initramfs/live/isolinux/vmlinuz0" || return 1 -+ if [ -e "/run/initramfs/live/vmlinuz0" ]; then -+ do_rhevh_check /run/initramfs/live/vmlinuz0 || return 1 -+ elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then -+ do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1 - else - sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1 - fi diff --git a/0034-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch b/0034-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch deleted file mode 100644 index ae82d5a..0000000 --- a/0034-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e38e73d5a683ce93146c147305278b9175def3a0 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:30:52 +0100 -Subject: [PATCH] dracut.cmdline.7.asc: document "server-ip" of "ip=" parameter - ---- - dracut.cmdline.7.asc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 19bfb93..6a5fc8f 100644 ---- a/dracut.cmdline.7.asc -+++ b/dracut.cmdline.7.asc -@@ -444,10 +444,12 @@ cannot be used in conjunction with the **ifname** argument for the - same <interface>. - ===================== - --**ip=**__<client-IP>__:__<server-IP>__:__<gateway-IP>__:__<netmask>__:__<client_hostname>__:__<interface>__:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__:[:[__<mtu>__][:__<macaddr>__]]:: -+**ip=**__<client-IP>__:[__<peer>__]:__<gateway-IP>__:__<netmask>__:__<client_hostname>__:__<interface>__:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__:[:[__<mtu>__][:__<macaddr>__]]:: - explicit network configuration. If you want do define a IPv6 address, put it - in brackets (e.g. [2001:DB8::1]). This parameter can be specified multiple -- times. -+ times. __<peer>__ is optional and is the address of the remote endpoint -+ for pointopoint interfaces and it may be followed by a slash and a decimal number, -+ encoding the network prefix length. - + - ===================== - <macaddr>::: optionally **set** <macaddr> on the <interface>. This diff --git a/0035-dracut.sh-_get_fs_type-if-block-device-exists-return.patch b/0035-dracut.sh-_get_fs_type-if-block-device-exists-return.patch deleted file mode 100644 index 02f6431..0000000 --- a/0035-dracut.sh-_get_fs_type-if-block-device-exists-return.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e41f3f902512a91a286e14d6ffa52206c70ea5f6 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:32:00 +0100 -Subject: [PATCH] dracut.sh:_get_fs_type() if block device exists return early - -even, if no ID_FS_TYPE was found, return if the block device exists ---- - dracut.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index bce2662..177b813 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -987,12 +987,12 @@ unset rest - - _get_fs_type() { - [[ $1 ]] || return -- if [[ -b /dev/block/$1 ]] && ID_FS_TYPE=$(get_fs_env "/dev/block/$1"); then -- host_fs_types["$(readlink -f "/dev/block/$1")"]="$ID_FS_TYPE" -+ if [[ -b /dev/block/$1 ]]; then -+ ID_FS_TYPE=$(get_fs_env "/dev/block/$1") && host_fs_types["$(readlink -f "/dev/block/$1")"]="$ID_FS_TYPE" - return 1 - fi -- if [[ -b $1 ]] && ID_FS_TYPE=$(get_fs_env "$1"); then -- host_fs_types["$(readlink -f "$1")"]="$ID_FS_TYPE" -+ if [[ -b $1 ]]; then -+ ID_FS_TYPE=$(get_fs_env "$1") && host_fs_types["$(readlink -f "$1")"]="$ID_FS_TYPE" - return 1 - fi - if fstype=$(find_dev_fstype "$1"); then diff --git a/0036-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch b/0036-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch deleted file mode 100644 index 2a7df52..0000000 --- a/0036-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 56ee31ccfec50f40bade2127eb1fae041a81f16a Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:34:18 +0100 -Subject: [PATCH] network/net-lib.sh:wait_for_if_up() wait for "state UP" - -really wait for "state UP", otherwise it returns earlier than we want ---- - modules.d/40network/net-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 88e72ec..0aa312a 100644 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -443,7 +443,7 @@ wait_for_if_up() { - local li - while [ $cnt -lt 200 ]; do - li=$(ip -o link show up dev $1) -- [ -n "$li" ] && return 0 -+ [ -n "$li" ] && [ -z "${li##*state UP*}" ] && return 0 - sleep 0.1 - cnt=$(($cnt+1)) - done diff --git a/0037-network-net-lib.sh-iface_has_link-fixup.patch b/0037-network-net-lib.sh-iface_has_link-fixup.patch deleted file mode 100644 index eb69916..0000000 --- a/0037-network-net-lib.sh-iface_has_link-fixup.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7c8da72c11b74a1759e0ebbabe003d69a4459114 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:36:42 +0100 -Subject: [PATCH] network/net-lib.sh:iface_has_link() fixup - -Just echo'ing the flags IFF_UP|IFF_RUNNING does _not_ reflect the -carrier state immediately. So wait for it to really show up. ---- - modules.d/40network/net-lib.sh | 47 +++++++++++++++++++++--------------------- - 1 file changed, 23 insertions(+), 24 deletions(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 0aa312a..7544401 100644 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -28,30 +28,6 @@ iface_for_mac() { - done - } - --iface_has_link() { -- local interface="$1" flags="" -- [ -n "$interface" ] || return 2 -- interface="/sys/class/net/$interface" -- [ -d "$interface" ] || return 2 -- flags=$(cat $interface/flags) -- echo $(($flags|0x41)) > $interface/flags # 0x41: IFF_UP|IFF_RUNNING -- [ "$(cat $interface/carrier)" = 1 ] || return 1 -- # XXX Do we need to reset the flags here? anaconda never bothered.. --} -- --find_iface_with_link() { -- local iface_path="" iface="" -- for iface_path in /sys/class/net/*; do -- iface=${iface_path##*/} -- str_starts "$iface" "lo" && continue -- if iface_has_link $iface; then -- echo "$iface" -- return 0 -- fi -- done -- return 1 --} -- - # get the iface name for the given identifier - either a MAC, IP, or iface name - iface_name() { - case $1 in -@@ -483,3 +459,26 @@ type hostname >/dev/null 2>&1 || \ - hostname() { - cat /proc/sys/kernel/hostname - } -+ -+iface_has_link() { -+ local interface="$1" flags="" -+ [ -n "$interface" ] || return 2 -+ interface="/sys/class/net/$interface" -+ [ -d "$interface" ] || return 2 -+ linkup "$1" -+ [ "$(cat $interface/carrier)" = 1 ] || return 1 -+ # XXX Do we need to reset the flags here? anaconda never bothered.. -+} -+ -+find_iface_with_link() { -+ local iface_path="" iface="" -+ for iface_path in /sys/class/net/*; do -+ iface=${iface_path##*/} -+ str_starts "$iface" "lo" && continue -+ if iface_has_link $iface; then -+ echo "$iface" -+ return 0 -+ fi -+ done -+ return 1 -+} diff --git a/0038-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch b/0038-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch deleted file mode 100644 index c181e4f..0000000 --- a/0038-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 271cd19dbe895c24b1f70fa5c6bbecace3b97f4d Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:38:21 +0100 -Subject: [PATCH] network/ifup.sh: before doing dhcp, check, if the link has a - carrier - ---- - modules.d/40network/ifup.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 9f6f449..2edcfe6 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -87,6 +87,10 @@ do_dhcp() { - # dhclient-script will mark the netif up and generate the online - # event for nfsroot - # XXX add -V vendor class and option parsing per kernel -+ if ! iface_has_link $netif; then -+ echo "No carrier detected" -+ return 1 -+ fi - echo "Starting dhcp for interface $netif" - dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \ - || echo "dhcp failed" diff --git a/0039-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch b/0039-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch deleted file mode 100644 index a9cc2a6..0000000 --- a/0039-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b92896ece49d27741f41e915c4673bde2a9bcb1f Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:39:36 +0100 -Subject: [PATCH] base/dracut-lib.sh:wait_for_dev() relax requirement - -Do not "require" the devices, but "want" them. This might boot more -systems, where: -- the UUID changed -- swap devices do not show up ---- - modules.d/99base/dracut-lib.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 0670cf2..970bcfb 100755 ---- a/modules.d/99base/dracut-lib.sh -+++ b/modules.d/99base/dracut-lib.sh -@@ -863,9 +863,9 @@ wait_for_dev() - - if [ -n "$DRACUT_SYSTEMD" ]; then - _name=$(dev_unit_name "$1") -- if ! [ -L ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device ]; then -- [ -d ${PREFIX}/etc/systemd/system/initrd.target.requires ] || mkdir -p ${PREFIX}/etc/systemd/system/initrd.target.requires -- ln -s ../${_name}.device ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device -+ if ! [ -L ${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device ]; then -+ [ -d ${PREFIX}/etc/systemd/system/initrd.target.wants ] || mkdir -p ${PREFIX}/etc/systemd/system/initrd.target.wants -+ ln -s ../${_name}.device ${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device - fi - - mkdir -p ${PREFIX}/etc/systemd/system/${_name}.device.d -@@ -885,7 +885,7 @@ cancel_wait_for_dev() - rm -f -- "$hookdir/emergency/80-${_name}.sh" - if [ -n "$DRACUT_SYSTEMD" ]; then - _name=$(dev_unit_name "$1") -- rm -f -- ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device -+ rm -f -- ${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device - rm -f -- ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf - /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload - fi diff --git a/0040-resume-autoconf-resume.patch b/0040-resume-autoconf-resume.patch deleted file mode 100644 index 47ab584..0000000 --- a/0040-resume-autoconf-resume.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 40da1e5a319a02f30c585e0e963e75e4257d2bf7 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 10:45:17 +0100 -Subject: [PATCH] resume: autoconf resume - ---- - modules.d/95resume/module-setup.sh | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index a172c27..ceb7855 100755 ---- a/modules.d/95resume/module-setup.sh -+++ b/modules.d/95resume/module-setup.sh -@@ -16,8 +16,23 @@ check() { - } - - # called by dracut -+cmdline() { -+ local _activated -+ declare -A _activated -+ -+ for dev in "${!host_fs_types[@]}"; do -+ [[ ${host_fs_types[$dev]} =~ ^(swap|swsuspend|swsupend)$ ]] || continue -+ printf "resume=%s " "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")" -+ done -+} -+ -+# called by dracut - install() { - local _bin -+ -+ cmdline >> "${initdir}/etc/cmdline.d/95resume.conf" -+ echo >> "${initdir}/etc/cmdline.d/95resume.conf" -+ - # Optional uswsusp support - for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume - do diff --git a/0041-resume-no-more-autoresume.patch b/0041-resume-no-more-autoresume.patch deleted file mode 100644 index 998df26..0000000 --- a/0041-resume-no-more-autoresume.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 8064f68d602b45778afc3f32a703b8376609d019 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 11:02:34 +0100 -Subject: [PATCH] resume: no more autoresume - ---- - modules.d/95resume/parse-resume.sh | 76 +++++++++++++++++++++----------------- - 1 file changed, 43 insertions(+), 33 deletions(-) - -diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh -index bd4bcd3..c84dafb 100755 ---- a/modules.d/95resume/parse-resume.sh -+++ b/modules.d/95resume/parse-resume.sh -@@ -36,41 +36,51 @@ case "$splash" in - ;; - esac - --if [ -n "$resume" ]; then -- { -- printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -- ${resume#/dev/}; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -- ${resume#/dev/}; -- } >> /etc/udev/rules.d/99-resume-link.rules - -- { -- if [ -x /usr/sbin/resume ]; then -- printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ -- ${resume#/dev/} "$a_splash" "$resume"; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ -- ${resume#/dev/} "$a_splash" "$resume"; -- fi -- printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" \ -- ${resume#/dev/}; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" \ -- ${resume#/dev/}; -- } >> /etc/udev/rules.d/99-resume.rules -+if ! getarg noresume; then -+ if [ -n "$resume" ]; then -+ { -+ printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -+ ${resume#/dev/}; -+ printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -+ ${resume#/dev/}; -+ } >> /etc/udev/rules.d/99-resume-link.rules - -- printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \ -- "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh -+ { -+ if [ -x /usr/sbin/resume ]; then -+ printf -- "KERNEL==\"%s\", " "${resume#/dev/}" -+ printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ -+ "$a_splash" "$resume"; -+ printf -- "SYMLINK==\"%s\", " "${resume#/dev/}" -+ printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ -+ "$a_splash" "$resume"; -+ fi -+ printf -- "KERNEL==\"%s\", " ${resume#/dev/}; -+ printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" -+ printf -- "SYMLINK==\"%s\", " ${resume#/dev/}; -+ printf -- "%s" "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" -+ } >> /etc/udev/rules.d/99-resume.rules - -- printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";' \ -- "$hookdir" >> $hookdir/initqueue/timeout/resume.sh -+ printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \ -+ "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh - -- wait_for_dev "/dev/resume" -- mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh --elif ! getarg noresume; then -- { -- if [ -x /usr/sbin/resume ]; then -- printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \$tempnode\"\n" "$a_splash" -- fi -- echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," \ -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume\""; -- } >> /etc/udev/rules.d/99-resume.rules -+ printf -- "%s" 'warn "Cancelling resume operation. Device not found.";' -+ printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";' \ -+ "$hookdir" >> $hookdir/initqueue/timeout/resume.sh -+ -+ mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh -+ else -+ { -+ if [ -x /usr/sbin/resume ]; then -+ printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \$tempnode\"\n" "$a_splash" -+ fi -+ printf -- "%s" "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume\""; -+ } >> /etc/udev/rules.d/99-resume.rules -+ fi - fi diff --git a/0042-dracut.sh-skip-crypt-swaps-with-password-files.patch b/0042-dracut.sh-skip-crypt-swaps-with-password-files.patch deleted file mode 100644 index 258578f..0000000 --- a/0042-dracut.sh-skip-crypt-swaps-with-password-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 64ae4e07a4af4db2cdd1009ab484f89b4a6b9cb2 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 2 Dec 2013 11:05:21 +0100 -Subject: [PATCH] dracut.sh: skip crypt swaps with password files - ---- - dracut.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dracut.sh b/dracut.sh -index 177b813..6975d90 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -947,6 +947,8 @@ if [[ $hostonly ]]; then - [[ $_mapper = \#* ]] && continue - [[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue - [[ "$_o" ]] || _o="$_p" -+ # skip entries with password files -+ [[ "$_p" == /* ]] && [[ -f $_p ]] && continue 2 - # skip mkswap swap - [[ $_o == *swap* ]] && continue 2 - done < /etc/crypttab diff --git a/0043-dracut-functions.sh-do-not-force-require-modules.bui.patch b/0043-dracut-functions.sh-do-not-force-require-modules.bui.patch deleted file mode 100644 index 9ed900e..0000000 --- a/0043-dracut-functions.sh-do-not-force-require-modules.bui.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b29cb51654db13706c7356aa827e554456b25b0a Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 15:06:06 +0100 -Subject: [PATCH] dracut-functions.sh: do not force require modules.builtin* - ---- - dracut-functions.sh | 7 ------- - dracut.sh | 2 +- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 2872516..04f4fea 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1456,13 +1456,6 @@ dracut_kernel_post() { - wait $_pid - fi - -- for _f in modules.builtin.bin modules.builtin; do -- [[ $srcmods/$_f ]] && break -- done || { -- dfatal "No modules.builtin.bin and modules.builtin found!" -- return 1 -- } -- - for _f in modules.builtin.bin modules.builtin modules.order; do - [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" - done -diff --git a/dracut.sh b/dracut.sh -index 6975d90..5709874 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -501,7 +501,7 @@ if [[ $regenerate_all == "yes" ]]; then - - cd /lib/modules - for i in *; do -- [[ -f $i/modules.builtin ]] || continue -+ [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue - dracut --kver="$i" "${dracut_args[@]}" - ((ret+=$?)) - done diff --git a/0044-10i18n-parse-i18n.sh-fixed-vconsole.conf-locale.conf.patch b/0044-10i18n-parse-i18n.sh-fixed-vconsole.conf-locale.conf.patch deleted file mode 100644 index c743ef4..0000000 --- a/0044-10i18n-parse-i18n.sh-fixed-vconsole.conf-locale.conf.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 443fb524877f28fd072f63c4dd98b74926d2513a Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 15:06:39 +0100 -Subject: [PATCH] 10i18n/parse-i18n.sh: fixed vconsole.conf/locale.conf - generation - ---- - modules.d/10i18n/parse-i18n.sh | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) - -diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh -index 416a746..135c57b 100755 ---- a/modules.d/10i18n/parse-i18n.sh -+++ b/modules.d/10i18n/parse-i18n.sh -@@ -6,28 +6,27 @@ inst_key_val() { - local _value - local _file - local _default -- _default=$1 -- shift -- _file=$1 -- shift -- _value=$(getarg $@) -+ _file="$1"; shift -+ _key="$1"; shift -+ _default="$1"; shift -+ _value="$(getarg $@)" - [ -z "${_value}" ] && _value=$_default - if [ -n "${_value}" ]; then -- printf '%s="%s"\n' $2 ${_value} >> $_file -+ printf '%s="%s"\n' $key ${_value} >> $_file - fi - unset _file - unset _value - } - --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/vconsole.conf KEYMAP '' rd.vconsole.keymap KEYMAP -d KEYTABLE -+inst_key_val /etc/vconsole.conf FONT '' rd.vconsole.font FONT -d SYSFONT -+inst_key_val /etc/vconsole.conf FONT_MAP '' rd.vconsole.font.map FONT_MAP -d CONTRANS -+inst_key_val /etc/vconsole.conf FONT_UNIMAP '' rd.vconsole.font.unimap FONT_UNIMAP -d UNIMAP -+inst_key_val /etc/vconsole.conf UNICODE 1 rd.vconsole.font.unicode UNICODE vconsole.unicode -+inst_key_val /etc/vconsole.conf EXT_KEYMAP '' rd.vconsole.keymap.ext EXT_KEYMAP - --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 -+inst_key_val /etc/locale.conf LANG '' rd.locale.LANG LANG -+inst_key_val /etc/locale.conf LC_ALL '' rd.locale.LC_ALL LC_ALL - - if [ -f /etc/locale.conf ]; then - . /etc/locale.conf diff --git a/0045-95dasd-Install-kernel-modules-only-once.patch b/0045-95dasd-Install-kernel-modules-only-once.patch deleted file mode 100644 index a76af4c..0000000 --- a/0045-95dasd-Install-kernel-modules-only-once.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 690905cea07bdf1783c86522927efb5fd9b5a299 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:42 +0100 -Subject: [PATCH] 95dasd: Install kernel modules only once - -Move kernel module selection to 95dasd_mod and make 95dasd depend -on that module. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/95dasd/module-setup.sh | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh -index 861df29..16207bc 100755 ---- a/modules.d/95dasd/module-setup.sh -+++ b/modules.d/95dasd/module-setup.sh -@@ -11,15 +11,11 @@ check() { - - # called by dracut - depends() { -+ echo "dasd_mod" - 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/0046-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch b/0046-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch deleted file mode 100644 index dc80a3f..0000000 --- a/0046-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 07cacb245547066c7b6a335509a0ed77ad227372 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:43 +0100 -Subject: [PATCH] 95dasd: Only install module if normalize_dasd_arg is present - -normalize_dasd_arg is a RedHat specific script, so no point -installing this module if the script isn't present. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/95dasd/module-setup.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh -index 16207bc..9c93d40 100755 ---- a/modules.d/95dasd/module-setup.sh -+++ b/modules.d/95dasd/module-setup.sh -@@ -5,6 +5,7 @@ - # called by dracut - check() { - local _arch=$(uname -m) -+ [ -x /sbin/normalize_dasd_arg ] || return 1 - [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 - return 0 - } diff --git a/0047-95dasd_mod-make-dasd_cio_free-optional.patch b/0047-95dasd_mod-make-dasd_cio_free-optional.patch deleted file mode 100644 index 76c90a5..0000000 --- a/0047-95dasd_mod-make-dasd_cio_free-optional.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8b2b77e460663b3fe45e0eea2f4a5babe4b731bc Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:44 +0100 -Subject: [PATCH] 95dasd_mod: make dasd_cio_free optional - -dasd_cio_free is a RedHat-specific tool, so make it optional. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/95dasd_mod/module-setup.sh | 3 ++- - modules.d/95dasd_mod/parse-dasd-mod.sh | 4 +++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh -index 011010d..8fde525 100755 ---- a/modules.d/95dasd_mod/module-setup.sh -+++ b/modules.d/95dasd_mod/module-setup.sh -@@ -23,6 +23,7 @@ installkernel() { - # called by dracut - install() { - inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh" -- inst_multiple dasd_cio_free grep sed seq -+ inst_multiple grep sed seq -+ inst_multiple -o dasd_cio_free - } - -diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh -index 87c88ed..0236d12 100755 ---- a/modules.d/95dasd_mod/parse-dasd-mod.sh -+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh -@@ -15,4 +15,6 @@ if [ -n "$mod_args" ]; then - fi - - unset dasd_arg --dasd_cio_free -+if [ -x /sbin/dasd_cio_free ] ; then -+ dasd_cio_free -+fi diff --git a/0048-95zfcp-Make-installation-optional.patch b/0048-95zfcp-Make-installation-optional.patch deleted file mode 100644 index 0db3410..0000000 --- a/0048-95zfcp-Make-installation-optional.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 61c0665dad633fdd2358a1a2ce5d25d282673c1a Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:45 +0100 -Subject: [PATCH] 95zfcp: Make installation optional - -zfcp_cio_free is a RedHat-specific tool, so do not install this -module if the program isn't present. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/95zfcp/module-setup.sh | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/modules.d/95zfcp/module-setup.sh b/modules.d/95zfcp/module-setup.sh -index 5d9b506..dfbeed5 100755 ---- a/modules.d/95zfcp/module-setup.sh -+++ b/modules.d/95zfcp/module-setup.sh -@@ -5,6 +5,7 @@ - # called by dracut - check() { - arch=$(uname -m) -+ [ -x /sbin/zfcp_cio_free ] || return 1 - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 - - return 0 -@@ -12,9 +13,6 @@ check() { - - # called by dracut - depends() { -- arch=$(uname -m) -- [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -- - return 0 - } - diff --git a/0049-95znet-Make-installation-optional.patch b/0049-95znet-Make-installation-optional.patch deleted file mode 100644 index 52e74f1..0000000 --- a/0049-95znet-Make-installation-optional.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dda7ae7dcdde7f9a00bbaebc7df7fbd7ed2f8ff0 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:46 +0100 -Subject: [PATCH] 95znet: Make installation optional - -znet_cio_free is a RedHat-specific tool, so do not install this -module on systems where the program is missing. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/95znet/module-setup.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/95znet/module-setup.sh b/modules.d/95znet/module-setup.sh -index 4c211a9..5012b77 100755 ---- a/modules.d/95znet/module-setup.sh -+++ b/modules.d/95znet/module-setup.sh -@@ -5,6 +5,7 @@ - # called by dracut - check() { - arch=$(uname -m) -+ [ -z /sbin/znet_cio_free ] || return 1 - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 - - return 0 diff --git a/0050-Add-DASD-configuration-for-SuSE.patch b/0050-Add-DASD-configuration-for-SuSE.patch deleted file mode 100644 index dbd7f99..0000000 --- a/0050-Add-DASD-configuration-for-SuSE.patch +++ /dev/null @@ -1,152 +0,0 @@ -From bfa1db78cdcf6aaea09da560b578426fe663a05e Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:47 +0100 -Subject: [PATCH] Add DASD configuration for SuSE - -On SuSE the DASD configuration is kept in udev rules, one rule -file per device. So add a new module for copying and creating -these rules during boot. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - dracut-functions.sh | 28 +++++++++++++++++ - modules.d/95dasd_rules/module-setup.sh | 27 ++++++++++++++++ - modules.d/95dasd_rules/parse-dasd.sh | 56 ++++++++++++++++++++++++++++++++++ - 3 files changed, 111 insertions(+) - create mode 100755 modules.d/95dasd_rules/module-setup.sh - create mode 100755 modules.d/95dasd_rules/parse-dasd.sh - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 04f4fea..7cfa097 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -899,6 +899,34 @@ inst_rules() { - done - } - -+inst_rules_wildcard() { -+ local _target=/etc/udev/rules.d _rule _found -+ -+ inst_dir "${udevdir}/rules.d" -+ inst_dir "$_target" -+ for _rule in ${udevdir}/rules.d/$1 ${dracutbasedir}/rules.d/$1 ; do -+ if [[ -e $_rule ]]; then -+ inst_rule_programs "$_rule" -+ inst_rule_group_owner "$_rule" -+ inst_rule_initqueue "$_rule" -+ inst_simple "$_rule" -+ _found=$_rule -+ fi -+ done -+ if [ -n ${hostonly} ] ; then -+ for _rule in ${_target}/$1 ; do -+ if [[ -f $_rule ]]; then -+ inst_rule_programs "$_rule" -+ inst_rule_group_owner "$_rule" -+ inst_rule_initqueue "$_rule" -+ inst_simple "$_rule" -+ _found=$_rule -+ fi -+ done -+ fi -+ [[ $_found ]] || dinfo "Skipping udev rule: $_rule" -+} -+ - prepare_udev_rules() { - [ -z "$UDEVVERSION" ] && export UDEVVERSION=$(udevadm --version) - -diff --git a/modules.d/95dasd_rules/module-setup.sh b/modules.d/95dasd_rules/module-setup.sh -new file mode 100755 -index 0000000..d313171 ---- /dev/null -+++ b/modules.d/95dasd_rules/module-setup.sh -@@ -0,0 +1,27 @@ -+#!/bin/bash -+# -*- 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) -+ [ -x /sbin/dasd_configure ] || return 1 -+ [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 -+ return 0 -+} -+ -+# called by dracut -+depends() { -+ echo 'dasd_mod' -+ return 0 -+} -+ -+# called by dracut -+install() { -+ inst_multiple /usr/lib/udev/collect -+ inst_hook cmdline 30 "$moddir/parse-dasd.sh" -+ if [[ $hostonly ]] ; then -+ inst_rules_wildcard 51-dasd-*.rules -+ fi -+ inst_rules 59-dasd.rules -+} -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -new file mode 100755 -index 0000000..9389c44 ---- /dev/null -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -0,0 +1,56 @@ -+#!/bin/sh -+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -+# ex: ts=8 sw=4 sts=4 et filetype=sh -+ -+create_udev_rule() { -+ local ccw=$1 -+ local _drv _cu_type _dev_type -+ local _rule=/etc/udev/rules.d/51-dasd-${ccw}.rules -+ -+ if [ -e /sys/bus/ccw/devices/${ccw} ] ; then -+ read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype -+ read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype -+ fi -+ case "$_cu_type" in -+ 3990/*|2105/*|2107/*|1750/*|9343/*) -+ _drv=dasd-eckd -+ ;; -+ 6310/*) -+ _drv=dasd-fba -+ ;; -+ 3880/*) -+ case "$_dev_type" in -+ 3380/*) -+ _drv=dasd_eckd -+ ;; -+ 3370/*) -+ _drv=dasd-fba -+ ;; -+ esac -+ ;; -+ esac -+ [ -z "${_drv}" ] && return 0 -+ -+ [ -e ${_rule} ] && return 0 -+ -+ cat > $_rule <<EOF -+ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw %k ${ccw} $_drv" -+ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv" -+ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1" -+EOF -+} -+ -+for dasd_arg in $(getargs root=) $(getargs resume=); do -+ ( -+ case $dasd_arg in -+ /dev/disk/by-path/ccw-*) -+ ccw_arg=${dasd_arg##*/} -+ break; -+ esac -+ if [ -n "$ccw_arg" ] ; then -+ IFS="-" -+ set -- $ccw_arg -+ create_udev_rule $2 -+ fi -+ ) -+done diff --git a/0051-Add-zfcp-scripts-for-SUSE.patch b/0051-Add-zfcp-scripts-for-SUSE.patch deleted file mode 100644 index f46307c..0000000 --- a/0051-Add-zfcp-scripts-for-SUSE.patch +++ /dev/null @@ -1,118 +0,0 @@ -From d6f0467edf3895143713eab579f48df2be140178 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:48 +0100 -Subject: [PATCH] Add zfcp scripts for SUSE - -SuSE is storing the zfcp configuration in udev files, so we should -be including these. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/95zfcp_rules/module-setup.sh | 25 +++++++++++++ - modules.d/95zfcp_rules/parse-zfcp.sh | 65 ++++++++++++++++++++++++++++++++++ - 2 files changed, 90 insertions(+) - create mode 100755 modules.d/95zfcp_rules/module-setup.sh - create mode 100755 modules.d/95zfcp_rules/parse-zfcp.sh - -diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh -new file mode 100755 -index 0000000..9a1ab20 ---- /dev/null -+++ b/modules.d/95zfcp_rules/module-setup.sh -@@ -0,0 +1,25 @@ -+#!/bin/bash -+# -*- 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) -+ [ -x /sbin/zfcp_disk_configure ] || return 1 -+ [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 -+ return 0 -+} -+ -+# called by dracut -+depends() { -+ return 0 -+} -+ -+# called by dracut -+install() { -+ inst_multiple /usr/lib/udev/collect -+ inst_hook cmdline 30 "$moddir/parse-zfcp.sh" -+ if [[ $hostonly ]] ; then -+ inst_rules_wildcard 51-zfcp-*.rules -+ fi -+} -diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh -new file mode 100755 -index 0000000..24dbdd3 ---- /dev/null -+++ b/modules.d/95zfcp_rules/parse-zfcp.sh -@@ -0,0 +1,65 @@ -+#!/bin/sh -+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -+# ex: ts=8 sw=4 sts=4 et filetype=sh -+ -+create_udev_rule() { -+ local ccw=$1 -+ local wwpn=$2 -+ local lun=$3 -+ local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules -+ -+ local _cu_type _dev_type -+ local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules -+ -+ if [ -e /sys/bus/ccw/devices/${ccw} ] ; then -+ read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype -+ read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype -+ fi -+ if [ "$_cu_type" != "1731/03" ] ; then -+ return 0; -+ fi -+ if [ "$_dev_type" != "1732/03" ] && [ "$_dev_type" != "1732/04" ] ; then -+ return 0; -+ fi -+ -+ [ -e ${_rule} ] && return 0 -+ -+ if [ ! -f "$_rule" ] ; then -+ cat > $_rule <<EOF -+ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw %k ${ccw} zfcp" -+ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="zfcp", IMPORT{program}="collect $ccw %k ${ccw} zfcp" -+ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1" -+EOF -+ fi -+ m=$(sed -n "/.*${wwpn}.*${lun}.*/p" $_rule) -+ if [ -z "$m" ] ; then -+ cat >> $_rule <<EOF -+ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun" -+EOF -+ fi -+} -+ -+for zfcp_arg in $(getargs rd.zfcp); do -+ ( -+ IFS="," -+ set $zfcp_arg -+ create_udev_rule $1 $2 $3 -+ ) -+done -+ -+for zfcp_arg in $(getargs root=) $(getargs resume=); do -+ ( -+ case $zfcp_arg in -+ /dev/disk/by-path/ccw-*) -+ ccw_arg=${zfcp_arg##*/} -+ break; -+ esac -+ if [ -n "$ccw_arg" ] ; then -+ IFS="-" -+ set -- $ccw_arg -+ wwpn=${4%:*} -+ lun=${4#*:} -+ create_udev_rule $2 $wwpn $lun -+ fi -+ ) -+done diff --git a/0052-Make-logfile-configurable.patch b/0052-Make-logfile-configurable.patch deleted file mode 100644 index 2139053..0000000 --- a/0052-Make-logfile-configurable.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ee54b8404c10e29e5bddb633a4c7becb7acb0632 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:49 +0100 -Subject: [PATCH] Make logfile configurable - -Add '--logfile' option to make the log file configurable during -runtime. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - dracut.8.asc | 6 ++++++ - dracut.sh | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/dracut.8.asc b/dracut.8.asc -index 2ea6744..d381dcf 100644 ---- a/dracut.8.asc -+++ b/dracut.8.asc -@@ -275,6 +275,12 @@ Default: - - **--sshkey** _<sshkey file>_:: ssh key file used with ssh-client module. - -+**--logfile** _<logfile>_:: logfile to use; overrides any setting from -+ the configuration files. -++ -+Default: -+ _/var/log/dracut.log_ -+ - **-l, --local**:: - activates the local mode. dracut will use modules from the current working - directory instead of the system-wide installed modules in -diff --git a/dracut.sh b/dracut.sh -index 5709874..11dcd0e 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -183,6 +183,7 @@ Creates initial ramdisk images for preloading modules - --keep Keep the temporary initramfs for debugging purposes - --printsize Print out the module install size - --sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module) -+ --logfile [FILE] Logfile to use (overrides configuration setting) - - If [LIST] has multiple arguments, then you have to put these in quotes. - -@@ -335,6 +336,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \ - --long debug \ - --long profile \ - --long sshkey: \ -+ --long logfile: \ - --long verbose \ - --long quiet \ - --long local \ -@@ -418,6 +420,7 @@ while :; do - --debug) debug="yes";; - --profile) profile="yes";; - --sshkey) sshkey="$2"; shift;; -+ --logfile) logfile_l="$2"; shift;; - -v|--verbose) ((verbosity_mod_l++));; - -q|--quiet) ((verbosity_mod_l--));; - -l|--local) -@@ -690,6 +693,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - [[ $ro_mnt_l ]] && ro_mnt="yes" - [[ $early_microcode_l ]] && early_microcode=$early_microcode_l - [[ $early_microcode ]] || early_microcode=no -+[[ $logfile_l ]] && logfile="$logfile_l" - # eliminate IFS hackery when messing with fw_dir - fw_dir=${fw_dir//:/ } - diff --git a/0053-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch b/0053-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch deleted file mode 100644 index 493903b..0000000 --- a/0053-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch +++ /dev/null @@ -1,375 +0,0 @@ -From 2b3e22d60246e7c8bfa96a6d7504fb0bfa67e641 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:50 +0100 -Subject: [PATCH] mkinitrd-suse: Add SUSE compability wrapper for dracut - -SUSE has its own mkinitrd system. As the arguments clash -with the dracut-provided mkinitrd script I've added a new -mkinitrd-suse.sh wrapper. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - mkinitrd-suse.sh | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 354 insertions(+) - create mode 100755 mkinitrd-suse.sh - -diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh -new file mode 100755 -index 0000000..d20270a ---- /dev/null -+++ b/mkinitrd-suse.sh -@@ -0,0 +1,354 @@ -+#!/bin/bash --norc -+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -+# ex: ts=8 sw=4 sts=4 et filetype=sh -+# -+# mkinitrd compability wrapper for SUSE. -+# -+# Copyright (c) 2013 SUSE Linux Products GmbH. All rights reserved. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+# -+ -+boot_dir="/boot" -+quiet=0 -+host_only=1 -+force=0 -+logfile=/var/log/YaST2/mkinitrd.log -+dracut_cmd=dracut -+ -+error() { echo "$@" >&2; } -+ -+usage () { -+ [[ $1 = '-n' ]] && cmd=echo || cmd=error -+ -+ $cmd "usage: ${0##*/} [options]" -+ $cmd "" -+ $cmd " Create initial ramdisk images that contain all kernel modules needed" -+ $cmd " in the early boot process, before the root file system becomes" -+ $cmd " available." -+ $cmd " This usually includes SCSI and/or RAID modules, a file system module" -+ $cmd " for the root file system, or a network interface driver module for dhcp." -+ $cmd "" -+ $cmd " options:" -+ $cmd " -f \"feature list\" Features to be enabled when generating initrd." -+ $cmd " Available features are:" -+ $cmd " iscsi, md, multipath, lvm, lvm2," -+ $cmd " ifup, fcoe, dcbd" -+ $cmd " -k \"kernel list\" List of kernel images for which initrd files are" -+ $cmd " created. Defaults to all kernels found in /boot." -+ $cmd " -i \"initrd list\" List of file names for the initrd; position have" -+ $cmd " match to \"kernel list\". Defaults to all kernels" -+ $cmd " found in /boot." -+ $cmd " -b boot_dir Boot directory. Defaults to /boot." -+ $cmd " -t tmp_dir Temporary directory. Defaults to /var/tmp." -+ $cmd " -M map System.map file to use." -+ $cmd " -A Create a so called \"monster initrd\" which" -+ $cmd " includes all features and modules possible." -+ $cmd " -B Do not update bootloader configuration." -+ $cmd " -v Verbose mode." -+ $cmd " -L Disable logging." -+ $cmd " -h This help screen." -+ $cmd " -m \"module list\" Modules to include in initrd. Defaults to the" -+ $cmd " INITRD_MODULES variable in /etc/sysconfig/kernel" -+ $cmd " -u \"DomU module list\" Modules to include in initrd. Defaults to the" -+ $cmd " DOMU_INITRD_MODULES variable in" -+ $cmd " /etc/sysconfig/kernel." -+ $cmd " -d root_device Root device. Defaults to the device from" -+ $cmd " which / is mounted. Overrides the rootdev" -+ $cmd " enviroment variable if set." -+ $cmd " -j device Journal device" -+ $cmd " -D interface Run dhcp on the specified interface." -+ $cmd " -I interface Configure the specified interface statically." -+ $cmd " -a acpi_dsdt Attach compiled ACPI DSDT (Differentiated" -+ $cmd " System Description Table) to initrd. This" -+ $cmd " replaces the DSDT of the BIOS. Defaults to" -+ $cmd " the ACPI_DSDT variable in /etc/sysconfig/kernel." -+ $cmd " -s size Add splash animation and bootscreen to initrd." -+ -+ [[ $1 = '-n' ]] && exit 0 -+ exit 1 -+} -+ -+# Little helper function for reading args from the commandline. -+# it automatically handles -a b and -a=b variants, and returns 1 if -+# we need to shift $3. -+read_arg() { -+ # $1 = arg name -+ # $2 = arg value -+ # $3 = arg parameter -+ param="$1" -+ local rematch='^[^=]*=(.*)$' result -+ if [[ $2 =~ $rematch ]]; then -+ read "$param" <<< "${BASH_REMATCH[1]}" -+ else -+ for ((i=3; $i <= $#; i++)); do -+ # Only read next arg if it not an arg itself. -+ if [[ ${@:$i:1} = -* ]];then -+ break -+ fi -+ result="$result ${@:$i:1}" -+ # There is no way to shift our callers args, so -+ # return "no of args" to indicate they should do it instead. -+ done -+ read "$1" <<< "$result" -+ return $(($i - 3)) -+ fi -+} -+ -+# Helper functions to calculate ipconfig command line -+calc_netmask() { -+ local prefix=$1 -+ -+ [ -z "$prefix" ] && return -+ mask=$(echo "(2 ^ 32) - (2 ^ $prefix)" | bc -l) -+ byte1=$(( mask >> 24 )) -+ byte2=$(( mask >> 16 )) -+ byte3=$(( mask >> 8 )) -+ byte4=$(( mask & 0xff )) -+ netmask=$(printf "%d.%d.%d.%d" $(( byte1 & 0xff )) $(( byte2 & 0xff )) $(( byte3 & 0xff )) $byte4); -+ -+ echo $netmask -+} -+ -+ipconfig() { -+ local interface=$1 -+ local iplink macaddr broadcast gateway ipaddr prefix netmask -+ -+ iplink=$(ip addr show dev $interface | sed -n 's/ *inet \(.*\) brd.*/\1/p') -+ macaddr=$(ip addr show dev $interface | sed -n 's/.*ether \(.*\) brd.*/\1/p') -+ broadcast=$(ip addr show dev $interface | sed -n 's/.*brd \(.*\) scope.*/\1/p') -+ gateway=$(ip route show dev $interface | sed -n 's/default via \([0-9\.]*\).*/\1/p') -+ -+ ipaddr=${iplink%%/*} -+ prefix=${iplink##*/} -+ netmask=$(calc_netmask $prefix) -+ -+ echo "${ipaddr}:${serveraddr}:${gateway}:${netmask}:${hostname}:${interface}:none::${macaddr}" -+} -+ -+is_xen_kernel() { -+ local kversion=$1 -+ local root_dir=$2 -+ local cfg -+ -+ for cfg in ${root_dir}/boot/config-$kversion $root_dir/lib/modules/$kversion/build/.config -+ do -+ test -r $cfg || continue -+ grep -q "^CONFIG_XEN=y\$" $cfg -+ return -+ done -+ test $kversion != "${kversion%-xen*}" -+ return -+} -+ -+ -+# Taken over from SUSE mkinitrd -+default_kernel_images() { -+ local regex kernel_image kernel_version version_version initrd_image -+ local qf='%{NAME}-%{VERSION}-%{RELEASE}\n' -+ -+ case "$(uname -m)" in -+ s390|s390x) -+ regex='image' -+ ;; -+ ppc|ppc64) -+ regex='vmlinux' -+ ;; -+ i386|x86_64) -+ regex='vmlinuz' -+ ;; -+ arm*) -+ regex='[uz]Image' -+ ;; -+ aarch64) -+ regex='Image' -+ ;; -+ *) regex='vmlinu.' -+ ;; -+ esac -+ -+ kernel_images="" -+ initrd_images="" -+ for kernel_image in $(ls $boot_dir \ -+ | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \ -+ | grep -v kdump$ ) ; do -+ -+ # Note that we cannot check the RPM database here -- this -+ # script is itself called from within the binary kernel -+ # packages, and rpm does not allow recursive calls. -+ -+ [ -L "$boot_dir/$kernel_image" ] && continue -+ [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue -+ kernel_version=$(/usr/bin/get_kernel_version \ -+ $boot_dir/$kernel_image 2> /dev/null) -+ initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|") -+ if [ "$kernel_image" != "$initrd_image" -a \ -+ -n "$kernel_version" -a \ -+ -d "/lib/modules/$kernel_version" ]; then -+ kernel_images="$kernel_images $boot_dir/$kernel_image" -+ initrd_images="$initrd_images $boot_dir/$initrd_image" -+ fi -+ done -+ for kernel_image in $kernel_images;do -+ kernels="$kernels ${kernel_image#*-}" -+ done -+ for initrd_image in $initrd_images;do -+ targets="$targets $initrd_image" -+ done -+ host_only=1 -+ force=1 -+} -+ -+while (($# > 0)); do -+ case ${1%%=*} in -+ -f) read_arg feature_list "$@" || shift $? -+ # Could be several features -+ ;; -+ -k) # Would be nice to get a list of images here -+ read_arg kernel_images "$@" || shift $? -+ for kernel_image in $kernel_images;do -+ kernels="$kernels ${kernel_image#*-}" -+ done -+ host_only=1 -+ force=1 -+ ;; -+ -i) read_arg initrd_images "$@" || shift $? -+ for initrd_image in $initrd_images;do -+ # Check if the initrd_image contains a path. -+ # if not, then add the default boot_dir -+ dname=`dirname $initrd_image` -+ if [ "$dname" == "." ]; then -+ targets="$targets $boot_dir/$initrd_image"; -+ else -+ targets="$targets $initrd_image"; -+ fi -+ done -+ ;; -+ -b) read_arg boot_dir "$@" || shift $? -+ if [ ! -d $boot_dir ];then -+ error "Boot directory $boot_dir does not exist" -+ exit 1 -+ fi -+ ;; -+ -t) read_arg tmp_dir "$@" || shift $? -+ dracut_args="${dracut_args} --tmpdir $tmp_dir" -+ ;; -+ -M) read_arg map_file "$@" || shift $? -+ ;; -+ -A) host_only=0;; -+ -B) skip_update_bootloader=1;; -+ -v|--verbose) dracut_args="${dracut_args} -v";; -+ -L) logfile=;; -+ -h|--help) usage -n;; -+ -m) read_arg module_list "$@" || shift $? ;; -+ -u) read_arg domu_module_list "$@" || shift $? -+ echo "mkinitrd: DomU modules not yet supported" ;; -+ -d) read_arg rootfs "$@" || shift $? -+ dracut_args="${dracut_args} --filesystems $rootfs" ;; -+ -D) read_arg dhcp_if "$@" || shift $? -+ dracut_cmdline="${dracut_cmdline} ip=${dhcp_if}:dhcp" -+ ;; -+ -I) read_arg static_if "$@" || shift $? -+ dracut_cmdline="${dracut_cmdline} ip=$(ipconfig $static_if)": -+ ;; -+ -a) read_arg acpi_dsdt "$@" || shift $? -+ echo "mkinitrd: custom DSDT not yet supported" -+ exit 1 -+ ;; -+ -s) read_arg boot_splash "$@" || shift $? -+ echo "mkinitrd: boot splash not yet supported" -+ exit 1 -+ ;; -+ -V) echo "mkinitrd: vendor scipts are no longer supported" -+ exit 1;; -+ --dracut) -+ read_arg dracut_cmd "$@" || shift $? ;; -+ --version|-R) -+ echo "mkinitrd: dracut compatibility wrapper" -+ exit 0;; -+ --force) force=1;; -+ --quiet|-q) quiet=1;; -+ *) if [[ ! $targets ]]; then -+ targets=$1 -+ elif [[ ! $kernels ]]; then -+ kernels=$1 -+ else -+ usage -+ fi;; -+ esac -+ shift -+done -+ -+[[ $targets && $kernels ]] || default_kernel_images -+[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage) -+ -+# We can have several targets/kernels, transform the list to an array -+targets=( $targets ) -+[[ $kernels ]] && kernels=( $kernels ) -+ -+[[ $logfile ]] && dracut_args="${dracut_args} --logfile $logfile" -+[[ $host_only == 1 ]] && dracut_args="${dracut_args} --hostonly" -+[[ $force == 1 ]] && dracut_args="${dracut_args} --force" -+[[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline ${dracut_cmdline}" -+[ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1 -+ -+# Update defaults from /etc/sysconfig/kernel -+if [ -f /etc/sysconfig/kernel ] ; then -+ . /etc/sysconfig/kernel -+fi -+[[ $module_list ]] || module_list="${INITRD_MODULES}" -+basicmodules="$basicmodules ${module_list}" -+[[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}" -+[[ $acpi_dsdt ]] || acpi_dsdt="${ACPI_DSDT}" -+ -+echo "Creating: target|kernel|dracut args|basicmodules " -+for ((i=0 ; $i<${#targets[@]} ; i++)); do -+ -+ if [[ $img_vers ]];then -+ target="${targets[$i]}-${kernels[$i]}" -+ else -+ target="${targets[$i]}" -+ fi -+ kernel="${kernels[$i]}" -+ -+ # Duplicate code: No way found how to redirect output based on $quiet -+ if [[ $quiet == 1 ]];then -+ echo "$target|$kernel|$dracut_args|$basicmodules" -+ if is_xen_kernel $kernel $rootfs ; then -+ basicmodules="$basicmodules ${domu_module_list}" -+ fi -+ if [[ $basicmodules ]]; then -+ $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ -+ "$kernel" &>/dev/null -+ else -+ $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null -+ fi -+ else -+ if is_xen_kernel $kernel $rootfs ; then -+ basicmodules="$basicmodules ${domu_module_list}" -+ fi -+ if [[ $basicmodules ]]; then -+ $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ -+ "$kernel" -+ else -+ $dracut_cmd $dracut_args "$target" "$kernel" -+ fi -+ fi -+done -+ -+if [ "$skip_update_bootloader" ] ; then -+ echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually." -+else -+ update-bootloader --refresh -+fi diff --git a/0054-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch b/0054-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch deleted file mode 100644 index 08be0db..0000000 --- a/0054-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 463e13fe8144376a95bf437b64c16bec056a9855 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:51 +0100 -Subject: [PATCH] mkinitrd-suse.8.asc: Add manpage for SUSE compat mkinitrd - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - Makefile | 1 + - mkinitrd-suse.8.asc | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 107 insertions(+) - create mode 100644 mkinitrd-suse.8.asc - -diff --git a/Makefile b/Makefile -index e7da948..ba551cf 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,6 +27,7 @@ man7pages = dracut.cmdline.7 \ - man8pages = dracut.8 \ - dracut-catimages.8 \ - mkinitrd.8 \ -+ mkinitrd-suse.8 \ - modules.d/98systemd/dracut-cmdline.service.8 \ - modules.d/98systemd/dracut-initqueue.service.8 \ - modules.d/98systemd/dracut-mount.service.8 \ -diff --git a/mkinitrd-suse.8.asc b/mkinitrd-suse.8.asc -new file mode 100644 -index 0000000..9eb8fc9 ---- /dev/null -+++ b/mkinitrd-suse.8.asc -@@ -0,0 +1,106 @@ -+MKINITRD(8) -+=========== -+:doctype: manpage -+:man source: dracut -+:man manual: dracut -+ -+NAME -+---- -+mkinitrd-suse - is a compat wrapper, which calls dracut to generate an initramfs -+ -+SYNOPSIS -+-------- -+*mkinitrd* ['OPTION...'] -+ -+DESCRIPTION -+----------- -+*mkinitrd* creates an initramfs image <initrd-image> for the kernel with -+version <kernel-version> by calling *dracut*. -+ -+[IMPORTANT] -+This version of mkinitrd is provided for compability with older -+versions of mkinitrd. If a more fine grained control over the -+resulting image is needed, *dracut* should be called directly. -+ -+OPTIONS -+------- -+**-R, --version**:: -+ print info about the version -+ -+**-k** _<kernel_list>_:: -+ List of kernel images for which initrd files are created (relative -+ to _boot_dir_), defaults to _vmlinux_ on ppc/ppc64, _image_ on s390/s390x -+ and _vmlinuz_ for everything else. -+ -+**-i** _<initrd_list>_:: -+ List of file names (relative to _boot_dir_) for the initrd; positions -+ have to match the _kernel_list_. Defaults to _initrd_. -+ -+**-m** _<module_list>_:: -+ Modules to include in initrd, defaults to _INITRD_MODULES_ variable -+ in */etc/sysconfig/kernel*. -+ -+**-f** _<feature_list>_:: -+ Features to be enabled for the initrd. In general mkinitrd -+ configures the initrd for the root device it is started from. With -+ this option additional feature can be enabled. -+ -+**-b** _<bootdir>_:: -+ Boot directory, defaults to */boot*, where the initrd is created. -+ -+**-d** _<root_device>_:: -+ Root device, defaults to the device from which the root_dir is -+ mounted; overwrites the rootdev enviroment variable if set -+ -+**-s** _<size>_:: -+ Add splash animation and bootscreen to initrd. -+ -+**-D** _<interface>:: -+ Run dhcp on the specified interface (for example "eth0"). -+ -+**-I** _<interface>:: -+ Configure the specified interface statically. -+ -+**-a** _<acpi_dsdt>:: -+ Attach compiled ACPI DSDT (Differentiated System Description Table) -+ to initrd. This replaces the DSDT of the BIOS. Defaults to the -+ _ACPI_DSDT_ variable in */etc/sysconfig/kernel*. -+ -+**-M** _<map>:: -+ System.map file to use. -+ -+**-B**:: -+ Don’t run the *update-bootloader(8)* script after the initrd(s) have -+ been created. This is useful if you call mkinitrd(8) for anything -+ else than the running system. -+ -+**-A**:: -+ Create a so called "monster initrd" which includes all available -+ features and modules. -+ -+**-v, --verbose**:: -+ increase verbosity level -+ -+**-L**:: -+ Disable logging to _/var/log/YaST2/mkinitrd.log_. This is useful for -+ testing if you don’t want to clutter the system log. -+ -+**--force**:: -+ overwrite existing initramfs file. -+ -+**--help**:: -+ print a help message and exit. -+ -+AVAILABILITY -+------------ -+The mkinitrd command is part of the dracut package and is available from -+link:$$https://dracut.wiki.kernel.org$$[https://dracut.wiki.kernel.org] -+ -+AUTHORS -+------- -+Harald Hoyer, Hannes Reinecke -+ -+SEE ALSO -+-------- -+*dracut*(8) -+*update-bootloader*(8) diff --git a/0055-Fixup-keymap-setting-for-openSUSE.patch b/0055-Fixup-keymap-setting-for-openSUSE.patch deleted file mode 100644 index ec3953d..0000000 --- a/0055-Fixup-keymap-setting-for-openSUSE.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1d3496b4c1ef229a8e6969e530b49dedb865f409 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:52 +0100 -Subject: [PATCH] Fixup keymap setting for openSUSE - -openSUSE is using compressed keymaps. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/10i18n/module-setup.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index 0741c64..f07b148 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh -@@ -161,6 +161,9 @@ install() { - # Gentoo user may have KEYMAP set to something like "-u pl2", - KEYMAP=${KEYMAP#-* } - -+ # openSUSE user may have KEYMAP set to something like ".gz" -+ KEYMAP=${KEYMAP/.gz/} -+ - # KEYTABLE is a bit special - it defines base keymap name and UNICODE - # determines whether non-UNICODE or UNICODE version is used - diff --git a/0056-Fixup-script-permissions.patch b/0056-Fixup-script-permissions.patch deleted file mode 100644 index 729e574..0000000 --- a/0056-Fixup-script-permissions.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1c89fd148d361a43b1ddb7ec1e8068849244a9b7 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:53 +0100 -Subject: [PATCH] Fixup script permissions - -Scripts with a shebang should be marked as executable. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/03modsign/load-modsign-keys.sh | 0 - modules.d/03modsign/module-setup.sh | 0 - modules.d/40network/net-lib.sh | 0 - modules.d/40network/parse-vlan.sh | 0 - modules.d/50drm/module-setup.sh | 0 - modules.d/91crypt-loop/crypt-loop-lib.sh | 0 - modules.d/98pollcdrom/pollcdrom.sh | 0 - 7 files changed, 0 insertions(+), 0 deletions(-) - mode change 100644 => 100755 modules.d/03modsign/load-modsign-keys.sh - mode change 100644 => 100755 modules.d/03modsign/module-setup.sh - mode change 100644 => 100755 modules.d/40network/net-lib.sh - mode change 100644 => 100755 modules.d/40network/parse-vlan.sh - mode change 100644 => 100755 modules.d/50drm/module-setup.sh - mode change 100644 => 100755 modules.d/91crypt-loop/crypt-loop-lib.sh - mode change 100644 => 100755 modules.d/98pollcdrom/pollcdrom.sh - -diff --git a/modules.d/03modsign/load-modsign-keys.sh b/modules.d/03modsign/load-modsign-keys.sh -old mode 100644 -new mode 100755 -diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh -old mode 100644 -new mode 100755 -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -old mode 100644 -new mode 100755 -diff --git a/modules.d/40network/parse-vlan.sh b/modules.d/40network/parse-vlan.sh -old mode 100644 -new mode 100755 -diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh -old mode 100644 -new mode 100755 -diff --git a/modules.d/91crypt-loop/crypt-loop-lib.sh b/modules.d/91crypt-loop/crypt-loop-lib.sh -old mode 100644 -new mode 100755 -diff --git a/modules.d/98pollcdrom/pollcdrom.sh b/modules.d/98pollcdrom/pollcdrom.sh -old mode 100644 -new mode 100755 diff --git a/0057-Remove-shebang-from-shell-completion-files.patch b/0057-Remove-shebang-from-shell-completion-files.patch deleted file mode 100644 index b59c7e9..0000000 --- a/0057-Remove-shebang-from-shell-completion-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 336bd09d2cf9d3ded4abb828eb54742218a32b04 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Fri, 29 Nov 2013 13:13:54 +0100 -Subject: [PATCH] Remove shebang from shell-completion files - -Shell-completion files are meant to be sourced, not executed. -So they shouldn't have a shebang at the start. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - dracut-bash-completion.sh | 2 +- - lsinitrd-bash-completion.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh -index d796c35..9f359c6 100644 ---- a/dracut-bash-completion.sh -+++ b/dracut-bash-completion.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+# - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - # -diff --git a/lsinitrd-bash-completion.sh b/lsinitrd-bash-completion.sh -index 78ab165..3df2965 100644 ---- a/lsinitrd-bash-completion.sh -+++ b/lsinitrd-bash-completion.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+# - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - # diff --git a/0058-lvm-install-thin-tools-only-when-needed-in-hostonly.patch b/0058-lvm-install-thin-tools-only-when-needed-in-hostonly.patch deleted file mode 100644 index b457909..0000000 --- a/0058-lvm-install-thin-tools-only-when-needed-in-hostonly.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c21c4dc2b469107ac35d8c1157f245965fd55292 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 15:57:42 +0100 -Subject: [PATCH] lvm: install thin tools, only when needed in hostonly - ---- - modules.d/90lvm/module-setup.sh | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index a220a55..1206310 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -97,6 +97,11 @@ install() { - - inst_libdir_file "libdevmapper-event-lvm*.so" - -- inst_multiple -o thin_dump thin_restore thin_check thin_repair -+ if [[ $hostonly ]] && type -P lvs &>/dev/null; then -+ for dev in "${!host_fs_types[@]}"; do -+ if [[ "$(lvs --noheadings -o segtype "$dev" 2>/dev/null)" == *thin* ]] ; then -+ inst_multiple -o thin_dump thin_restore thin_check thin_repair -+ fi -+ done -+ fi - } -- diff --git a/0059-i18n-introduce-i18n_install_all-to-install-everythin.patch b/0059-i18n-introduce-i18n_install_all-to-install-everythin.patch deleted file mode 100644 index bd6562d..0000000 --- a/0059-i18n-introduce-i18n_install_all-to-install-everythin.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 45845cb6a5f1100fa4163e25c0681afceb838b64 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 16:42:05 +0100 -Subject: [PATCH] i18n: introduce i18n_install_all, to install everything - -if i18n_install_all is set to "yes", then install all keyboard layouts -and fonts regardless of the hostonly setting. - -This way, people can switch keyboard layouts, without having to recreate -the initramfs. ---- - dracut.conf.5.asc | 14 ++++++++++++-- - dracut.conf.d/fedora.conf.example | 1 + - modules.d/10i18n/module-setup.sh | 31 +++++++++++++++++-------------- - 3 files changed, 30 insertions(+), 16 deletions(-) - -diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index c9c854a..30b7e03 100644 ---- a/dracut.conf.5.asc -+++ b/dracut.conf.5.asc -@@ -122,10 +122,10 @@ If chrooted to another root other than the real root device, use --fstab and pro - *kernel_only=*"__{yes|no}__":: - Only install kernel drivers and firmware files. (default=no) - --*no_kernel=*"{yes|no}":: -+*no_kernel=*"__{yes|no}__":: - Do not install kernel drivers and firmware files (default=no) - --*acpi_override=*"{yes|no}":: -+*acpi_override=*"__{yes|no}__":: - [WARNING] ONLY USE THIS IF YOU KNOW WHAT YOU ARE DOING! + - Override BIOS provided ACPI tables. For further documentation read - Documentation/acpi/initrd_table_override.txt in the kernel sources. -@@ -158,6 +158,16 @@ If chrooted to another root other than the real root device, use --fstab and pro - *show_modules=*"__{yes|no}__":: - Print the name of the included modules to standard output during build. - -+*i18n_vars="__<variable mapping>__":: -+ Distribution specific variable mapping. -+ See dracut/modules.d/10i18n/README for a detailed description. -+ -+*i18n_default_font=*"__<fontname>__":: -+ The font <fontname> to install, if not specified otherwise. Default is "LatArCyrHeb-16". -+ -+*i18n_install_all=*"__{yes|no}__":: -+ Install everything regardless of generic or hostonly mode. -+ - Files - ----- - _/etc/dracut.conf_:: -diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example -index 1a56a86..495e8fb 100644 ---- a/dracut.conf.d/fedora.conf.example -+++ b/dracut.conf.d/fedora.conf.example -@@ -3,6 +3,7 @@ - # i18n - i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP" - i18n_default_font="latarcyrheb-sun16" -+i18n_install_all="yes" - stdloglvl=3 - sysloglvl=5 - install_items+=" vi /etc/virc ps grep cat rm " -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index f07b148..fcb18d1 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh -@@ -21,15 +21,11 @@ depends() { - # called by dracut - install() { - if dracut_module_included "systemd"; then -- [[ -f /etc/vconsole.conf ]] || return 0 - unset FONT - unset KEYMAP -- . /etc/vconsole.conf -- # if vconsole.conf has no settings, do not include anything -- [[ $FONT ]] || [[ $KEYMAP ]] || return 0 -+ [[ -f /etc/vconsole.conf ]] && . /etc/vconsole.conf - fi - -- inst_multiple -o $systemdutildir/systemd-vconsole-setup - KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps - DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}" - I18N_CONF="/etc/locale.conf" -@@ -213,10 +209,20 @@ install() { - inst_simple ${kbddir}/unimaps/${FONT_UNIMAP}.uni - fi - -- mksubdirs ${initdir}${I18N_CONF} -- mksubdirs ${initdir}${VCONFIG_CONF} -- print_vars LC_ALL LANG >> ${initdir}${I18N_CONF} -- print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF} -+ if dracut_module_included "systemd" && [[ -f ${I18N_CONF} ]]; then -+ inst_simple ${I18N_CONF} -+ else -+ mksubdirs ${initdir}${I18N_CONF} -+ print_vars LC_ALL LANG >> ${initdir}${I18N_CONF} -+ fi -+ -+ if dracut_module_included "systemd" && [[ -f ${VCONFIG_CONF} ]]; then -+ inst_simple ${VCONFIG_CONF} -+ else -+ mksubdirs ${initdir}${VCONFIG_CONF} -+ print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF} -+ fi -+ - return 0 - } - -@@ -240,16 +246,13 @@ install() { - return 0 - } - -- if checks -- then -+ if checks; then - install_base - -- if [[ ${hostonly} ]] -- then -+ if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} ]]; then - install_local_i18n || install_all_kbd - else - install_all_kbd - fi - fi - } -- diff --git a/0060-dracut.spec-add-new-modules.patch b/0060-dracut.spec-add-new-modules.patch deleted file mode 100644 index 0088720..0000000 --- a/0060-dracut.spec-add-new-modules.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 57575f3c9c5323887b1aec7f04d1467ba1e5fb1b Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 17:27:57 +0100 -Subject: [PATCH] dracut.spec: add new modules - ---- - dracut.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dracut.spec b/dracut.spec -index 44171d8..91ec15d 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -350,8 +350,10 @@ rm -rf -- $RPM_BUILD_ROOT - %{dracutlibdir}/modules.d/95rootfs-block - %{dracutlibdir}/modules.d/95dasd - %{dracutlibdir}/modules.d/95dasd_mod -+%{dracutlibdir}/modules.d/95dasd_rules - %{dracutlibdir}/modules.d/95fstab-sys - %{dracutlibdir}/modules.d/95zfcp -+%{dracutlibdir}/modules.d/95zfcp_rules - %{dracutlibdir}/modules.d/95terminfo - %{dracutlibdir}/modules.d/95udev-rules - %{dracutlibdir}/modules.d/95virtfs diff --git a/0061-dracut.spec-remove-suse-man-pages.patch b/0061-dracut.spec-remove-suse-man-pages.patch deleted file mode 100644 index 91ece10..0000000 --- a/0061-dracut.spec-remove-suse-man-pages.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 11ee2ca8d497980c98c3c5a2c3be25b4724c43a0 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 17:31:09 +0100 -Subject: [PATCH] dracut.spec: remove suse man pages - ---- - dracut.spec | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/dracut.spec b/dracut.spec -index 91ec15d..bd35aa7 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -246,15 +246,18 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log - touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log - mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs - --%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} -+%if 0%{?fedora} || 0%{?rhel} - install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf --install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf -+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse* - %endif -- - %if 0%{?suse_version} - install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf - %endif - -+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} -+install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf -+%endif -+ - %if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999 - rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd - rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd diff --git a/0062-TODO-update.patch b/0062-TODO-update.patch deleted file mode 100644 index 319d282..0000000 --- a/0062-TODO-update.patch +++ /dev/null @@ -1,21 +0,0 @@ -From ce052202f0cdb673536999a7d7810bd3a3a2aaca Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 18:38:23 +0100 -Subject: [PATCH] TODO: update - ---- - TODO | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/TODO b/TODO -index 4e52fbf..875541d 100644 ---- a/TODO -+++ b/TODO -@@ -22,6 +22,7 @@ INITRAMFS TODO - - GENERATOR TODO - -+- report errors on missing files in check() - - remove wait for swap devs, if no "resume=" is given on the kernel command line - - add presets (predefined set of modules) - - add interpreter/plugin-scripts to be sourced at the beginning or end (can use dracut-functions) diff --git a/0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch b/0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch deleted file mode 100644 index 1b4c841..0000000 --- a/0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3934ca8e6c0e80ecb32a2ed9403321afd510842e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Dec 2013 18:38:35 +0100 -Subject: [PATCH] systemd/dracut-initqueue.sh: fixed waiting in the loop if PW - asked - -continue the main loop instead of the for loop, if a password is -currently asked ---- - modules.d/98systemd/dracut-initqueue.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index 64e8154..1e05dcd 100755 ---- a/modules.d/98systemd/dracut-initqueue.sh -+++ b/modules.d/98systemd/dracut-initqueue.sh -@@ -53,7 +53,7 @@ while :; do - sleep 0.5 - - for i in /run/systemd/ask-password/ask.*; do -- [ -e "$i" ] && continue -+ [ -e "$i" ] && continue 2 - done - - if [ $main_loop -gt $((2*$RDRETRY/3)) ]; then diff --git a/0064-base-rdsosreport.sh-add-ip-a-output.patch b/0064-base-rdsosreport.sh-add-ip-a-output.patch deleted file mode 100644 index e1fef23..0000000 --- a/0064-base-rdsosreport.sh-add-ip-a-output.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f11712ea2189e01004115702a3756b70122c3b05 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Tue, 10 Dec 2013 12:58:37 +0100 -Subject: [PATCH] base/rdsosreport.sh: add "ip a" output - ---- - modules.d/99base/rdsosreport.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules.d/99base/rdsosreport.sh b/modules.d/99base/rdsosreport.sh -index bfa55bb..5e11166 100755 ---- a/modules.d/99base/rdsosreport.sh -+++ b/modules.d/99base/rdsosreport.sh -@@ -42,6 +42,8 @@ command -v dmsetup >/dev/null 2>/dev/null && dmsetup ls --tree - - cat /proc/mdstat - -+command -v ip >/dev/null 2>/dev/null && ip addr -+ - if command -v journalctl >/dev/null 2>/dev/null; then - journalctl -ab --no-pager -o short-monotonic - else diff --git a/0065-usrmount-always-install.patch b/0065-usrmount-always-install.patch deleted file mode 100644 index 6a9877a..0000000 --- a/0065-usrmount-always-install.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ded4c82acedb373ed4393b69a9683c6bee38ff48 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Thu, 21 Nov 2013 20:33:38 +0400 -Subject: [PATCH] usrmount: always install - -/usr should be mounted by initramfs even if /sbin/init lives in / ---- - modules.d/98usrmount/module-setup.sh | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh -index d8a0ec2..31a6229 100755 ---- a/modules.d/98usrmount/module-setup.sh -+++ b/modules.d/98usrmount/module-setup.sh -@@ -4,10 +4,7 @@ - - # called by dracut - check() { -- local _init - [[ $mount_needs ]] && return 1 -- _init=$(readlink -f /sbin/init) -- [[ "$_init" == "${_init##/usr}" ]] && return 255 - return 0 - } - diff --git a/0066-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch b/0066-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch deleted file mode 100644 index b1279de..0000000 --- a/0066-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ab173bb4c1c758d2f87d11b03efca6b6c950225e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 12 Dec 2013 09:20:53 +0100 -Subject: [PATCH] fcoe: move uefi parsing to fcoe-uefi module - ---- - modules.d/95fcoe-uefi/module-setup.sh | 22 ++++++++++++++++++++++ - .../{95fcoe => 95fcoe-uefi}/parse-uefifcoe.sh | 0 - modules.d/95fcoe/module-setup.sh | 1 - - 3 files changed, 22 insertions(+), 1 deletion(-) - create mode 100755 modules.d/95fcoe-uefi/module-setup.sh - rename modules.d/{95fcoe => 95fcoe-uefi}/parse-uefifcoe.sh (100%) - -diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -new file mode 100755 -index 0000000..007aa59 ---- /dev/null -+++ b/modules.d/95fcoe-uefi/module-setup.sh -@@ -0,0 +1,22 @@ -+#!/bin/bash -+# -*- 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 ]] && return 1 -+ -+ return 0 -+} -+ -+# called by dracut -+depends() { -+ echo fcoe bash -+ return 0 -+} -+ -+# called by dracut -+install() { -+ inst_hook cmdline 20 "$moddir/parse-uefifcoe.sh" -+} -+ -diff --git a/modules.d/95fcoe/parse-uefifcoe.sh b/modules.d/95fcoe-uefi/parse-uefifcoe.sh -similarity index 100% -rename from modules.d/95fcoe/parse-uefifcoe.sh -rename to modules.d/95fcoe-uefi/parse-uefifcoe.sh -diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 7ada2ee..2605fa0 100755 ---- a/modules.d/95fcoe/module-setup.sh -+++ b/modules.d/95fcoe/module-setup.sh -@@ -36,7 +36,6 @@ install() { - inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up" - inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd" - inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh" -- inst_hook cmdline 20 "$moddir/parse-uefifcoe.sh" - inst_hook cmdline 99 "$moddir/parse-fcoe.sh" - dracut_need_initqueue - } diff --git a/0067-move-uefi-lib-to-a-seperate-module.patch b/0067-move-uefi-lib-to-a-seperate-module.patch deleted file mode 100644 index 43df02c..0000000 --- a/0067-move-uefi-lib-to-a-seperate-module.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 89031be3735045ae06d560bf4f42ec58d889fe8e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 12 Dec 2013 09:49:06 +0100 -Subject: [PATCH] move uefi-lib to a seperate module - ---- - modules.d/95fcoe-uefi/module-setup.sh | 4 +--- - modules.d/95fcoe/module-setup.sh | 5 ----- - modules.d/99base/module-setup.sh | 1 - - modules.d/99uefi-lib/module-setup.sh | 19 +++++++++++++++++++ - modules.d/{99base => 99uefi-lib}/uefi-lib.sh | 0 - 5 files changed, 20 insertions(+), 9 deletions(-) - create mode 100755 modules.d/99uefi-lib/module-setup.sh - rename modules.d/{99base => 99uefi-lib}/uefi-lib.sh (100%) - -diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index 007aa59..653d88e 100755 ---- a/modules.d/95fcoe-uefi/module-setup.sh -+++ b/modules.d/95fcoe-uefi/module-setup.sh -@@ -4,14 +4,12 @@ - - # called by dracut - check() { -- [[ $hostonly ]] || [[ $mount_needs ]] && return 1 -- - return 0 - } - - # called by dracut - depends() { -- echo fcoe bash -+ echo fcoe uefi-lib - return 0 - } - -diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 2605fa0..539c464 100755 ---- a/modules.d/95fcoe/module-setup.sh -+++ b/modules.d/95fcoe/module-setup.sh -@@ -4,11 +4,6 @@ - - # called by dracut - check() { -- # FIXME -- # If hostonly was requested, fail the check until we have some way of -- # knowing we are booting from FCoE -- [[ $hostonly ]] || [[ $mount_needs ]] && return 1 -- - for i in dcbtool fipvlan lldpad ip readlink; do - type -P $i >/dev/null || return 1 - done -diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index e53cf2e..d4dbca9 100755 ---- a/modules.d/99base/module-setup.sh -+++ b/modules.d/99base/module-setup.sh -@@ -45,7 +45,6 @@ install() { - mkdir -p ${initdir}/tmp - - inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh" -- inst_simple "$moddir/uefi-lib.sh" "/lib/uefi-lib.sh" - - if ! dracut_module_included "systemd"; then - inst_multiple switch_root || dfatal "Failed to install switch_root" -diff --git a/modules.d/99uefi-lib/module-setup.sh b/modules.d/99uefi-lib/module-setup.sh -new file mode 100755 -index 0000000..4a856ea ---- /dev/null -+++ b/modules.d/99uefi-lib/module-setup.sh -@@ -0,0 +1,19 @@ -+#!/bin/bash -+# module-setup for img-lib -+ -+# called by dracut -+check() { -+ return 255 -+} -+ -+# called by dracut -+depends() { -+ echo bash -+ return 0 -+} -+ -+# called by dracut -+install() { -+ inst_simple "$moddir/uefi-lib.sh" "/lib/uefi-lib.sh" -+} -+ -diff --git a/modules.d/99base/uefi-lib.sh b/modules.d/99uefi-lib/uefi-lib.sh -similarity index 100% -rename from modules.d/99base/uefi-lib.sh -rename to modules.d/99uefi-lib/uefi-lib.sh diff --git a/0068-lvm-fixed-lvm-thin-check.patch b/0068-lvm-fixed-lvm-thin-check.patch deleted file mode 100644 index 1688a8a..0000000 --- a/0068-lvm-fixed-lvm-thin-check.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 831625d29ed6f174b276cd738e34bfebc5052e1c Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 13 Dec 2013 11:05:39 +0100 -Subject: [PATCH] lvm: fixed lvm thin check - ---- - modules.d/90lvm/module-setup.sh | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 1206310..a64e5d6 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -99,9 +99,16 @@ install() { - - if [[ $hostonly ]] && type -P lvs &>/dev/null; then - for dev in "${!host_fs_types[@]}"; do -- if [[ "$(lvs --noheadings -o segtype "$dev" 2>/dev/null)" == *thin* ]] ; then -+ [ -e /sys/block/${dev#/dev/}/dm/name ] || continue -+ dev=$(</sys/block/${dev#/dev/}/dm/name) -+ eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null) -+ [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || continue -+ if [[ "$(lvs --noheadings -o segtype ${DM_VG_NAME} 2>/dev/null)" == *thin* ]] ; then - inst_multiple -o thin_dump thin_restore thin_check thin_repair -+ break - fi - done -+ else -+ inst_multiple -o thin_dump thin_restore thin_check thin_repair - fi - } diff --git a/0069-resume-fixed-udev-rule-for-dev-resume-instead-of-dev.patch b/0069-resume-fixed-udev-rule-for-dev-resume-instead-of-dev.patch deleted file mode 100644 index 6b889c4..0000000 --- a/0069-resume-fixed-udev-rule-for-dev-resume-instead-of-dev.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8b69b56950c06545ee3eaa28f0256db8fd7af7d1 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 19 Dec 2013 17:09:55 +0100 -Subject: [PATCH] resume: fixed udev rule for /dev/resume instead of - /dev/dev/resume - -https://bugzilla.redhat.com/show_bug.cgi?id=1045116 ---- - modules.d/95resume/parse-resume.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh -index c84dafb..8682a03 100755 ---- a/modules.d/95resume/parse-resume.sh -+++ b/modules.d/95resume/parse-resume.sh -@@ -40,9 +40,9 @@ esac - if ! getarg noresume; then - if [ -n "$resume" ]; then - { -- printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -+ printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"resume\"\n" \ - ${resume#/dev/}; -- printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ -+ printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"resume\"\n" \ - ${resume#/dev/}; - } >> /etc/udev/rules.d/99-resume-link.rules - diff --git a/0070-resume-parse-resume.sh-fixed-printf-formatting.patch b/0070-resume-parse-resume.sh-fixed-printf-formatting.patch deleted file mode 100644 index 9660b53..0000000 --- a/0070-resume-parse-resume.sh-fixed-printf-formatting.patch +++ /dev/null @@ -1,71 +0,0 @@ -From e138679543611ace849335b36f0c9835a4b110d0 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Tue, 7 Jan 2014 14:07:14 +0100 -Subject: [PATCH] resume/parse-resume.sh: fixed printf formatting - -https://bugzilla.redhat.com/show_bug.cgi?id=1045704 ---- - modules.d/95resume/parse-resume.sh | 32 +++++++++++++++++--------------- - 1 file changed, 17 insertions(+), 15 deletions(-) - -diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh -index 8682a03..d7b2d7f 100755 ---- a/modules.d/95resume/parse-resume.sh -+++ b/modules.d/95resume/parse-resume.sh -@@ -48,39 +48,41 @@ if ! getarg noresume; then - - { - if [ -x /usr/sbin/resume ]; then -- printf -- "KERNEL==\"%s\", " "${resume#/dev/}" -- printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- 'KERNEL=="%s", ' "${resume#/dev/}" -+ printf -- '%s' 'ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",' - printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ - "$a_splash" "$resume"; -- printf -- "SYMLINK==\"%s\", " "${resume#/dev/}" -- printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -+ printf -- 'SYMLINK=="%s", ' "${resume#/dev/}" -+ printf -- '%s' 'ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",' - printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \ - "$a_splash" "$resume"; - fi -- printf -- "KERNEL==\"%s\", " ${resume#/dev/}; -- printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -- printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" -- printf -- "SYMLINK==\"%s\", " ${resume#/dev/}; -- printf -- "%s" "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -- printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" -+ -+ printf -- 'KERNEL=="%s", ' "${resume#/dev/}" -+ printf -- '%s' 'ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",' -+ printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume"' -+ -+ printf -- 'SYMLINK=="%s", ' "${resume#/dev/}" -+ printf -- '%s' 'ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",' -+ printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume"' - } >> /etc/udev/rules.d/99-resume.rules - - printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \ - "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh - - printf -- "%s" 'warn "Cancelling resume operation. Device not found.";' -- printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";' \ -+ printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' \ - "$hookdir" >> $hookdir/initqueue/timeout/resume.sh - - mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh - else - { - if [ -x /usr/sbin/resume ]; then -- printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -- printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \$tempnode\"\n" "$a_splash" -+ printf -- '%s' 'SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",' -+ printf -- ' RUN+="/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s $tempnode"\n' "$a_splash" - fi -- printf -- "%s" "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," -- printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume\""; -+ printf -- '%s' 'SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="suspend|swsuspend|swsupend",' -+ printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume"'; - } >> /etc/udev/rules.d/99-resume.rules - fi - fi diff --git a/0071-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch b/0071-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch deleted file mode 100644 index ceed7ea..0000000 --- a/0071-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f18c64839ed3417a596c1d5129c0fe11e1c37e75 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Tue, 7 Jan 2014 16:39:48 +0100 -Subject: [PATCH] systemd/dracut-initqueue.sh: fstab is not a directory - ---- - modules.d/98systemd/dracut-initqueue.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index 1e05dcd..37bc18f 100755 ---- a/modules.d/98systemd/dracut-initqueue.sh -+++ b/modules.d/98systemd/dracut-initqueue.sh -@@ -67,7 +67,7 @@ while :; do - - main_loop=$(($main_loop+1)) - if [ $main_loop -gt $RDRETRY ]; then -- if ! [ -d /sysroot/etc/fstab ] || ! [ -e /sysroot/sbin/init ] ; then -+ if ! [ -f /sysroot/etc/fstab ] || ! [ -e /sysroot/sbin/init ] ; then - action_on_fail "Could not boot." && break - fi - warn "Not all disks have been found." diff --git a/0072-dracut.sh-add-missing-piece-for-option-add-device.patch b/0072-dracut.sh-add-missing-piece-for-option-add-device.patch deleted file mode 100644 index 6e872b4..0000000 --- a/0072-dracut.sh-add-missing-piece-for-option-add-device.patch +++ /dev/null @@ -1,21 +0,0 @@ -From b50449ad7baa2f748dcc647e9a84a66b621cc5af Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 8 Jan 2014 15:37:18 +0100 -Subject: [PATCH] dracut.sh: add missing piece for option --add-device - ---- - dracut.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dracut.sh b/dracut.sh -index 11dcd0e..bae03d7 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -308,6 +308,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \ - --long add-fstab: \ - --long mount: \ - --long device: \ -+ --long add-device: \ - --long nofscks: \ - --long ro-mnt \ - --long kmoddir: \ diff --git a/0073-dracut.sh-add-boot-efi-to-device-paths.patch b/0073-dracut.sh-add-boot-efi-to-device-paths.patch deleted file mode 100644 index 9531b79..0000000 --- a/0073-dracut.sh-add-boot-efi-to-device-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3d5cdfc834d46eac57cbc7699ba646a6391b5258 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 8 Jan 2014 15:38:44 +0100 -Subject: [PATCH] dracut.sh: add /boot/efi to device paths - -Add /boot/efi to device paths, so the filesystem driver is included -and it can be repaired in the initramfs. ---- - dracut.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index bae03d7..2cfba50 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -921,7 +921,9 @@ if [[ $hostonly ]]; then - "/usr/sbin" \ - "/usr/lib" \ - "/usr/lib64" \ -- "/boot"; -+ "/boot" \ -+ "/boot/efi" \ -+ ; - do - mp=$(readlink -f "$mp") - mountpoint "$mp" >/dev/null 2>&1 || continue diff --git a/0074-kernel-modules-add-more-block-driver.patch b/0074-kernel-modules-add-more-block-driver.patch deleted file mode 100644 index cdc5a47..0000000 --- a/0074-kernel-modules-add-more-block-driver.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b9712436bb27583ec62c97f7d1e1020c3a3be77a Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 19 Dec 2013 12:37:47 +0100 -Subject: [PATCH] kernel-modules: add more block driver - -e.g. nvme ---- - modules.d/90kernel-modules/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index d65e92b..62e8c39 100755 ---- a/modules.d/90kernel-modules/module-setup.sh -+++ b/modules.d/90kernel-modules/module-setup.sh -@@ -6,7 +6,7 @@ - installkernel() { - if [[ -z $drivers ]]; then - block_module_filter() { -- local _blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect' -+ local _blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect' - # subfunctions inherit following FDs - local _merge=8 _side2=9 - function bmf1() { diff --git a/0075-network-include-usbnet-drivers.patch b/0075-network-include-usbnet-drivers.patch deleted file mode 100644 index aaeb6c9..0000000 --- a/0075-network-include-usbnet-drivers.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cdd69221e582290f1950e59ef2c37b2d853cef2a Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 19 Dec 2013 17:06:48 +0100 -Subject: [PATCH] network: include usbnet drivers - ---- - modules.d/40network/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 8a2898c..547ad16 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -26,7 +26,7 @@ installkernel() { - # Include wired net drivers, excluding wireless - - net_module_filter() { -- local _net_drivers='eth_type_trans|register_virtio_device' -+ local _net_drivers='eth_type_trans|register_virtio_device|usbnet_open' - local _unwanted_drivers='/(wireless|isdn|uwb)/' - local _ret - # subfunctions inherit following FDs diff --git a/0076-network-include-all-ethernet-drivers.patch b/0076-network-include-all-ethernet-drivers.patch deleted file mode 100644 index 8aa18b3..0000000 --- a/0076-network-include-all-ethernet-drivers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0cca6a1afbd73396951731ade0350ca37e0979a7 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 15 Jan 2014 14:35:53 +0100 -Subject: [PATCH] network: include all ethernet drivers - ---- - modules.d/40network/module-setup.sh | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 547ad16..48afc5a 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -27,7 +27,7 @@ installkernel() { - - net_module_filter() { - local _net_drivers='eth_type_trans|register_virtio_device|usbnet_open' -- local _unwanted_drivers='/(wireless|isdn|uwb)/' -+ local _unwanted_drivers='/(wireless|isdn|uwb|net/ethernet|net/phy|net/team)/' - local _ret - # subfunctions inherit following FDs - local _merge=8 _side2=9 -@@ -67,7 +67,11 @@ installkernel() { - | net_module_filter | instmods - - #instmods() will take care of hostonly -- instmods =drivers/net/phy ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net =drivers/net/team -+ instmods \ -+ =drivers/net/phy \ -+ =drivers/net/team \ -+ =drivers/net/ethernet \ -+ ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net - } - - # called by dracut diff --git a/0077-dracut-install-dracut-fix-ldd-output-parsing.patch b/0077-dracut-install-dracut-fix-ldd-output-parsing.patch deleted file mode 100644 index 00fd0ef..0000000 --- a/0077-dracut-install-dracut-fix-ldd-output-parsing.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3ecaca1fdf19c6494aaefd699977aedbfb585313 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 17 Jan 2014 11:52:43 +0100 -Subject: [PATCH] dracut-install,dracut: fix ldd output parsing - -dracut-install could not handle output like: - /lib/$LIB/liblsp.so => /lib/lib64/liblsp.so (0x00007faf00727000) - -also unset LD_PRELOAD, so we get a clean environment ---- - dracut.sh | 1 + - install/dracut-install.c | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index 2cfba50..7ae5a58 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -548,6 +548,7 @@ export LC_ALL=C - export LANG=C - unset NPATH - unset LD_LIBRARY_PATH -+unset LD_PRELOAD - unset GREP_OPTIONS - - export DRACUT_LOG_LEVEL=warning -diff --git a/install/dracut-install.c b/install/dracut-install.c -index 6b9c613..c5e4b05 100644 ---- a/install/dracut-install.c -+++ b/install/dracut-install.c -@@ -391,7 +391,11 @@ static int resolve_deps(const char *src) - if (strstr(buf, destrootdir)) - break; - -- p = strchr(buf, '/'); -+ p = strstr(buf, "=>"); -+ if (!p) -+ p = buf; -+ -+ p = strchr(p, '/'); - if (p) { - for (q = p; *q && *q != ' ' && *q != '\n'; q++) ; - *q = '\0'; diff --git a/0078-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch b/0078-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch deleted file mode 100644 index 99c8683..0000000 --- a/0078-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 22e62a46b695ca15404740455f504e4bae82dca0 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 16 Dec 2013 12:30:26 +0100 -Subject: [PATCH] dracut.spec: add 95fcoe-uefi and 99uefi-lib - ---- - dracut.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dracut.spec b/dracut.spec -index bd35aa7..6cc60e1 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -414,6 +414,8 @@ rm -rf -- $RPM_BUILD_ROOT - %{dracutlibdir}/modules.d/95ssh-client - %{dracutlibdir}/modules.d/45ifcfg - %{dracutlibdir}/modules.d/95znet -+%{dracutlibdir}/modules.d/95fcoe-uefi -+%{dracutlibdir}/modules.d/99uefi-lib - - %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} - %files fips diff --git a/0079-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch b/0079-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch deleted file mode 100644 index 78e90dc..0000000 --- a/0079-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c0a0bb3e453920cbfb409437772cee2a6f778765 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Tue, 7 Jan 2014 14:34:55 +0100 -Subject: [PATCH] fcoe-uefi: do not include, if fcoe utils not installed - ---- - modules.d/95fcoe-uefi/module-setup.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index 653d88e..c91f775 100755 ---- a/modules.d/95fcoe-uefi/module-setup.sh -+++ b/modules.d/95fcoe-uefi/module-setup.sh -@@ -4,6 +4,9 @@ - - # called by dracut - check() { -+ for i in dcbtool fipvlan lldpad ip readlink; do -+ type -P $i >/dev/null || return 1 -+ done - return 0 - } - -@@ -17,4 +20,3 @@ depends() { - install() { - inst_hook cmdline 20 "$moddir/parse-uefifcoe.sh" - } -- diff --git a/dracut.spec b/dracut.spec index 9690ccc..baa1219 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,4 +1,5 @@ %define dracutlibdir %{_prefix}/lib/dracut +%bcond_without doc # Variables must be defined %define with_nbd 1 @@ -9,8 +10,8 @@ %endif Name: dracut -Version: 034 -Release: 80.git20140122%{?dist} +Version: 037 +Release: 1%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -28,86 +29,7 @@ URL: https://dracut.wiki.kernel.org/ # Source can be generated by # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz -Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2 -Patch1: 0001-lvm-install-thin-utils-for-non-hostonly.patch -Patch2: 0002-module-setup.sh-add-comments-for-dracut-called-funct.patch -Patch3: 0003-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch -Patch4: 0004-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch -Patch5: 0005-Doc-cleanup-extend-and-split-and-reuse.patch -Patch6: 0006-dmsquash-live-add-dev-mapper-live-base.patch -Patch7: 0007-base-init.sh-also-mkdir-run-lock.patch -Patch8: 0008-resume-fix-swap-detection-in-hostonly.patch -Patch9: 0009-resume-remove-resume-genrules.sh.patch -Patch10: 0010-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch -Patch11: 0011-lvm-fix-thin-recognition.patch -Patch12: 0012-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch -Patch13: 0013-dracut.sh-no-need-to-make-subdirs-in-run.patch -Patch14: 0014-network-fcoe-only-redirect-output-to-loginit.pipe-if.patch -Patch15: 0015-mkdir-basic-dirs-in-run.patch -Patch16: 0016-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch -Patch17: 0017-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch -Patch18: 0018-lvm-always-install-thin-utils-for-lvm.patch -Patch19: 0019-usrmount-module-setup.sh-fixed-typo.patch -Patch20: 0020-Handle-crypto-modules-with-and-without-modaliases.patch -Patch21: 0021-fips-include-crct10dif_generic.patch -Patch22: 0022-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch -Patch23: 0023-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch -Patch24: 0024-dracut.sh-fixed-PATH-shortener.patch -Patch25: 0025-dracut.modules.7.asc-removed-empty-section.patch -Patch26: 0026-fips-also-install-etc-system-fips-in-the-initramfs.patch -Patch27: 0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch -Patch28: 0028-iscsi-nbd-do-not-fail-in-hostonly-mode.patch -Patch29: 0029-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch -Patch30: 0030-Run-xz-and-lzma-with-multiple-threads.patch -Patch31: 0031-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch -Patch32: 0032-lvm-do-not-run-pvscan-for-lvmetad-update.patch -Patch33: 0033-fips-fix-RHEV-vmlinuz-check.patch -Patch34: 0034-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch -Patch35: 0035-dracut.sh-_get_fs_type-if-block-device-exists-return.patch -Patch36: 0036-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch -Patch37: 0037-network-net-lib.sh-iface_has_link-fixup.patch -Patch38: 0038-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch -Patch39: 0039-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch -Patch40: 0040-resume-autoconf-resume.patch -Patch41: 0041-resume-no-more-autoresume.patch -Patch42: 0042-dracut.sh-skip-crypt-swaps-with-password-files.patch -Patch43: 0043-dracut-functions.sh-do-not-force-require-modules.bui.patch -Patch44: 0044-10i18n-parse-i18n.sh-fixed-vconsole.conf-locale.conf.patch -#Patch45: 0045-95dasd-Install-kernel-modules-only-once.patch -#Patch46: 0046-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch -#Patch47: 0047-95dasd_mod-make-dasd_cio_free-optional.patch -#Patch48: 0048-95zfcp-Make-installation-optional.patch -#Patch49: 0049-95znet-Make-installation-optional.patch -#Patch50: 0050-Add-DASD-configuration-for-SuSE.patch -#Patch51: 0051-Add-zfcp-scripts-for-SUSE.patch -#Patch52: 0052-Make-logfile-configurable.patch -#Patch53: 0053-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch -#Patch54: 0054-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch -Patch55: 0055-Fixup-keymap-setting-for-openSUSE.patch -Patch56: 0056-Fixup-script-permissions.patch -Patch57: 0057-Remove-shebang-from-shell-completion-files.patch -Patch58: 0058-lvm-install-thin-tools-only-when-needed-in-hostonly.patch -Patch59: 0059-i18n-introduce-i18n_install_all-to-install-everythin.patch -#Patch60: 0060-dracut.spec-add-new-modules.patch -#Patch61: 0061-dracut.spec-remove-suse-man-pages.patch -#Patch62: 0062-TODO-update.patch -Patch63: 0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch -Patch64: 0064-base-rdsosreport.sh-add-ip-a-output.patch -Patch65: 0065-usrmount-always-install.patch -Patch66: 0066-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch -Patch67: 0067-move-uefi-lib-to-a-seperate-module.patch -Patch68: 0068-lvm-fixed-lvm-thin-check.patch -Patch69: 0069-resume-fixed-udev-rule-for-dev-resume-instead-of-dev.patch -Patch70: 0070-resume-parse-resume.sh-fixed-printf-formatting.patch -Patch71: 0071-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch -Patch72: 0072-dracut.sh-add-missing-piece-for-option-add-device.patch -Patch73: 0073-dracut.sh-add-boot-efi-to-device-paths.patch -Patch74: 0074-kernel-modules-add-more-block-driver.patch -Patch75: 0075-network-include-usbnet-drivers.patch -Patch76: 0076-network-include-all-ethernet-drivers.patch -Patch77: 0077-dracut-install-dracut-fix-ldd-output-parsing.patch -Patch78: 0078-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch -Patch79: 0079-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch +Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz BuildRequires: bash git @@ -125,6 +47,7 @@ BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif +%if %{with doc} %if 0%{?fedora} || 0%{?rhel} BuildRequires: docbook-style-xsl docbook-dtds libxslt %endif @@ -134,6 +57,8 @@ BuildRequires: docbook-style-xsl docbook-dtds libxslt %endif BuildRequires: asciidoc +%endif + %if 0%{?fedora} > 12 || 0%{?rhel} # no "provides", because dracut does not offer @@ -283,7 +208,10 @@ git am -p1 %{patches} %endif %build -%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib +%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib \ +%if %{without doc} + --disable-documentation +%endif make %{?_smp_mflags} @@ -365,7 +293,9 @@ rm -rf -- $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) +%if %{with doc} %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg +%endif %{_bindir}/dracut # compat symlink %{_sbindir}/dracut @@ -383,12 +313,15 @@ rm -rf -- $RPM_BUILD_ROOT %{dracutlibdir}/dracut-logger.sh %{dracutlibdir}/dracut-initramfs-restore %{dracutlibdir}/dracut-install +%{dracutlibdir}/skipcpio %config(noreplace) %{_sysconfdir}/dracut.conf %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %{dracutlibdir}/dracut.conf.d/01-dist.conf %endif %dir %{_sysconfdir}/dracut.conf.d %dir %{dracutlibdir}/dracut.conf.d + +%if %{with doc} %{_mandir}/man8/dracut.8* %{_mandir}/man8/*service.8* %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999 @@ -400,6 +333,8 @@ rm -rf -- $RPM_BUILD_ROOT %{_mandir}/man7/dracut.modules.7* %{_mandir}/man7/dracut.bootup.7* %{_mandir}/man5/dracut.conf.5* +%endif + %if %{defined _unitdir} %{dracutlibdir}/modules.d/00systemd-bootchart %else @@ -433,8 +368,10 @@ rm -rf -- $RPM_BUILD_ROOT %{dracutlibdir}/modules.d/95rootfs-block %{dracutlibdir}/modules.d/95dasd %{dracutlibdir}/modules.d/95dasd_mod +%{dracutlibdir}/modules.d/95dasd_rules %{dracutlibdir}/modules.d/95fstab-sys %{dracutlibdir}/modules.d/95zfcp +%{dracutlibdir}/modules.d/95zfcp_rules %{dracutlibdir}/modules.d/95terminfo %{dracutlibdir}/modules.d/95udev-rules %{dracutlibdir}/modules.d/95virtfs @@ -505,7 +442,11 @@ rm -rf -- $RPM_BUILD_ROOT %files fips-aesni %defattr(-,root,root,0755) + +%if %{with doc} %doc COPYING +%endif + %{dracutlibdir}/modules.d/02fips-aesni %files caps @@ -514,7 +455,11 @@ rm -rf -- $RPM_BUILD_ROOT %files tools %defattr(-,root,root,0755) -%{_mandir}/man8/dracut-catimages.8* + +%if %{with doc} +%doc %{_mandir}/man8/dracut-catimages.8* +%endif + %{_bindir}/dracut-catimages %dir /boot/dracut %dir /var/lib/dracut @@ -533,6 +478,9 @@ rm -rf -- $RPM_BUILD_ROOT %endif %changelog +* Thu Mar 20 2014 Harald Hoyer <harald@redhat.com> 037-1 +- version 037 + * Wed Jan 22 2014 Harald Hoyer <harald@redhat.com> 034-80.git20140122 - fixed /dev/dev/resume Resolves: rhbz#1045116 @@ -1 +1 @@ -23b0983d57a791c3d94ed13152226385 dracut-034.tar.bz2 +866982a7ab49e3e4442fe966eeff4111 dracut-037.tar.xz |