From 1a09cd0408dd1361f1616a9f5eb605189cfdae6a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 5 Apr 2012 14:36:12 +0200 Subject: [PATCH] dracut-018-1 --- .gitignore | 1 + ...fs-lib-module-setup.sh-removed-touch.patch | 22 - ...-setup.sh-removed-egrep-and-ls-calls.patch | 26 - ...ertfs.sh-use-hardlinks-for-inter-usr.patch | 22 - ....sh-get_fs_env-replaced-egrep-with-s.patch | 25 - ....sh-instmods-replace-egrep-with-shel.patch | 26 - ....sh-instmods-removed-special-case-fo.patch | 29 - ....sh-instmods-print-only-filename-ins.patch | 25 - ...-functions.sh-use-a-marker-dir-for-k.patch | 74 - 0009-dracut.spec-require-hardlink.patch | 21 - ...module-setup.sh-no-need-to-call-find.patch | 22 - ...tup.sh-optimize-install-of-all-kbd-f.patch | 24 - 0012-make-bzip2-optional.patch | 57 - 0013-TODO-update.patch | 54 - ...ount-usr.sh-ignore-comments-in-fstab.patch | 21 - ...-usr.sh-check-if-we-have-NEWROOT-etc.patch | 22 - ...nvertfs.sh-correct-check-for-usr-bin.patch | 54 - ...ypt.sh-simplify-rd.luks.uuid-testing.patch | 37 - ....sh-install_kmod_with_fw-delay-.kern.patch | 38 - 0019-Fix-correct-nfs-path.patch | 22 - ...ove-emergency_shell-to-dracut-lib.sh.patch | 118 - 0021-url-lib-make-nfs-support-optional.patch | 30 - ...l-dhclient.sh-kill-dhclient-silently.patch | 29 - 0023-write-ifcfg.sh-cleanups.patch | 34 - ...dd-UUID-.-and-save-the-lease-files-w.patch | 62 - ...pdates-failing-because-of-lib-symlin.patch | 40 - ...nrules.sh-move-ifup-in-the-initqueue.patch | 47 - ....sh-check-for-.kernelmodseen-dir-bef.patch | 24 - ...-ifup.sh-check-for-m-to-set-manualup.patch | 22 - 0029-get-rid-of-tmp-root.info.patch | 130 - ...e-ext3-on-server-and-fsck-after-kill.patch | 47 - ...-hookdirs-and-create-them-in-dracut-.patch | 60 - ...ored-out-the-ugly-cdrom-polling-in-t.patch | 90 - ...ve-wait_for_loginit-to-dracut-lib.sh.patch | 88 - ...-stuff-from-netroot-parse-ip-opts-to.patch | 322 - 0035-add-initqueue-env-and-online-hook.patch | 109 - 0036-TEST-20-NFS-test.sh-fsck-with-a.patch | 22 - ...scsi-iscsiroot.sh-fix-for-empty-root.patch | 50 - 0038-dracut.spec-add-98pollcdrom.patch | 21 - ...-install-ctcm-network-module-on-s390.patch | 26 - 0040-img-lib-fix-unpack_img.patch | 48 - 0041-url-lib-clean-up-output.patch | 48 - 0042-Add-live.updates-to-livenet-module.patch | 94 - ...ded-github-and-sourceforge-git-links.patch | 31 - 0044-AUTHORS-update.patch | 51 - 0045-remove-dracut-gencmdline.patch | 831 --- ...lace-xml-documentation-with-asciidoc.patch | 5462 ----------------- 0047-precompile-doc.patch | 98 - ...t-for-udev-settle-before-deconstruct.patch | 48 - 0049-NEWS-update.patch | 32 - 0050-remove-ctty.patch | 84 - ...-openvt-and-use-setsid-c-if-possible.patch | 101 - 0052-TEST-01-BASIC-add-setsid.patch | 39 - ...ch-file-or-directory-in-emergency_sh.patch | 24 - ...gets-turned-back-on-in-wait_for_logi.patch | 37 - 0055-Do-not-mount-bind-run-anymore.patch | 66 - ...x-loadpolicy.sh-use-mount-rbind-for-.patch | 23 - 0057-Avoid-use-of-export-n.patch | 36 - 0058-provide-name-based-nbd-connects.patch | 27 - ...-level-down-for-the-manpage-includes.patch | 30 - 0060-shutdown-fix-PATH.patch | 23 - ...evert-the-cp-mv-change-for-run-initr.patch | 23 - dracut.spec | 71 +- sources | 2 +- 64 files changed, 9 insertions(+), 9313 deletions(-) delete mode 100644 0001-99fs-lib-module-setup.sh-removed-touch.patch delete mode 100644 0002-95nfs-module-setup.sh-removed-egrep-and-ls-calls.patch delete mode 100644 0003-30convertfs-convertfs.sh-use-hardlinks-for-inter-usr.patch delete mode 100644 0004-dracut-functions.sh-get_fs_env-replaced-egrep-with-s.patch delete mode 100644 0005-dracut-functions.sh-instmods-replace-egrep-with-shel.patch delete mode 100644 0006-dracut-functions.sh-instmods-removed-special-case-fo.patch delete mode 100644 0007-dracut-functions.sh-instmods-print-only-filename-ins.patch delete mode 100644 0008-dracut.sh-dracut-functions.sh-use-a-marker-dir-for-k.patch delete mode 100644 0009-dracut.spec-require-hardlink.patch delete mode 100644 0010-95terminfo-module-setup.sh-no-need-to-call-find.patch delete mode 100644 0011-10i18n-module-setup.sh-optimize-install-of-all-kbd-f.patch delete mode 100644 0012-make-bzip2-optional.patch delete mode 100644 0013-TODO-update.patch delete mode 100644 0014-98usrmount-mount-usr.sh-ignore-comments-in-fstab.patch delete mode 100644 0015-98usrmount-mount-usr.sh-check-if-we-have-NEWROOT-etc.patch delete mode 100644 0016-30convertfs-convertfs.sh-correct-check-for-usr-bin.patch delete mode 100644 0017-90crypt-parse-crypt.sh-simplify-rd.luks.uuid-testing.patch delete mode 100644 0018-dracut-functions.sh-install_kmod_with_fw-delay-.kern.patch delete mode 100644 0019-Fix-correct-nfs-path.patch delete mode 100644 0020-move-emergency_shell-to-dracut-lib.sh.patch delete mode 100644 0021-url-lib-make-nfs-support-optional.patch delete mode 100644 0022-40network-kill-dhclient.sh-kill-dhclient-silently.patch delete mode 100644 0023-write-ifcfg.sh-cleanups.patch delete mode 100644 0024-write-ifcfg.sh-add-UUID-.-and-save-the-lease-files-w.patch delete mode 100644 0025-fix-apply-live-updates-failing-because-of-lib-symlin.patch delete mode 100644 0026-40network-net-genrules.sh-move-ifup-in-the-initqueue.patch delete mode 100644 0027-dracut-functions.sh-check-for-.kernelmodseen-dir-bef.patch delete mode 100644 0028-ifup.sh-check-for-m-to-set-manualup.patch delete mode 100644 0029-get-rid-of-tmp-root.info.patch delete mode 100644 0030-TEST-20-NFS-use-ext3-on-server-and-fsck-after-kill.patch delete mode 100644 0031-add-initqueue-to-hookdirs-and-create-them-in-dracut-.patch delete mode 100644 0032-98pollcdrom-factored-out-the-ugly-cdrom-polling-in-t.patch delete mode 100644 0033-move-wait_for_loginit-to-dracut-lib.sh.patch delete mode 100644 0034-network-refactor-stuff-from-netroot-parse-ip-opts-to.patch delete mode 100644 0035-add-initqueue-env-and-online-hook.patch delete mode 100644 0036-TEST-20-NFS-test.sh-fsck-with-a.patch delete mode 100644 0037-95iscsi-iscsiroot.sh-fix-for-empty-root.patch delete mode 100644 0038-dracut.spec-add-98pollcdrom.patch delete mode 100644 0039-install-ctcm-network-module-on-s390.patch delete mode 100644 0040-img-lib-fix-unpack_img.patch delete mode 100644 0041-url-lib-clean-up-output.patch delete mode 100644 0042-Add-live.updates-to-livenet-module.patch delete mode 100644 0043-README-added-github-and-sourceforge-git-links.patch delete mode 100644 0044-AUTHORS-update.patch delete mode 100644 0045-remove-dracut-gencmdline.patch delete mode 100644 0046-replace-xml-documentation-with-asciidoc.patch delete mode 100644 0047-precompile-doc.patch delete mode 100644 0048-TEST-10-RAID-wait-for-udev-settle-before-deconstruct.patch delete mode 100644 0049-NEWS-update.patch delete mode 100644 0050-remove-ctty.patch delete mode 100644 0051-remove-openvt-and-use-setsid-c-if-possible.patch delete mode 100644 0052-TEST-01-BASIC-add-setsid.patch delete mode 100644 0053-fix-execvp-No-such-file-or-directory-in-emergency_sh.patch delete mode 100644 0054-Make-sure-set-x-gets-turned-back-on-in-wait_for_logi.patch delete mode 100644 0055-Do-not-mount-bind-run-anymore.patch delete mode 100644 0056-98selinux-selinux-loadpolicy.sh-use-mount-rbind-for-.patch delete mode 100644 0057-Avoid-use-of-export-n.patch delete mode 100644 0058-provide-name-based-nbd-connects.patch delete mode 100644 0059-dracut.asc-set-level-down-for-the-manpage-includes.patch delete mode 100644 0060-shutdown-fix-PATH.patch delete mode 100644 0061-99base-init.sh-revert-the-cp-mv-change-for-run-initr.patch diff --git a/.gitignore b/.gitignore index 818ad34..efc94a2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dracut-015.tar.bz2 /dracut-016.tar.bz2 /dracut-017.tar.bz2 +/dracut-018.tar.bz2 diff --git a/0001-99fs-lib-module-setup.sh-removed-touch.patch b/0001-99fs-lib-module-setup.sh-removed-touch.patch deleted file mode 100644 index b9d451e..0000000 --- a/0001-99fs-lib-module-setup.sh-removed-touch.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 25b36ef1247499b501a52a75764ebe9fc5a6159c Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:05:51 +0100 -Subject: [PATCH] 99fs-lib/module-setup.sh: removed "touch" - ---- - modules.d/99fs-lib/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/99fs-lib/module-setup.sh b/modules.d/99fs-lib/module-setup.sh -index 9c900cc..344dcdf 100755 ---- a/modules.d/99fs-lib/module-setup.sh -+++ b/modules.d/99fs-lib/module-setup.sh -@@ -40,7 +40,7 @@ install() { - local _helpers - - inst "$moddir/fs-lib.sh" "/lib/fs-lib.sh" -- touch ${initdir}/etc/fstab.empty -+ > ${initdir}/etc/fstab.empty - - [[ "$nofscks" = "yes" ]] && return - diff --git a/0002-95nfs-module-setup.sh-removed-egrep-and-ls-calls.patch b/0002-95nfs-module-setup.sh-removed-egrep-and-ls-calls.patch deleted file mode 100644 index d14b4dc..0000000 --- a/0002-95nfs-module-setup.sh-removed-egrep-and-ls-calls.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5e5f3d5e6c9d94996c9a28bf38f26a4d463c4dd4 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:06:16 +0100 -Subject: [PATCH] 95nfs/module-setup.sh: removed "egrep" and "ls" calls - ---- - modules.d/95nfs/module-setup.sh | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh -index 7aedb4d..7853783 100755 ---- a/modules.d/95nfs/module-setup.sh -+++ b/modules.d/95nfs/module-setup.sh -@@ -54,7 +54,11 @@ install() { - _nsslibs=${_nsslibs#|} - _nsslibs=${_nsslibs%|} - -- dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so 2>/dev/null); do echo $_i;done | egrep "$_nsslibs") -+ for _i in {/usr,}$libdir/libnss*.so; do -+ [[ -e $_i ]] || continue -+ [[ "$_i" =~ $_nsslibs ]] || continue -+ dracut_install "$_i" -+ done - - inst_hook cmdline 90 "$moddir/parse-nfsroot.sh" - inst_hook pre-udev 99 "$moddir/nfs-start-rpc.sh" diff --git a/0003-30convertfs-convertfs.sh-use-hardlinks-for-inter-usr.patch b/0003-30convertfs-convertfs.sh-use-hardlinks-for-inter-usr.patch deleted file mode 100644 index 4e0d07c..0000000 --- a/0003-30convertfs-convertfs.sh-use-hardlinks-for-inter-usr.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b6f0dcbda13bfb242114d619b4574df2a4f426ae Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:06:38 +0100 -Subject: [PATCH] 30convertfs/convertfs.sh: use hardlinks for inter-/usr cp - ---- - modules.d/30convertfs/convertfs.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh -index 69c3b3e..036ec51 100755 ---- a/modules.d/30convertfs/convertfs.sh -+++ b/modules.d/30convertfs/convertfs.sh -@@ -106,7 +106,7 @@ for dir in bin sbin lib lib64; do - [[ -d "$ROOT/$dir" ]] || continue - echo "Make a copy of \`$ROOT/usr/$dir'." - [[ -d "$ROOT/usr/$dir" ]] \ -- && cp -ax $CP_HARDLINK "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new" -+ && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new" - echo "Merge the copy with \`$ROOT/$dir'." - [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \ - || mkdir -p "$ROOT/usr/${dir}.usrmove-new" diff --git a/0004-dracut-functions.sh-get_fs_env-replaced-egrep-with-s.patch b/0004-dracut-functions.sh-get_fs_env-replaced-egrep-with-s.patch deleted file mode 100644 index 335a296..0000000 --- a/0004-dracut-functions.sh-get_fs_env-replaced-egrep-with-s.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 07f3e4f1689545bd5817c785ee97a3f668239014 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:07:45 +0100 -Subject: [PATCH] dracut-functions.sh: get_fs_env() replaced egrep with shell - ---- - dracut-functions.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index bb0c96f..9e9ee4e 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -168,7 +168,10 @@ get_fs_env() { - [[ $1 ]] || return - unset ID_FS_TYPE - unset ID_FS_UUID -- eval $(udevadm info --query=env --name=$1|egrep 'ID_FS_(TYPE|UUID)=') -+ eval $(udevadm info --query=env --name=$1 \ -+ | while read line; do -+ [[ "$line" =~ 'ID_FS_(TYPE|UUID)=' ]] && echo $line; -+ done) - [[ $ID_FS_TYPE ]] && return - - if [[ -x /lib/udev/vol_id ]]; then diff --git a/0005-dracut-functions.sh-instmods-replace-egrep-with-shel.patch b/0005-dracut-functions.sh-instmods-replace-egrep-with-shel.patch deleted file mode 100644 index 0b81d22..0000000 --- a/0005-dracut-functions.sh-instmods-replace-egrep-with-shel.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 86191581d125b1373532593371fde767a56728a0 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:08:30 +0100 -Subject: [PATCH] dracut-functions.sh: instmods(): replace egrep with shell - code - ---- - dracut-functions.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 9e9ee4e..81801e1 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1167,9 +1167,10 @@ instmods() { - return $_ret - } - -+ local _filter_not_found='FATAL: Module .* not found.' - # Capture all stderr from modprobe to _fderr. We could use {var}>... - # redirections, but that would make dracut require bash4 at least. - eval "( instmods_1 \"\$@\" ) ${_fderr}>&1" \ -- | egrep -v 'FATAL: Module .* not found.' | derror -+ | while read line; do [[ "$line" =~ $_filter_not_found ]] || echo $line;done | derror - return $? - } diff --git a/0006-dracut-functions.sh-instmods-removed-special-case-fo.patch b/0006-dracut-functions.sh-instmods-removed-special-case-fo.patch deleted file mode 100644 index 91e9bf7..0000000 --- a/0006-dracut-functions.sh-instmods-removed-special-case-fo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From edea870c3cade3a9f8836e75afa98587945908d2 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:09:38 +0100 -Subject: [PATCH] dracut-functions.sh: instmods() removed special case for - "=ata" - ---- - dracut-functions.sh | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 81801e1..bd3203d 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1103,13 +1103,7 @@ instmods() { - local _mod="$1" - case $_mod in - =*) -- # This introduces 2 incompatible meanings for =* arguments -- # to instmods. We need to decide which one to keep. -- if [[ $_mod = =ata && -f $srcmods/modules.block ]]; then -- ( [[ "$_mpargs" ]] && echo $_mpargs -- egrep 'ata|ahci' "${srcmods}/modules.block" ) \ -- | instmods -- elif [ -f $srcmods/modules.${_mod#=} ]; then -+ if [ -f $srcmods/modules.${_mod#=} ]; then - ( [[ "$_mpargs" ]] && echo $_mpargs - cat "${srcmods}/modules.${_mod#=}" ) \ - | instmods diff --git a/0007-dracut-functions.sh-instmods-print-only-filename-ins.patch b/0007-dracut-functions.sh-instmods-print-only-filename-ins.patch deleted file mode 100644 index b6c1f00..0000000 --- a/0007-dracut-functions.sh-instmods-print-only-filename-ins.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 334cc2832770b71e5e6b6f245e5a24cced8eaac6 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:10:07 +0100 -Subject: [PATCH] dracut-functions.sh: instmods() print only filename instead - of fullpath - -do not print the full path, when we use "find" for kernel modules, but -rather only the filename. ---- - dracut-functions.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index bd3203d..80714aa 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1109,7 +1109,7 @@ instmods() { - | instmods - else - ( [[ "$_mpargs" ]] && echo $_mpargs -- find "$srcmods" -path "*/${_mod#=}/*" ) \ -+ find "$srcmods" -path "*/${_mod#=}/*" -printf '%f\n' ) \ - | instmods - fi - ;; diff --git a/0008-dracut.sh-dracut-functions.sh-use-a-marker-dir-for-k.patch b/0008-dracut.sh-dracut-functions.sh-use-a-marker-dir-for-k.patch deleted file mode 100644 index 6f2c6d9..0000000 --- a/0008-dracut.sh-dracut-functions.sh-use-a-marker-dir-for-k.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 379c34d2cf29de3268bbbe83ec09f60b74340313 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:11:36 +0100 -Subject: [PATCH] dracut.sh/dracut-functions.sh: use a marker-dir for kernel - modules - -use "$initdir/.kernelmodseen" to mark kernel modules, which we already -handled with install_kmod_with_fw() ---- - dracut-functions.sh | 10 +++++++--- - dracut.sh | 5 +++++ - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 80714aa..c7337e9 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -974,9 +974,14 @@ for_each_module_dir() { - # $1 = full path to kernel module to install - install_kmod_with_fw() { - # no need to go further if the module is already installed -+ - [[ -e "${initdir}/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" ]] \ - && return 0 - -+ [[ -e "$initdir/.kernelmodseen/${1##*/}" ]] && return 0 -+ -+ > "$initdir/.kernelmodseen/${1##*/}" -+ - if [[ $omit_drivers ]]; then - local _kmod=${1##*/} - _kmod=${_kmod%.ko} -@@ -1116,16 +1121,15 @@ instmods() { - --*) _mpargs+=" $_mod" ;; - i2o_scsi) return ;; # Do not load this diagnostic-only module - *) -+ _mod=${_mod##*/} - # if we are already installed, skip this module and go on - # to the next one. -- [[ -f $initdir/$1 ]] && return -+ [[ -f "$initdir/.kernelmodseen/${_mod%.ko}.ko" ]] && return - - if [[ $omit_drivers ]] && [[ "$1" =~ $omit_drivers ]]; then - dinfo "Omitting driver ${_mod##$srcmods}" - return - fi -- -- _mod=${_mod##*/} - # If we are building a host-specific initramfs and this - # module is not already loaded, move on to the next one. - [[ $hostonly ]] && ! grep -qe "\<${_mod//-/_}\>" /proc/modules \ -diff --git a/dracut.sh b/dracut.sh -index e6c36d9..88691ae 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -676,6 +676,8 @@ if [[ $kernel_only != yes ]]; then - mkdir -p "${initdir}/etc/cmdline.d" - fi - -+mkdir -p "$initdir/.kernelmodseen" -+ - mods_to_load="" - # check all our modules to see if they should be sourced. - # This builds a list of modules that we will install next. -@@ -766,6 +768,9 @@ if [[ $kernel_only != yes ]]; then - fi - fi - -+rm -fr "$initdir/.kernelmodseen" -+ -+ - if (($maxloglvl >= 5)); then - ddebug "Listing sizes of included files:" - du -c "$initdir" | sort -n | ddebug diff --git a/0009-dracut.spec-require-hardlink.patch b/0009-dracut.spec-require-hardlink.patch deleted file mode 100644 index bef755f..0000000 --- a/0009-dracut.spec-require-hardlink.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 7a5f1ee46a07e00d1687a0c2cd6c13319626f17d Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:40:38 +0100 -Subject: [PATCH] dracut.spec: require "hardlink" - ---- - dracut.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dracut.spec b/dracut.spec -index 1ec8b68..4102bb0 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -71,6 +71,7 @@ Requires: cpio - Requires: filesystem >= 2.1.0 - Requires: findutils - Requires: grep -+Requires: hardlink - Requires: gzip - Requires: module-init-tools >= 3.7-9 - Requires: sed diff --git a/0010-95terminfo-module-setup.sh-no-need-to-call-find.patch b/0010-95terminfo-module-setup.sh-no-need-to-call-find.patch deleted file mode 100644 index f87b0e0..0000000 --- a/0010-95terminfo-module-setup.sh-no-need-to-call-find.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ddd01008ff0b7b3daf5708ac32a6ccd0e843b3fc Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 16:51:35 +0100 -Subject: [PATCH] 95terminfo/module-setup.sh: no need to call "find" - ---- - modules.d/95terminfo/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/95terminfo/module-setup.sh b/modules.d/95terminfo/module-setup.sh -index aec3582..32a3fe9 100755 ---- a/modules.d/95terminfo/module-setup.sh -+++ b/modules.d/95terminfo/module-setup.sh -@@ -10,7 +10,7 @@ install() { - done - - if [ -d ${_terminfodir} ]; then -- for f in $(find ${_terminfodir} -type f); do -+ for f in ${_terminfodir}/*/*; do - inst_simple $f - done - fi diff --git a/0011-10i18n-module-setup.sh-optimize-install-of-all-kbd-f.patch b/0011-10i18n-module-setup.sh-optimize-install-of-all-kbd-f.patch deleted file mode 100644 index 9ca1a00..0000000 --- a/0011-10i18n-module-setup.sh-optimize-install-of-all-kbd-f.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cf38fc7389d4136d0f77d9709c87acc4283f6bd6 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 17:18:51 +0100 -Subject: [PATCH] 10i18n/module-setup.sh: optimize install of all kbd files - ---- - modules.d/10i18n/module-setup.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index a5a3388..b4c19e1 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh -@@ -92,8 +92,8 @@ install() { - install_all_kbd() { - local rel f - -- for f in $(eval find ${kbddir}/{${KBDSUBDIRS}} -type f -print) -- do -+ find $(eval echo ${kbddir}/{${KBDSUBDIRS}}) -type f -print | \ -+ while read f; do - inst_simple $f - done - diff --git a/0012-make-bzip2-optional.patch b/0012-make-bzip2-optional.patch deleted file mode 100644 index ec642d5..0000000 --- a/0012-make-bzip2-optional.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b7ddf6c1d8c861a75865b4b0fb716d838e4885ab Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Sat, 25 Feb 2012 17:22:02 +0100 -Subject: [PATCH] make bzip2 optional - ---- - dracut.spec | 1 - - modules.d/10i18n/module-setup.sh | 9 ++++++++- - modules.d/99img-lib/module-setup.sh | 2 +- - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/dracut.spec b/dracut.spec -index 4102bb0..91b3451 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -65,7 +65,6 @@ Obsoletes: dracut-kernel < 005 - Provides: dracut-kernel = %{version}-%{release} - - Requires: bash --Requires: bzip2 - Requires: coreutils - Requires: cpio - Requires: filesystem >= 2.1.0 -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index b4c19e1..d1854c2 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh -@@ -100,8 +100,15 @@ install() { - # remove unnecessary files - rm -f "${initdir}${kbddir}/consoletrans/utflist" - find "${initdir}${kbddir}/" -name README\* -delete -+ find "${initdir}${kbddir}/" -name '*.gz' -print -quit \ -+ | while read line; do -+ dracut_install gzip -+ done - -- dracut_install gzip bzip2 -+ find "${initdir}${kbddir}/" -name '*.bz2' -print -quit \ -+ | while read line; do -+ dracut_install bzip2 -+ done - } - - install_local_i18n() { -diff --git a/modules.d/99img-lib/module-setup.sh b/modules.d/99img-lib/module-setup.sh -index eead2ab..f0e6dac 100755 ---- a/modules.d/99img-lib/module-setup.sh -+++ b/modules.d/99img-lib/module-setup.sh -@@ -17,7 +17,7 @@ install() { - dracut_install tar gzip dd - dracut_install -o cpio xz - # TODO: make this conditional on a cmdline flag / config option -- # dracut_install -o bzip2 -+ dracut_install -o bzip2 - inst "$moddir/img-lib.sh" "/lib/img-lib.sh" - } - diff --git a/0013-TODO-update.patch b/0013-TODO-update.patch deleted file mode 100644 index 67cebe3..0000000 --- a/0013-TODO-update.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 34769a1445836bb43df3f27d8771ef6b86f29771 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 28 Feb 2012 12:19:39 +0100 -Subject: [PATCH] TODO: update - ---- - TODO | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/TODO b/TODO -index e5abef0..6c27268 100644 ---- a/TODO -+++ b/TODO -@@ -1,24 +1,33 @@ --Current TODO list, broken into things which are relevant for the initramfs itself (/init et al) vs the generator. A lot of things are/should be marked with "FIXME" in the code -+Current TODO list, broken into things which are relevant for the -+initramfs itself (/init et al) vs the generator. -+A lot of things are/should be marked with "FIXME" in the code. -+ -+Items are ordered in priority. -+ - INITRAMFS TODO - --- The hard-coded list of udev rules that we care about is kind of lame. -+- put "root=" parsing hooks in separate hook dir -+- call "root=" parsing hooks after getting new rootpath from dhcp -+- put mount hook in main initqueue loop -+- the hard-coded list of udev rules that we care about is kind of lame. - - automatic kexec fallback - - panic fallback --- fsck for $NEWROOT/usr - - GENERATOR TODO - --- Default module specification could use some work --- udev rule copying, as mentioned above, is a bit too hard-coded -+- add mechanism for module specific command line options - - pkg-config integration, to make it easy for other packages to use us. - - add recovery image creator (mkrecovery) -+- default module specification could use some work -+- udev rule copying, as mentioned above, is a bit too hard-coded - - CODE TODO --- document functions -+ -+- document more functions - - make function vars local, and prefix with "_" - - Future Enhancement Requests - - - run ssh server to enter crypto password or perform debugging (supported by debian) --- Bug 524727 - Dracut + encrypted root + networking -+- https://bugzilla.redhat.com/show_bug.cgi?id=524727 - Dracut + encrypted root + networking - diff --git a/0014-98usrmount-mount-usr.sh-ignore-comments-in-fstab.patch b/0014-98usrmount-mount-usr.sh-ignore-comments-in-fstab.patch deleted file mode 100644 index 2eb14a8..0000000 --- a/0014-98usrmount-mount-usr.sh-ignore-comments-in-fstab.patch +++ /dev/null @@ -1,21 +0,0 @@ -From b642ce5340dfd72145793f2ca0fe8fdfe7e7dd84 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 28 Feb 2012 12:54:01 +0100 -Subject: [PATCH] 98usrmount/mount-usr.sh: ignore comments in fstab - ---- - modules.d/98usrmount/mount-usr.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh -index 3e23b15..f9d049e 100755 ---- a/modules.d/98usrmount/mount-usr.sh -+++ b/modules.d/98usrmount/mount-usr.sh -@@ -39,6 +39,7 @@ mount_usr() - local _dev _mp _fs _opts _rest _usr_found _ret _freq _passno - # check, if we have to mount the /usr filesystem - while read _dev _mp _fs _opts _freq _passno; do -+ [ "${_dev%%#*}" != "$_dev" ] && continue - if [ "$_mp" = "/usr" ]; then - case "$_dev" in - LABEL=*) diff --git a/0015-98usrmount-mount-usr.sh-check-if-we-have-NEWROOT-etc.patch b/0015-98usrmount-mount-usr.sh-check-if-we-have-NEWROOT-etc.patch deleted file mode 100644 index 1eb11c7..0000000 --- a/0015-98usrmount-mount-usr.sh-check-if-we-have-NEWROOT-etc.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9eded206c90c0ce65b1addc55e4a8d83fb66ad3b Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 28 Feb 2012 16:35:08 +0100 -Subject: [PATCH] 98usrmount/mount-usr.sh: check, if we have - $NEWROOT/etc/fstab - ---- - modules.d/98usrmount/mount-usr.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh -index f9d049e..39f75b9 100755 ---- a/modules.d/98usrmount/mount-usr.sh -+++ b/modules.d/98usrmount/mount-usr.sh -@@ -73,4 +73,6 @@ mount_usr() - fi - } - --mount_usr -+if [ -f "$NEWROOT/etc/fstab" ]; then -+ mount_usr -+fi diff --git a/0016-30convertfs-convertfs.sh-correct-check-for-usr-bin.patch b/0016-30convertfs-convertfs.sh-correct-check-for-usr-bin.patch deleted file mode 100644 index e53d88a..0000000 --- a/0016-30convertfs-convertfs.sh-correct-check-for-usr-bin.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 95268ffed378ac2bb3b5959cdbbf2e8b7e10534e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 29 Feb 2012 13:21:51 +0100 -Subject: [PATCH] 30convertfs/convertfs.sh: correct check for /usr/bin - ---- - modules.d/30convertfs/convertfs.sh | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh -index 036ec51..d1d25aa 100755 ---- a/modules.d/30convertfs/convertfs.sh -+++ b/modules.d/30convertfs/convertfs.sh -@@ -21,13 +21,13 @@ while [[ "$ROOT" != "${ROOT%/}" ]]; do - ROOT=${ROOT%/} - done - --if [ ! -L $ROOT/var/run ]; then -+if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then - echo "Converting /var/run to symlink" - mv -f $ROOT/var/run $ROOT/var/run.runmove~ - ln -sfn ../run $ROOT/var/run - fi - --if [ ! -L $ROOT/var/lock ]; then -+if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then - echo "Converting /var/lock to symlink" - mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~ - ln -sfn ../run/lock $ROOT/var/lock -@@ -42,16 +42,19 @@ needconvert() { - return 1 - } - -+if ! [ -e "$ROOT/usr/bin" ]; then -+ echo "$ROOT/usr/bin does not exist!" -+ echo "Make sure, the kernel command line has enough information" -+ echo "to mount /usr (man dracut.cmdline)" -+ exit 1 -+fi -+ -+ - if ! needconvert; then - echo "Your system is already converted." - exit 0 - fi - --if [ -e "$ROOT/usr/bin" ]; then -- echo "$ROOT/usr/bin does not exist" -- exit 1 --fi -- - testfile="$ROOT/.usrmovecheck$$" - rm -f "$testfile" - > "$testfile" diff --git a/0017-90crypt-parse-crypt.sh-simplify-rd.luks.uuid-testing.patch b/0017-90crypt-parse-crypt.sh-simplify-rd.luks.uuid-testing.patch deleted file mode 100644 index 04ec6cb..0000000 --- a/0017-90crypt-parse-crypt.sh-simplify-rd.luks.uuid-testing.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8d021e4b8a5aaaa129ae53358cd108f589881182 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 29 Feb 2012 16:20:02 +0100 -Subject: [PATCH] 90crypt/parse-crypt.sh: simplify rd.luks.uuid testing - ---- - modules.d/90crypt/parse-crypt.sh | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh -index 2ab3a9f..f96b59a 100755 ---- a/modules.d/90crypt/parse-crypt.sh -+++ b/modules.d/90crypt/parse-crypt.sh -@@ -24,21 +24,10 @@ else - printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout - } >> /etc/udev/rules.d/70-luks.rules.new - -- -- [ -e $hookdir/initqueue/finished/90-crypt.sh ] || \ -- { -- printf -- 'UUIDS=:\n' -- printf -- 'for dm in /dev/dm-*; do\n' -- printf -- '[ -e "$dm" ] || exit 1\n' -- printf -- 'dmid=`/sbin/dmsetup info -c -o uuid --noheadings "$dm"`\n' -- printf -- 'uuid=${dmid#CRYPT-LUKS*-}\n' -- printf -- '[ "x$uuid" = "x$dmid" ] && continue\n' -- printf -- 'UUIDS="${UUIDS}${uuid%%%%-*}:"\n' -- printf -- 'done\n' -- } > $hookdir/initqueue/finished/90-crypt.sh - uuid=$luksid - while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done -- printf -- '[ "x${UUIDS#*:%s*:}" != "x$UUIDS" ] || exit 1\n' $uuid >> $hookdir/initqueue/finished/90-crypt.sh -+ printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \ -+ >> $hookdir/initqueue/finished/90-crypt.sh - - { - printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid diff --git a/0018-dracut-functions.sh-install_kmod_with_fw-delay-.kern.patch b/0018-dracut-functions.sh-install_kmod_with_fw-delay-.kern.patch deleted file mode 100644 index f17aeff..0000000 --- a/0018-dracut-functions.sh-install_kmod_with_fw-delay-.kern.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e12c1a8da19b373aee46f7352e60511ac1a2fc16 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 1 Mar 2012 17:45:30 +0100 -Subject: [PATCH] dracut-functions.sh:install_kmod_with_fw() delay - .kernelmodseen - -first check for omit, then mark the kernel module as seen - -when we temporarily omit_drivers, we don't want to mark them as seen. - -example: nfs.ko module in kernel-modules, but the nfs module -should be able to load it later on. ---- - dracut-functions.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index c7337e9..20fc6e1 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -980,8 +980,6 @@ install_kmod_with_fw() { - - [[ -e "$initdir/.kernelmodseen/${1##*/}" ]] && return 0 - -- > "$initdir/.kernelmodseen/${1##*/}" -- - if [[ $omit_drivers ]]; then - local _kmod=${1##*/} - _kmod=${_kmod%.ko} -@@ -996,6 +994,8 @@ install_kmod_with_fw() { - fi - fi - -+ > "$initdir/.kernelmodseen/${1##*/}" -+ - inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" \ - || return $? - diff --git a/0019-Fix-correct-nfs-path.patch b/0019-Fix-correct-nfs-path.patch deleted file mode 100644 index 4c8aa1f..0000000 --- a/0019-Fix-correct-nfs-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 778f767bccf14f49573d5fffca40841f42401e75 Mon Sep 17 00:00:00 2001 -From: Jan Stodola -Date: Thu, 1 Mar 2012 20:22:57 +0100 -Subject: [PATCH] Fix correct nfs path - ---- - modules.d/45url-lib/url-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh -index 383e7ac..1fc80a1 100755 ---- a/modules.d/45url-lib/url-lib.sh -+++ b/modules.d/45url-lib/url-lib.sh -@@ -99,7 +99,7 @@ nfs_fetch_url() { - mntdir=$(nfs_already_mounted $server $path) - if [ -z "$mntdir" ]; then - local mntdir="$(mkuniqdir /run nfs_mnt)" -- mount_nfs $nfs:$server:$path${options:+:$options} $mntdir -+ mount_nfs $nfs:$server:$filepath${options:+:$options} $mntdir - # lazy unmount during pre-pivot hook - inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l $mntdir - fi diff --git a/0020-move-emergency_shell-to-dracut-lib.sh.patch b/0020-move-emergency_shell-to-dracut-lib.sh.patch deleted file mode 100644 index 01d3f62..0000000 --- a/0020-move-emergency_shell-to-dracut-lib.sh.patch +++ /dev/null @@ -1,118 +0,0 @@ -From ffcc64bdea9080c2a1430ba59720f583bc0ac908 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Wed, 29 Feb 2012 13:09:58 -0500 -Subject: [PATCH] move emergency_shell to dracut-lib.sh - -This lets things running outside init call an emergency_shell. -(example: scripts called by initqueue) ---- - modules.d/99base/dracut-lib.sh | 38 ++++++++++++++++++++++++++++++++++++++ - modules.d/99base/init.sh | 40 +--------------------------------------- - 2 files changed, 39 insertions(+), 39 deletions(-) - -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index afd366e..c31854e 100755 ---- a/modules.d/99base/dracut-lib.sh -+++ b/modules.d/99base/dracut-lib.sh -@@ -753,3 +753,41 @@ killproc() { - need_shutdown() { - >/run/initramfs/.need_shutdown - } -+ -+emergency_shell() -+{ -+ local _ctty -+ set +e -+ if [ "$1" = "-n" ]; then -+ _rdshell_name=$2 -+ shift 2 -+ else -+ _rdshell_name=dracut -+ fi -+ echo ; echo -+ warn $@ -+ source_hook emergency -+ echo -+ wait_for_loginit -+ [ -e /run/initramfs/.die ] && exit 1 -+ if getargbool 1 rd.shell -y rdshell || getarg rd.break rdbreak; then -+ echo "Dropping to debug shell." -+ echo -+ export PS1="$_rdshell_name:\${PWD}# " -+ [ -e /.profile ] || >/.profile -+ _ctty=/dev/console -+ if [ -n "$(command -v setsid)" ]; then -+ _ctty="$(getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}" -+ [ -c "$_ctty" ] || _ctty=/dev/tty1 -+ setsid sh -i -l 0<$_ctty 1>$_ctty 2>&1 -+ elif [ -n "$(command -v openvt)" ] && ! getarg "console=" >/dev/null 2>&1 && getargbool 1 "rd.openvt" ; then -+ openvt -f -c 1 -w -s -l -- sh -+ else -+ sh -i -l 0<$_ctty 1>$_ctty 2>&1 -+ fi -+ else -+ warn "Boot has failed. To debug this issue add \"rdshell\" to the kernel command line." -+ # cause a kernel panic -+ exit 1 -+ fi -+} -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index 4d0a2a2..d197497 100755 ---- a/modules.d/99base/init.sh -+++ b/modules.d/99base/init.sh -@@ -38,54 +38,16 @@ wait_for_loginit() - rm -f /run/initramfs/loginit.pipe /run/initramfs/loginit.pid - } - --emergency_shell() --{ -- local _ctty -- set +e -- if [ "$1" = "-n" ]; then -- _rdshell_name=$2 -- shift 2 -- else -- _rdshell_name=dracut -- fi -- echo ; echo -- warn $@ -- source_hook emergency -- echo -- wait_for_loginit -- [ -e /run/initramfs/.die ] && exit 1 -- if getargbool 1 rd.shell -y rdshell || getarg rd.break rdbreak; then -- echo "Dropping to debug shell." -- echo -- export PS1="$_rdshell_name:\${PWD}# " -- [ -e /.profile ] || >/.profile -- _ctty=/dev/console -- if [ -n "$(command -v setsid)" ]; then -- _ctty="$(getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}" -- [ -c "$_ctty" ] || _ctty=/dev/tty1 -- setsid sh -i -l 0<$_ctty 1>$_ctty 2>&1 -- elif [ -n "$(command -v openvt)" ] && ! getarg "console=" >/dev/null 2>&1 && getargbool 1 "rd.openvt" ; then -- openvt -f -c 1 -w -s -l -- sh -- else -- sh -i -l 0<$_ctty 1>$_ctty 2>&1 -- fi -- else -- warn "Boot has failed. To debug this issue add \"rdshell\" to the kernel command line." -- # cause a kernel panic -- exit 1 -- fi --} -- - NEWROOT="/sysroot" - [ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT - --trap "emergency_shell Signal caught!" 0 - OLDPATH=$PATH - PATH=/usr/sbin:/usr/bin:/sbin:/bin - export PATH - - RD_DEBUG="" - . /lib/dracut-lib.sh -+trap "emergency_shell Signal caught!" 0 - - [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3 - diff --git a/0021-url-lib-make-nfs-support-optional.patch b/0021-url-lib-make-nfs-support-optional.patch deleted file mode 100644 index c3fa082..0000000 --- a/0021-url-lib-make-nfs-support-optional.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8a0d2fc56feeb04d314a7fd6030bda5ce748b2f6 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Wed, 29 Feb 2012 13:09:57 -0500 -Subject: [PATCH] url-lib: make nfs support optional - -Only include /lib/nfs-lib.sh if it exists, and then only run -add_url_handler if nfs-lib was imported. ---- - modules.d/45url-lib/url-lib.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh -index 1fc80a1..043a700 100755 ---- a/modules.d/45url-lib/url-lib.sh -+++ b/modules.d/45url-lib/url-lib.sh -@@ -74,7 +74,7 @@ set_http_header() { - - ### NFS ############################################################## - --. /lib/nfs-lib.sh -+[ -e /lib/nfs-lib.sh ] && . /lib/nfs-lib.sh - - nfs_already_mounted() { - local server="$1" path="$2" localdir="" s="" p="" -@@ -112,4 +112,4 @@ nfs_fetch_url() { - [ -f "$outloc" ] || return 253 - echo "$outloc" - } --add_url_handler nfs_fetch_url nfs nfs4 -+command -v nfs_to_var >/dev/null && add_url_handler nfs_fetch_url nfs nfs4 diff --git a/0022-40network-kill-dhclient.sh-kill-dhclient-silently.patch b/0022-40network-kill-dhclient.sh-kill-dhclient-silently.patch deleted file mode 100644 index 4d11f94..0000000 --- a/0022-40network-kill-dhclient.sh-kill-dhclient-silently.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a3f00efc99ac4736be3a1e24259d691bb9a9e19d Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 8 Mar 2012 10:58:16 +0100 -Subject: [PATCH] 40network/kill-dhclient.sh: kill dhclient silently - ---- - modules.d/40network/kill-dhclient.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/40network/kill-dhclient.sh b/modules.d/40network/kill-dhclient.sh -index 2f834c1..78060f5 100755 ---- a/modules.d/40network/kill-dhclient.sh -+++ b/modules.d/40network/kill-dhclient.sh -@@ -5,7 +5,7 @@ - for f in /tmp/dhclient.*.pid; do - [ -e $f ] || continue - read PID < $f; -- kill $PID; -+ kill $PID >/dev/null 2>&1 - done - - sleep 0.1 -@@ -13,5 +13,5 @@ sleep 0.1 - for f in /tmp/dhclient.*.pid; do - [ -e $f ] || continue - read PID < $f; -- kill -9 $PID; -+ kill -9 $PID >/dev/null 2>&1 - done diff --git a/0023-write-ifcfg.sh-cleanups.patch b/0023-write-ifcfg.sh-cleanups.patch deleted file mode 100644 index 02afb60..0000000 --- a/0023-write-ifcfg.sh-cleanups.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d37ad6aea04932196df06139b27d3869385617f9 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Wed, 7 Mar 2012 17:21:53 -0500 -Subject: [PATCH] write-ifcfg.sh: cleanups - -mkdir -p creates intermediate directories and never returns an error, so -we don't need to create the intermediate directories ourself. ---- - modules.d/45ifcfg/write-ifcfg.sh | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index d633a96..0f431e3 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -134,11 +134,10 @@ for netif in $IFACES ; do - done - - # Pass network opts --[ -d /run/initramfs ] || mkdir -m 0755 -p /run/initramfs --cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1 --for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/sysconfig /run/initramfs/state/etc/sysconfig/network-scripts; do -- [ -d $i ] || mkdir -m 0755 -p $i --done --cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1 --echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab --cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1 -+mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts -+echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab -+{ -+ cp /tmp/net.* /run/initramfs/ -+ cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ -+ cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* -+} > /dev/null 2>&1 diff --git a/0024-write-ifcfg.sh-add-UUID-.-and-save-the-lease-files-w.patch b/0024-write-ifcfg.sh-add-UUID-.-and-save-the-lease-files-w.patch deleted file mode 100644 index d9c3a53..0000000 --- a/0024-write-ifcfg.sh-add-UUID-.-and-save-the-lease-files-w.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 66666c670a462548df4ea4c8069d54b8c309ecf4 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Wed, 7 Mar 2012 17:21:54 -0500 -Subject: [PATCH] write-ifcfg.sh: add UUID=.. and save the lease files with - the same uuid - -As described in https://bugzilla.redhat.com/show_bug.cgi?id=541410#c2, -if you want NetworkManager to take over an interface that you're using -for NFS root (or other network root device), you need to: - -a) set UUID= in ifcfg-, and -b) save the lease file as /var/lib/dhclient--.lease - -This patch should make write-ifcfg handle both these things. ---- - modules.d/45ifcfg/write-ifcfg.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 0f431e3..fe986df 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -18,11 +18,13 @@ if [ -e /tmp/bridge.info ]; then - fi - - mkdir -m 0755 -p /tmp/ifcfg/ -+mkdir -m 0755 -p /tmp/ifcfg-leases/ - - for netif in $IFACES ; do - # bridge? - unset bridge - unset bond -+ uuid=$(cat /proc/sys/kernel/random/uuid) - if [ "$netif" = "$bridgename" ]; then - bridge=yes - elif [ "$netif" = "$bondname" ]; then -@@ -35,10 +37,12 @@ for netif in $IFACES ; do - echo "DEVICE=$netif" - echo "ONBOOT=yes" - echo "NETBOOT=yes" -+ echo "UUID=$uuid" - if [ -f /tmp/net.$netif.lease ]; then - strstr "$ip" '*:*:*' && - echo "DHCPV6C=yes" - echo "BOOTPROTO=dhcp" -+ cp /tmp/net.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease - else - echo "BOOTPROTO=none" - # If we've booted with static ip= lines, the override file is there -@@ -135,9 +139,12 @@ done - - # Pass network opts - mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts -+mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab -+echo "files /var/lib/dhclient" >> /run/initramfs/rwtab - { - cp /tmp/net.* /run/initramfs/ - cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ - cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* -+ cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient - } > /dev/null 2>&1 diff --git a/0025-fix-apply-live-updates-failing-because-of-lib-symlin.patch b/0025-fix-apply-live-updates-failing-because-of-lib-symlin.patch deleted file mode 100644 index 209c38b..0000000 --- a/0025-fix-apply-live-updates-failing-because-of-lib-symlin.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b43d651511df184fcdc1677e11166bae2f61073a Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Wed, 7 Mar 2012 17:22:18 -0500 -Subject: [PATCH] fix apply-live-updates failing because of /lib symlink - -Since cp won't copy a directory over a symlink, any updates that were -supposed to go into e.g. /lib would get dropped if you had /updates/lib -as an actual directory, but the target system had /lib->/usr/lib. ---- - modules.d/90dmsquash-live/apply-live-updates.sh | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/modules.d/90dmsquash-live/apply-live-updates.sh b/modules.d/90dmsquash-live/apply-live-updates.sh -index f840d1a..144e8b9 100755 ---- a/modules.d/90dmsquash-live/apply-live-updates.sh -+++ b/modules.d/90dmsquash-live/apply-live-updates.sh -@@ -1,9 +1,17 @@ - #!/bin/sh --if [ -b /dev/mapper/live-rw ]; then -- if [ -d /updates ]; then -- echo "Applying updates to live image..." -+ -+. /tmp/root.info -+ -+if [ -b /dev/mapper/live-rw ] && [ -d /updates ]; then -+ info "Applying updates to live image..." -+ # avoid overwriting symlinks (e.g. /lib -> /usr/lib) with directories -+ ( - cd /updates -- /bin/cp -a -t $NEWROOT . -- cd - -- fi -+ find . -depth -type d | while read dir; do -+ [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir" -+ done -+ find . -depth \! -type d | while read file; do -+ cp -a "$file" "$NEWROOT/$file" -+ done -+ ) - fi diff --git a/0026-40network-net-genrules.sh-move-ifup-in-the-initqueue.patch b/0026-40network-net-genrules.sh-move-ifup-in-the-initqueue.patch deleted file mode 100644 index f993006..0000000 --- a/0026-40network-net-genrules.sh-move-ifup-in-the-initqueue.patch +++ /dev/null @@ -1,47 +0,0 @@ -From af8c8ed9f651b1617296a2d7654a981f006c5ad3 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 11:39:11 +0100 -Subject: [PATCH] 40network/net-genrules.sh: move ifup in the initqueue - ---- - modules.d/40network/net-genrules.sh | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index 323d185..6c46d9a 100755 ---- a/modules.d/40network/net-genrules.sh -+++ b/modules.d/40network/net-genrules.sh -@@ -36,27 +36,27 @@ fix_bootif() { - if [ -n "$BOOTIF" ] ; then - BOOTIF=$(fix_bootif "$BOOTIF") - if [ -n "$netroot" ]; then -- printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$BOOTIF" -+ printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE}"\n' "$BOOTIF" - else -- printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$BOOTIF" -+ printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE} -m"\n' "$BOOTIF" - fi - - # If we have to handle multiple interfaces, handle only them. - elif [ -n "$IFACES" ] ; then - for iface in $IFACES ; do - if [ -n "$netroot" ]; then -- printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$iface" -+ printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE}"\n' "$iface" - else -- printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$iface" -+ printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE} -m"\n' "$iface" - fi - done - - # Default: We don't know the interface to use, handle all - else - if [ -n "$netroot" ]; then -- printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' -+ printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE}"\n' - else -- printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' -+ printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE} -m"\n' - fi - fi - diff --git a/0027-dracut-functions.sh-check-for-.kernelmodseen-dir-bef.patch b/0027-dracut-functions.sh-check-for-.kernelmodseen-dir-bef.patch deleted file mode 100644 index a84fca5..0000000 --- a/0027-dracut-functions.sh-check-for-.kernelmodseen-dir-bef.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6a2c23d12521c564a3c8bbfc349c677b0e9ac3ad Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 12:01:49 +0100 -Subject: [PATCH] dracut-functions.sh: check for .kernelmodseen dir, before - using it - ---- - dracut-functions.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 20fc6e1..5cf24a7 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -994,7 +994,8 @@ install_kmod_with_fw() { - fi - fi - -- > "$initdir/.kernelmodseen/${1##*/}" -+ [ -d "$initdir/.kernelmodseen" ] && \ -+ > "$initdir/.kernelmodseen/${1##*/}" - - inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" \ - || return $? diff --git a/0028-ifup.sh-check-for-m-to-set-manualup.patch b/0028-ifup.sh-check-for-m-to-set-manualup.patch deleted file mode 100644 index 1ec3e38..0000000 --- a/0028-ifup.sh-check-for-m-to-set-manualup.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5861184e87e9d9164c093d3600d85c670c828886 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 12:03:38 +0100 -Subject: [PATCH] ifup.sh: check for "-m" to set manualup - ---- - modules.d/40network/ifup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index b138e8e..b55362c 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -50,7 +50,7 @@ fi - - # disable manual ifup while netroot is set for simplifying our logic - # in netroot case we prefer netroot to bringup $netif automaticlly --[ -n "$2" ] && [ -z "$netroot" ] && manualup="$2" -+[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2" - [ -z "$netroot" ] && [ -z "$manualup" ] && exit 0 - [ -n "$manualup" ] && >/tmp/net.$netif.manualup - diff --git a/0029-get-rid-of-tmp-root.info.patch b/0029-get-rid-of-tmp-root.info.patch deleted file mode 100644 index 554baab..0000000 --- a/0029-get-rid-of-tmp-root.info.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 2c0317213ebe3a6cd0f0db5fb5b7a3da0d42cdda Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 14:25:57 +0100 -Subject: [PATCH] get rid of /tmp/root.info - ---- - modules.d/40network/ifup.sh | 2 -- - modules.d/40network/netroot.sh | 2 -- - modules.d/90dmsquash-live/apply-live-updates.sh | 2 -- - modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 -- - modules.d/90livenet/livenetroot.sh | 1 - - modules.d/95iscsi/iscsiroot.sh | 5 +---- - modules.d/99base/init.sh | 11 ++--------- - 7 files changed, 3 insertions(+), 22 deletions(-) - -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index b55362c..ffae15c 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -45,8 +45,6 @@ fi - # bail immediately if the interface is already up - # or we don't need the network - [ -f "/tmp/net.$netif.up" ] && exit 0 --[ -f "/tmp/root.info" ] || exit 0 --. /tmp/root.info - - # disable manual ifup while netroot is set for simplifying our logic - # in netroot case we prefer netroot to bringup $netif automaticlly -diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh -index f44a97b..c5ee84c 100755 ---- a/modules.d/40network/netroot.sh -+++ b/modules.d/40network/netroot.sh -@@ -15,8 +15,6 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh - # instead of real netroot; If It's called without $2, then there's - # no sense in doing something if no (net)root info is available - # or root is already there --[ -e /tmp/root.info ] || exit 1 --. /tmp/root.info - if [ -z "$2" ]; then - [ -d $NEWROOT/proc ] && exit 0 - [ -z "$netroot" ] && exit 1 -diff --git a/modules.d/90dmsquash-live/apply-live-updates.sh b/modules.d/90dmsquash-live/apply-live-updates.sh -index 144e8b9..61da4bf 100755 ---- a/modules.d/90dmsquash-live/apply-live-updates.sh -+++ b/modules.d/90dmsquash-live/apply-live-updates.sh -@@ -1,7 +1,5 @@ - #!/bin/sh - --. /tmp/root.info -- - if [ -b /dev/mapper/live-rw ] && [ -d /updates ]; then - info "Applying updates to live image..." - # avoid overwriting symlinks (e.g. /lib -> /usr/lib) with directories -diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index e3606cf..8a21e44 100755 ---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh -+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh -@@ -5,8 +5,6 @@ - type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh - type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh - --[ -f /tmp/root.info ] && . /tmp/root.info -- - PATH=/usr/sbin:/usr/bin:/sbin:/bin - - if getargbool 0 rd.live.debug -y rdlivedebug; then -diff --git a/modules.d/90livenet/livenetroot.sh b/modules.d/90livenet/livenetroot.sh -index bc62760..617be62 100755 ---- a/modules.d/90livenet/livenetroot.sh -+++ b/modules.d/90livenet/livenetroot.sh -@@ -2,7 +2,6 @@ - # livenetroot - fetch a live image from the network and run it - - type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh --[ -f /tmp/root.info ] && . /tmp/root.info - - . /lib/url-lib.sh - -diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 7b8f63e..1bd6dd3 100755 ---- a/modules.d/95iscsi/iscsiroot.sh -+++ b/modules.d/95iscsi/iscsiroot.sh -@@ -37,9 +37,6 @@ iroot=${iroot#iscsi:} - # figured out a way how to check whether this is built-in or not - modprobe crc32c 2>/dev/null - -- --[ -e /tmp/root.info ] && . /tmp/root.info -- - [ -e /sys/module/bnx2i ] && iscsiuio - - if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then -@@ -54,7 +51,7 @@ fi - - unset iscsi_initiator iscsi_target_name iscsi_target_ip iscsi_target_port - unset iscsi_target_group iscsi_protocol iscsirw iscsi_lun --unset iscsi_username iscsi_password -+unset iscsi_username iscsi_password - unset iscsi_in_username iscsi_in_password - - # override conf settings by command line options -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index d197497..96fd5f2 100755 ---- a/modules.d/99base/init.sh -+++ b/modules.d/99base/init.sh -@@ -131,15 +131,7 @@ source_hook cmdline - [ -z "$root" ] && die "No or empty root= argument" - [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'" - --# Network root scripts may need updated root= options, --# so deposit them where they can see them (udev purges the env) --{ -- echo "root='$root'" -- echo "rflags='$rflags'" -- echo "fstype='$fstype'" -- echo "netroot='$netroot'" -- echo "NEWROOT='$NEWROOT'" --} > /tmp/root.info -+export root rflags fstype netroot NEWROOT - - # pre-udev scripts run before udev starts, and are run only once. - getarg 'rd.break=pre-udev' 'rdbreak=pre-udev' && emergency_shell -n pre-udev "Break before pre-udev" -@@ -314,6 +306,7 @@ else - fi - - export RD_TIMESTAMP -+export -n root rflags fstype netroot NEWROOT - set +x # Turn off debugging for this section - # Clean up the environment - for i in $(export -p); do diff --git a/0030-TEST-20-NFS-use-ext3-on-server-and-fsck-after-kill.patch b/0030-TEST-20-NFS-use-ext3-on-server-and-fsck-after-kill.patch deleted file mode 100644 index 20e61e0..0000000 --- a/0030-TEST-20-NFS-use-ext3-on-server-and-fsck-after-kill.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b8a9dc2d3fdd7596d4d968f761f56f6ced06e9db Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 13:58:48 +0100 -Subject: [PATCH] TEST-20-NFS: use ext3 on server and fsck after kill - ---- - test/TEST-20-NFS/test.sh | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh -index c6a9670..fcd424f 100755 ---- a/test/TEST-20-NFS/test.sh -+++ b/test/TEST-20-NFS/test.sh -@@ -12,8 +12,9 @@ run_server() { - # Start server first - echo "NFS TEST SETUP: Starting DHCP/NFS server" - -+ fsck $TESTDIR/server.ext3 || return 1 - $testdir/run-qemu \ -- -hda $TESTDIR/server.ext2 -m 256M -nographic \ -+ -hda $TESTDIR/server.ext3 -m 256M -nographic \ - -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ - -net socket,listen=127.0.0.1:12320 \ - -serial $SERIAL \ -@@ -203,10 +204,10 @@ test_run() { - - test_setup() { - # Make server root -- dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=60 -- mke2fs -F $TESTDIR/server.ext2 -+ dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=60 -+ mke2fs -j -F $TESTDIR/server.ext3 - mkdir $TESTDIR/mnt -- sudo mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt -+ sudo mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt - - kernel=$KVERSION - ( -@@ -307,7 +308,7 @@ test_setup() { - # Make server's dracut image - $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -m "dash udev-rules base rootfs-block debug kernel-modules" \ -- -d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \ -+ -d "piix ide-gd_mod ata_piix ext3 sd_mod e1000" \ - -f $TESTDIR/initramfs.server $KVERSION || return 1 - - # Make client's dracut image diff --git a/0031-add-initqueue-to-hookdirs-and-create-them-in-dracut-.patch b/0031-add-initqueue-to-hookdirs-and-create-them-in-dracut-.patch deleted file mode 100644 index 4ec1d08..0000000 --- a/0031-add-initqueue-to-hookdirs-and-create-them-in-dracut-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4fed3ddf16431524f07fc8bbad6aec913b6c0777 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 14:46:11 +0100 -Subject: [PATCH] add "initqueue/*" to hookdirs and create them in dracut - itsself - -now we can just use - inst_hook initqueue/settled 99 "$moddir/pollcdrom.sh" ---- - dracut-functions.sh | 6 ++++-- - dracut.sh | 3 +++ - modules.d/99base/module-setup.sh | 4 ---- - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 5cf24a7..05c1d3a 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -34,8 +34,10 @@ fi - - # export standard hookdirs - [[ $hookdirs ]] || { -- hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount" -- hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown cleanup" -+ hookdirs="cmdline pre-udev pre-trigger netroot " -+ hookdirs+="initqueue initqueue/settled initqueue/finished initqueue/timeout " -+ hookdirs+="pre-mount pre-pivot mount " -+ hookdirs+="emergency shutdown-emergency shutdown cleanup " - export hookdirs - } - -diff --git a/dracut.sh b/dracut.sh -index 88691ae..417008c 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -674,6 +674,9 @@ fi - - if [[ $kernel_only != yes ]]; then - mkdir -p "${initdir}/etc/cmdline.d" -+ for _d in $hookdirs; do -+ mkdir -m 0755 -p ${initdir}/lib/dracut/hooks/$_d -+ done - fi - - mkdir -p "$initdir/.kernelmodseen" -diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index fd92644..5a97770 100755 ---- a/modules.d/99base/module-setup.sh -+++ b/modules.d/99base/module-setup.sh -@@ -33,10 +33,6 @@ install() { - [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib - mkdir -m 0755 -p ${initdir}/lib/dracut - mkdir -m 0755 -p ${initdir}/lib/dracut/hooks -- for _d in $hookdirs emergency \ -- initqueue initqueue/timeout initqueue/finished initqueue/settled; do -- mkdir -m 0755 -p ${initdir}/lib/dracut/hooks/$_d -- done - - mkdir -p ${initdir}/tmp - diff --git a/0032-98pollcdrom-factored-out-the-ugly-cdrom-polling-in-t.patch b/0032-98pollcdrom-factored-out-the-ugly-cdrom-polling-in-t.patch deleted file mode 100644 index 8091033..0000000 --- a/0032-98pollcdrom-factored-out-the-ugly-cdrom-polling-in-t.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 74db72dd0b22973cfd9f3cbe832b09096c4e7ab9 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 14:53:22 +0100 -Subject: [PATCH] 98pollcdrom: factored out the ugly cdrom polling in the main - loop - ---- - modules.d/98pollcdrom/module-setup.sh | 16 ++++++++++++++++ - modules.d/98pollcdrom/pollcdrom.sh | 23 +++++++++++++++++++++++ - modules.d/99base/init.sh | 14 -------------- - 3 files changed, 39 insertions(+), 14 deletions(-) - create mode 100755 modules.d/98pollcdrom/module-setup.sh - create mode 100644 modules.d/98pollcdrom/pollcdrom.sh - -diff --git a/modules.d/98pollcdrom/module-setup.sh b/modules.d/98pollcdrom/module-setup.sh -new file mode 100755 -index 0000000..e80ae16 ---- /dev/null -+++ b/modules.d/98pollcdrom/module-setup.sh -@@ -0,0 +1,16 @@ -+#!/bin/bash -+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -+# ex: ts=8 sw=4 sts=4 et filetype=sh -+ -+check() { -+ return 255 -+} -+ -+depends() { -+ return 0 -+} -+ -+install() { -+ inst_hook initqueue/settled 99 "$moddir/pollcdrom.sh" -+} -+ -diff --git a/modules.d/98pollcdrom/pollcdrom.sh b/modules.d/98pollcdrom/pollcdrom.sh -new file mode 100644 -index 0000000..4abc9d7 ---- /dev/null -+++ b/modules.d/98pollcdrom/pollcdrom.sh -@@ -0,0 +1,23 @@ -+#!/bin/sh -+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -+# ex: ts=8 sw=4 sts=4 et filetype=sh -+# -+# Licensed under the GPLv2 -+# -+# Copyright 2008-2012, Red Hat, Inc. -+# Harald Hoyer -+ -+if [ ! -e /sys/module/block/parameters/events_dfl_poll_msecs ]; then -+ # if the kernel does not support autopolling -+ # then we have to do a -+ # dirty hack for some cdrom drives, -+ # which report no medium for quiet -+ # some time. -+ for cdrom in /sys/block/sr*; do -+ [ -e "$cdrom" ] || continue -+ # skip, if cdrom medium was already found -+ strstr "$(udevadm info --query=env --path=${cdrom##/sys})" \ -+ ID_CDROM_MEDIA && continue -+ echo change > "$cdrom/uevent" -+ done -+fi -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index 96fd5f2..f6e4027 100755 ---- a/modules.d/99base/init.sh -+++ b/modules.d/99base/init.sh -@@ -199,20 +199,6 @@ while :; do - # no more udev jobs and queues empty. - sleep 0.5 - -- if [ ! -e /sys/module/block/parameters/events_dfl_poll_msecs ]; then -- # if the kernel does not support autopolling -- # then we have to do a -- # dirty hack for some cdrom drives, -- # which report no medium for quiet -- # some time. -- for cdrom in /sys/block/sr*; do -- [ -e "$cdrom" ] || continue -- # skip, if cdrom medium was already found -- strstr "$(udevadm info --query=env --path=${cdrom##/sys})" \ -- ID_CDROM_MEDIA && continue -- echo change > "$cdrom/uevent" -- done -- fi - - if [ $main_loop -gt $(($RDRETRY/2)) ]; then - for job in $hookdir/initqueue/timeout/*.sh; do diff --git a/0033-move-wait_for_loginit-to-dracut-lib.sh.patch b/0033-move-wait_for_loginit-to-dracut-lib.sh.patch deleted file mode 100644 index e022898..0000000 --- a/0033-move-wait_for_loginit-to-dracut-lib.sh.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4d518aec8614cafe96f585458f97e43d80fe3aa5 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 2 Mar 2012 15:08:25 +0100 -Subject: [PATCH] move wait_for_loginit() to dracut-lib.sh - ---- - modules.d/99base/dracut-lib.sh | 28 ++++++++++++++++++++++++++++ - modules.d/99base/init.sh | 28 ---------------------------- - 2 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index c31854e..80e093b 100755 ---- a/modules.d/99base/dracut-lib.sh -+++ b/modules.d/99base/dracut-lib.sh -@@ -754,6 +754,34 @@ need_shutdown() { - >/run/initramfs/.need_shutdown - } - -+wait_for_loginit() -+{ -+ set +x -+ [ "$RD_DEBUG" = "yes" ] || return -+ [ -e /run/initramfs/loginit.pipe ] || return -+ echo "DRACUT_LOG_END" -+ exec 0<>/dev/console 1<>/dev/console 2<>/dev/console -+ # wait for loginit -+ i=0 -+ while [ $i -lt 10 ]; do -+ if [ ! -e /run/initramfs/loginit.pipe ]; then -+ j=$(jobs) -+ [ -z "$j" ] && break -+ [ -z "${j##*Running*}" ] || break -+ fi -+ sleep 0.1 -+ i=$(($i+1)) -+ done -+ -+ if [ $i -eq 10 ]; then -+ kill %1 >/dev/null 2>&1 -+ kill $(while read line;do echo $line;done /tmp/export.orig - --wait_for_loginit() --{ -- set +x -- [ "$RD_DEBUG" = "yes" ] || return -- [ -e /run/initramfs/loginit.pipe ] || return -- echo "DRACUT_LOG_END" -- exec 0<>/dev/console 1<>/dev/console 2<>/dev/console -- # wait for loginit -- i=0 -- while [ $i -lt 10 ]; do -- if [ ! -e /run/initramfs/loginit.pipe ]; then -- j=$(jobs) -- [ -z "$j" ] && break -- [ -z "${j##*Running*}" ] || break -- fi -- sleep 0.1 -- i=$(($i+1)) -- done -- -- if [ $i -eq 10 ]; then -- kill %1 >/dev/null 2>&1 -- kill $(while read line;do echo $line;done -Date: Tue, 6 Mar 2012 18:25:24 -0500 -Subject: [PATCH] network: refactor stuff from netroot/parse-ip-opts to - net-lib - -Add new functions: all_ifaces_up, get_netroot_ip, ip_is_local, ifdown, -setup_net, set_ifname, ibft_to_cmdline - -Use them in netroot.sh and parse-ip-opts.sh. - -There's also a couple little unrelated cleanups. ---- - modules.d/40network/net-lib.sh | 108 ++++++++++++++++++++++++++++++++++ - modules.d/40network/netroot.sh | 71 ++-------------------- - modules.d/40network/parse-ip-opts.sh | 46 ++------------- - 3 files changed, 120 insertions(+), 105 deletions(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index e3987a4..e51ce94 100644 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -31,3 +31,111 @@ iface_has_link() { - [ "$(cat $interface/carrier)" = 1 ] || return 1 - # XXX Do we need to reset the flags here? anaconda never bothered.. - } -+ -+all_ifaces_up() { -+ local iface="" IFACES="" -+ [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces -+ for iface in $IFACES; do -+ [ -e /tmp/net.$iface.up ] || return 1 -+ done -+} -+ -+get_netroot_ip() { -+ local prefix="" server="" rest="" -+ splitsep "$1" ":" prefix server rest -+ case $server in -+ [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*) echo "$server"; return 0 ;; -+ esac -+ return 1 -+} -+ -+ip_is_local() { -+ strstr "$(ip route get $1 2>/dev/null)" " via " -+} -+ -+ifdown() { -+ local netif="$1" -+ # ip down/flush ensures that routing info goes away as well -+ ip link set $netif down -+ ip addr flush dev $netif -+ echo "#empty" > /etc/resolv.conf -+ # TODO: send "offline" uevent? -+} -+ -+setup_net() { -+ local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES="" -+ [ -e /tmp/net.$netif.up ] || return 1 -+ [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces -+ [ -z "$IFACES" ] && IFACES="$netif" -+ for iface in $IFACES ; do -+ . /tmp/net.$iface.up -+ done -+ # run the scripts written by ifup -+ [ -e /tmp/net.$netif.gw ] && . /tmp/net.$netif.gw -+ [ -e /tmp/net.$netif.hostname ] && . /tmp/net.$netif.hostname -+ [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override -+ [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts -+ # set up resolv.conf -+ [ -e /tmp/net.$netif.resolv.conf ] && \ -+ cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf -+ -+ # Handle STP Timeout: arping the default gateway. -+ # (or the root server, if a) it's local or b) there's no gateway.) -+ # Note: This assumes that if no router is present the -+ # root server is on the same subnet. -+ -+ # Get DHCP-provided router IP, or the cmdline-provided "gw=" argument -+ [ -n "$new_routers" ] && gw_ip=${new_routers%%,*} -+ [ -n "$gw" ] && gw_ip=$gw -+ -+ # Get the "netroot" IP (if there's an IP address in there) -+ netroot_ip=$(get_netroot_ip $netroot) -+ -+ # try netroot if it's local (or there's no gateway) -+ if ip_is_local $netroot_ip || [ -z "$gw_ip" ]; then -+ dest="$netroot_ip" -+ else -+ dest="$gw_ip" -+ fi -+ if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then -+ info "Resolving $dest via ARP on $netif failed" -+ fi -+} -+ -+set_ifname() { -+ local name="$1" mac="$2" num=0 n="" -+ # if it's already set, return the existing name -+ for n in $(getargs ifname=); do -+ strstr "$n" "$mac" && echo ${n%%:*} && return -+ done -+ # otherwise, pick a new name and use that -+ while [ -e /sys/class/$name$num ]; do num=$(($num+1)); done -+ echo "ifname=$name$num:$mac" >> /etc/cmdline.d/45-ifname.conf -+ echo "$name$num" -+} -+ -+ibft_to_cmdline() { -+ local iface="" mac="" dev="" -+ local dhcp="" ip="" gw="" mask="" hostname="" -+ modprobe -q iscsi_ibft -+ ( -+ for iface in /sys/firmware/ibft/ethernet*; do -+ [ -e ${iface}/mac ] || continue -+ mac=$(read a < ${iface}/mac; echo $a) -+ [ -z "$ifname_mac" ] && continue -+ dev=$(set_ifname ibft $ifname_mac) -+ dhcp=$(read a < ${iface}/dhcp; echo $a) -+ if [ -n "$dhcp" ]; then -+ echo "ip=$dev:dhcp" -+ else -+ ip=$(read a < ${iface}/ip-addr; echo $a) -+ gw=$(read a < ${iface}/gateway; echo $a) -+ mask=$(read a < ${iface}/subnet-mask; echo $a) -+ hostname=$(read a < ${iface}/hostname; echo $a) -+ echo "ip=$ip::$gw:$mask:$hostname:$dev:none" -+ fi -+ done -+ ) >> /etc/cmdline.d/40-ibft.conf -+ # reread cmdline -+ unset CMDLINE -+} -diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh -index c5ee84c..ac1c215 100755 ---- a/modules.d/40network/netroot.sh -+++ b/modules.d/40network/netroot.sh -@@ -3,14 +3,12 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh - - PATH=/usr/sbin:/usr/bin:/sbin:/bin --type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh -+command -v getarg >/dev/null || . /lib/dracut-lib.sh -+command -v setup_net >/dev/null || . /lib/net-lib.sh - - # Huh? Empty $1? - [ -z "$1" ] && exit 1 - --# Huh? No interface config? --[ ! -e /tmp/net.$1.up ] && exit 1 -- - # [ ! -z $2 ] means this is for manually bringing up network - # instead of real netroot; If It's called without $2, then there's - # no sense in doing something if no (net)root info is available -@@ -23,10 +21,7 @@ fi - # Let's see if we have to wait for other interfaces - # Note: exit works just fine, since the last interface to be - # online'd should see all files --[ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces --for iface in $IFACES ; do -- [ -e /tmp/net.$iface.up ] || exit 1 --done -+all_ifaces_up || exit 1 - - # Set or override primary interface - netif=$1 -@@ -78,62 +73,13 @@ if [ -z "$2" ]; then - fi - - # We're here, so we can assume that upping interfaces is now ok --[ -z "$IFACES" ] && IFACES="$netif" --for iface in $IFACES ; do -- . /tmp/net.$iface.up --done -- --[ -e /tmp/net.$netif.gw ] && . /tmp/net.$netif.gw --[ -e /tmp/net.$netif.hostname ] && . /tmp/net.$netif.hostname --[ -e /tmp/net.$netif.resolv.conf ] && cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf -- --# Load interface options --[ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override --[ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts -- --# Handle STP Timeout: arping the default router if root server is --# unknown or not local, or if not available the root server. --# Note: This assumes that if no router is present the --# root server is on the same subnet. --# --# TODO There's some netroot variants that don't (yet) have their --# server-ip netroot -- --# Get router IP if set --[ -n "$new_routers" ] && gw_ip=${new_routers%%,*} --[ -n "$gw" ] && gw_ip=$gw --# Get root server IP if set --if [ -n "$netroot" ]; then -- dummy=${netroot#*:} -- dummy=${dummy%%:*} -- case "$dummy" in -- [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*) netroot_ip=$dummy;; -- esac --fi --# Default arping dest to router --dest="$gw_ip" --# Change to arping root server if appropriate --if [ -n "$netroot_ip" ]; then -- if [ -z "$dest" ]; then -- # no gateway so check root server -- dest="$netroot_ip" -- else -- r=$(ip route get "$netroot_ip") -- if ! strstr "$r" ' via ' ; then -- # local root server, so don't arping gateway -- dest="$netroot_ip" -- fi -- fi --fi --if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then -- dinfo "Resolving $dest via ARP on $netif failed" --fi -+setup_net $netif - - # exit in case manually bring up network - [ -n "$2" ] && exit 0 - - # Source netroot hooks before we start the handler --source_all $hookdir/netroot -+source_hook netroot - - # Run the handler; don't store the root, it may change from device to device - # XXX other variables to export? -@@ -149,11 +95,6 @@ if $handler $netif $netroot $NEWROOT; then - else - warn "Mounting root via '$netif' failed" - # If we're trying with multiple interfaces, put that one down. -- # ip down/flush ensures that routeing info goes away as well -- if [ -z "$BOOTDEV" ] ; then -- ip link set $netif down -- ip addr flush dev $netif -- echo "#empty" > /etc/resolv.conf -- fi -+ [ -z "$BOOTDEV" ] && ifdown $netif - fi - exit 0 -diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index c97941e..7851329 100755 ---- a/modules.d/40network/parse-ip-opts.sh -+++ b/modules.d/40network/parse-ip-opts.sh -@@ -14,7 +14,8 @@ - # routing,dns,dhcp-options,etc. - # - --type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh -+command -v getarg >/dev/null || . /lib/dracut-lib.sh -+command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh - - # Check if ip= lines should be used - if getarg ip= >/dev/null ; then -@@ -52,50 +53,15 @@ if [ -n "$NEEDBOOTDEV" ] ; then - [ -z "$BOOTDEV" ] && die "Bootdev argument is empty" - fi - --if [ "ibft" = "$(getarg ip=)" ]; then -- modprobe iscsi_ibft -- num=0 -- ( -- for iface in /sys/firmware/ibft/ethernet*; do -- [ -e ${iface}/mac ] || continue -- ifname_mac=$(read a < ${iface}/mac; echo $a) -- [ -z "$ifname_mac" ] && continue -- unset dev -- for ifname in $(getargs ifname=); do -- if strstr "$ifname" "$ifname_mac"; then -- dev=${ifname%%:*} -- break -- fi -- done -- if [ -z "$dev" ]; then -- ifname_if=ibft$num -- num=$(( $num + 1 )) -- echo "ifname=$ifname_if:$ifname_mac" -- dev=$ifname_if -- fi -- -- dhcp=$(read a < ${iface}/dhcp; echo $a) -- if [ -n "$dhcp" ]; then -- echo "ip=$dev:dhcp" -- else -- ip=$(read a < ${iface}/ip-addr; echo $a) -- gw=$(read a < ${iface}/gateway; echo $a) -- mask=$(read a < ${iface}/subnet-mask; echo $a) -- hostname=$(read a < ${iface}/hostname; echo $a) -- echo "ip=$ip::$gw:$mask:$hostname:$dev:none" -- fi -- done -- ) >> /etc/cmdline -- # reread cmdline -- unset CMDLINE --fi -+# If ibft is requested, read ibft vals and write ip=XXX cmdline args -+[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline - - # Check ip= lines - # XXX Would be nice if we could errorcheck ip addresses here as well - for p in $(getargs ip=); do - ip_to_var $p - -- # skip ibft -+ # skip ibft since we did it above - [ "$autoconf" = "ibft" ] && continue - - # We need to have an ip= line for the specified bootdev -@@ -111,7 +77,7 @@ for p in $(getargs ip=); do - case $autoconf in - error) die "Error parsing option 'ip=$p'";; - bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";; -- none|off) \ -+ none|off) - [ -z "$ip" ] && \ - die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense" - [ -z "$mask" ] && \ diff --git a/0035-add-initqueue-env-and-online-hook.patch b/0035-add-initqueue-env-and-online-hook.patch deleted file mode 100644 index f2bda1d..0000000 --- a/0035-add-initqueue-env-and-online-hook.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 6e3cc00f4882edbabea75945308f8ae7c353bf82 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Tue, 6 Mar 2012 18:25:25 -0500 -Subject: [PATCH] add initqueue --env and "online" hook - -The "online" hook runs whenever a network interface comes online (that -is, once it's actually up and configured). - -The initqueue --env argument is used to set "$netif" to the name of the -newly-online network interface. ---- - dracut-functions.sh | 2 +- - modules.d/40network/net-genrules.sh | 24 +++++++++--------------- - modules.d/99base/initqueue.sh | 15 +++++++-------- - 3 files changed, 17 insertions(+), 24 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 05c1d3a..f4ccf53 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -35,7 +35,7 @@ fi - # export standard hookdirs - [[ $hookdirs ]] || { - hookdirs="cmdline pre-udev pre-trigger netroot " -- hookdirs+="initqueue initqueue/settled initqueue/finished initqueue/timeout " -+ hookdirs+="initqueue initqueue/settled initqueue/online initqueue/finished initqueue/timeout " - hookdirs+="pre-mount pre-pivot mount " - hookdirs+="emergency shutdown-emergency shutdown cleanup " - export hookdirs -diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index 6c46d9a..84fd3ac 100755 ---- a/modules.d/40network/net-genrules.sh -+++ b/modules.d/40network/net-genrules.sh -@@ -31,33 +31,27 @@ fix_bootif() { - IFACES=${bondslaves%% *} - fi - -+ ifup='/sbin/ifup $env{INTERFACE}' -+ [ -z "$netroot" ] && ifup="$ifup -m" -+ - # BOOTIF says everything, use only that one - BOOTIF=$(getarg 'BOOTIF=') - if [ -n "$BOOTIF" ] ; then - BOOTIF=$(fix_bootif "$BOOTIF") -- if [ -n "$netroot" ]; then -- printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE}"\n' "$BOOTIF" -- else -- printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE} -m"\n' "$BOOTIF" -- fi -+ printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="%s"\n' "$BOOTIF" "/sbin/initqueue --onetime $ifup" - - # If we have to handle multiple interfaces, handle only them. - elif [ -n "$IFACES" ] ; then - for iface in $IFACES ; do -- if [ -n "$netroot" ]; then -- printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE}"\n' "$iface" -- else -- printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE} -m"\n' "$iface" -- fi -+ printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="%s"\n' "$iface" "/sbin/initqueue --onetime $ifup" - done - - # Default: We don't know the interface to use, handle all - else -- if [ -n "$netroot" ]; then -- printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE}"\n' -- else -- printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/initqueue --onetime /sbin/ifup $env{INTERFACE} -m"\n' -- fi -+ printf 'SUBSYSTEM=="net", RUN+="%s"\n' "/sbin/initqueue --onetime $ifup" - fi - -+ # Run the "online" hook -+ printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' -+ - } > /etc/udev/rules.d/60-net.rules -diff --git a/modules.d/99base/initqueue.sh b/modules.d/99base/initqueue.sh -index 2c06a0b..3387e88 100755 ---- a/modules.d/99base/initqueue.sh -+++ b/modules.d/99base/initqueue.sh -@@ -25,6 +25,8 @@ while [ $# -gt 0 ]; do - unique="yes";; - --name) - name="$2";shift;; -+ --env) -+ env="$2"; shift;; - *) - break;; - esac -@@ -43,14 +45,11 @@ shift - - [ -x "$exe" ] || exe=$(command -v $exe) - --if [ -n "$onetime" ]; then -- { -- echo '[ -e "$job" ] && rm "$job"' -- echo "$exe $@" -- } > "/tmp/$$-${job}.sh" --else -- echo "$exe $@" > "/tmp/$$-${job}.sh" --fi -+{ -+ [ -n "$onetime" ] && echo '[ -e "$job" ] && rm "$job"' -+ [ -n "$env" ] && echo "$env" -+ echo "$exe $@" -+} > "/tmp/$$-${job}.sh" - - mv -f "/tmp/$$-${job}.sh" "$hookdir/initqueue${qname}/${job}.sh" - [ -z "$qname" ] && >> $hookdir/initqueue/work diff --git a/0036-TEST-20-NFS-test.sh-fsck-with-a.patch b/0036-TEST-20-NFS-test.sh-fsck-with-a.patch deleted file mode 100644 index af017ec..0000000 --- a/0036-TEST-20-NFS-test.sh-fsck-with-a.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0635530dda6e12e2475b43bd65ca4943ce36a7e7 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 8 Mar 2012 12:25:30 +0100 -Subject: [PATCH] TEST-20-NFS/test.sh: fsck with "-a" - ---- - test/TEST-20-NFS/test.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh -index fcd424f..a6bde0e 100755 ---- a/test/TEST-20-NFS/test.sh -+++ b/test/TEST-20-NFS/test.sh -@@ -12,7 +12,7 @@ run_server() { - # Start server first - echo "NFS TEST SETUP: Starting DHCP/NFS server" - -- fsck $TESTDIR/server.ext3 || return 1 -+ fsck -a $TESTDIR/server.ext3 || return 1 - $testdir/run-qemu \ - -hda $TESTDIR/server.ext3 -m 256M -nographic \ - -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ diff --git a/0037-95iscsi-iscsiroot.sh-fix-for-empty-root.patch b/0037-95iscsi-iscsiroot.sh-fix-for-empty-root.patch deleted file mode 100644 index 32fcd31..0000000 --- a/0037-95iscsi-iscsiroot.sh-fix-for-empty-root.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f8208d682fad279bebb2019c5df57f8d42b133c6 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 8 Mar 2012 12:26:00 +0100 -Subject: [PATCH] 95iscsi/iscsiroot.sh: fix for empty $root - ---- - modules.d/95iscsi/iscsiroot.sh | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 1bd6dd3..7fa2715 100755 ---- a/modules.d/95iscsi/iscsiroot.sh -+++ b/modules.d/95iscsi/iscsiroot.sh -@@ -40,7 +40,7 @@ modprobe crc32c 2>/dev/null - [ -e /sys/module/bnx2i ] && iscsiuio - - if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then -- if [ -n "${root%%block:*}" ]; 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 -@@ -167,9 +167,12 @@ handle_netroot() - - # FIXME $iscsi_protocol?? - -- if [ -n "${root%%block:*}" ]; then -- # if root is not specified try to mount the whole iSCSI LUN -+ if [ -z "$root" -o -n "${root%%block:*}" ]; 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 -+ -+ # install mount script -+ echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh - fi - - # inject new exit_if_exists -@@ -185,12 +188,6 @@ handle_netroot() - ${iscsi_password+-w $iscsi_password} \ - ${iscsi_in_username+-U $iscsi_in_username} \ - ${iscsi_in_password+-W $iscsi_in_password} || : -- --# install mount script -- if [ -n "${root%%block:*}" ]; then -- # if root is not specified try to mount the whole iSCSI LUN -- echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh -- fi - } - - # loop over all netroot parameter diff --git a/0038-dracut.spec-add-98pollcdrom.patch b/0038-dracut.spec-add-98pollcdrom.patch deleted file mode 100644 index e6d5471..0000000 --- a/0038-dracut.spec-add-98pollcdrom.patch +++ /dev/null @@ -1,21 +0,0 @@ -From d33d60774f38f43053c2cd1811b78c4f1af0fdc9 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 8 Mar 2012 13:40:21 +0100 -Subject: [PATCH] dracut.spec: add 98pollcdrom - ---- - dracut.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dracut.spec b/dracut.spec -index 91b3451..0275af3 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -272,6 +272,7 @@ rm -rf $RPM_BUILD_ROOT - %{dracutlibdir}/modules.d/97masterkey - %{dracutlibdir}/modules.d/98ecryptfs - %{dracutlibdir}/modules.d/98integrity -+%{dracutlibdir}/modules.d/98pollcdrom - %{dracutlibdir}/modules.d/98selinux - %{dracutlibdir}/modules.d/98syslog - %{dracutlibdir}/modules.d/98usrmount diff --git a/0039-install-ctcm-network-module-on-s390.patch b/0039-install-ctcm-network-module-on-s390.patch deleted file mode 100644 index 1dffe7e..0000000 --- a/0039-install-ctcm-network-module-on-s390.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2ff3fc73c81e0170c46683589d9ad705f3a5ad45 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 2 Mar 2012 11:41:37 +0100 -Subject: [PATCH] install ctcm network module on s390 - -The ctcm module is not loaded automagically because it doesn't pass the -"ether_type_trans" test in 40net/module-setup.sh, so load it explicitly. ---- - modules.d/95znet/module-setup.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/modules.d/95znet/module-setup.sh b/modules.d/95znet/module-setup.sh -index fbb79aa..b354947 100755 ---- a/modules.d/95znet/module-setup.sh -+++ b/modules.d/95znet/module-setup.sh -@@ -13,6 +13,10 @@ depends() { - return 0 - } - -+installkernel() { -+ instmods ctcm -+} -+ - install() { - inst_hook cmdline 30 "$moddir/parse-ccw.sh" - inst /lib/udev/ccw_init diff --git a/0040-img-lib-fix-unpack_img.patch b/0040-img-lib-fix-unpack_img.patch deleted file mode 100644 index 80a5c67..0000000 --- a/0040-img-lib-fix-unpack_img.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 04febed7822979d38cecb47b8675d021bbd7bd72 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Thu, 8 Mar 2012 18:02:29 -0500 -Subject: [PATCH] img-lib: fix unpack_img() - -- det_img should have been det_archive -- for ft=xz|gzip|bzip2, decompr should be "$ft -dc" ---- - modules.d/99img-lib/img-lib.sh | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/modules.d/99img-lib/img-lib.sh b/modules.d/99img-lib/img-lib.sh -index f6be26d..22507aa 100755 ---- a/modules.d/99img-lib/img-lib.sh -+++ b/modules.d/99img-lib/img-lib.sh -@@ -1,12 +1,13 @@ - #!/bin/sh - # img-lib.sh: utilities for dealing with archives and filesystem images. - # --# TODO: identify/unpack rpm, deb? -+# TODO: identify/unpack rpm, deb, maybe others? - - - # super-simple "file" that only identifies archives. - # works with stdin if $1 is not set. - det_archive() { -+ # NOTE: echo -e works in ash and bash, but not dash - local bz="BZh" xz="$(echo -e '\xfd7zXZ')" gz="$(echo -e '\x1f\x8b')" - local headerblock="$(dd ${1:+if=$1} bs=262 count=1 2>/dev/null)" - case "$headerblock" in -@@ -32,7 +33,7 @@ unpack_archive() { - local img="$1" outdir="$2" archiver="" decompr="" - local ft="$(det_archive $img)" - case "$ft" in -- xz|gzip|bzip2) decompr="$decompr -dc" ;; -+ xz|gzip|bzip2) decompr="$ft -dc" ;; - cpio|tar) decompr="cat";; - *) return 1 ;; - esac -@@ -64,7 +65,7 @@ unpack_img() { - [ -r "$img" ] || { warn "can't read img!"; return 1; } - [ -n "$outdir" ] || { warn "unpack_img: no output dir given"; return 1; } - -- if [ "$(det_img $img)" ]; then -+ if [ "$(det_archive $img)" ]; then - unpack_archive "$@" || { warn "can't unpack archive file!"; return 1; } - else - unpack_fs "$@" || { warn "can't unpack filesystem image!"; return 1; } diff --git a/0041-url-lib-clean-up-output.patch b/0041-url-lib-clean-up-output.patch deleted file mode 100644 index 13201f9..0000000 --- a/0041-url-lib-clean-up-output.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7e60091c6b1aefb52581066d9dc04fa0ecc0e5fc Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Thu, 8 Mar 2012 18:03:39 -0500 -Subject: [PATCH] url-lib: clean up output - -For curl_fetch_url (http/https/ftp): -- use --progress-bar (the output is less messy) -- print the URL we're fetching so the user know's what's happening - -For curl and nfs: -- don't echo the filename if it was provided by the user ---- - modules.d/45url-lib/url-lib.sh | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh -index 043a700..e305a68 100755 ---- a/modules.d/45url-lib/url-lib.sh -+++ b/modules.d/45url-lib/url-lib.sh -@@ -53,9 +53,10 @@ add_url_handler() { - - export CURL_HOME="/run/initramfs/url-lib" - mkdir -p $CURL_HOME --curl_args="--location --retry 3 --fail --show-error" -+curl_args="--location --retry 3 --fail --show-error --progress-bar" - curl_fetch_url() { - local url="$1" outloc="$2" -+ echo "$url" > /proc/self/fd/0 - if [ -n "$outloc" ]; then - curl $curl_args --output "$outloc" "$url" || return $? - else -@@ -64,7 +65,7 @@ curl_fetch_url() { - outloc="$outdir/$(ls -A $outdir)" - fi - [ -f "$outloc" ] || return 253 -- echo "$outloc" -+ if [ -z "$2" ]; then echo "$outloc" ; fi - } - add_url_handler curl_fetch_url http https ftp - -@@ -110,6 +111,6 @@ nfs_fetch_url() { - cp -f "$mntdir/$filename" "$outloc" || return $? - fi - [ -f "$outloc" ] || return 253 -- echo "$outloc" -+ if [ -z "$2" ]; then echo "$outloc" ; fi - } - command -v nfs_to_var >/dev/null && add_url_handler nfs_fetch_url nfs nfs4 diff --git a/0042-Add-live.updates-to-livenet-module.patch b/0042-Add-live.updates-to-livenet-module.patch deleted file mode 100644 index ee044c4..0000000 --- a/0042-Add-live.updates-to-livenet-module.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 52c4c9484d0cdccad7d9a3cc684677e784edab53 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Thu, 8 Mar 2012 18:03:48 -0500 -Subject: [PATCH] Add 'live.updates' to livenet module - -live.updates allows you to specify the URL for an "updates image" that -should be applied to the live runtime before switch_root. - -The URL can be anything supported by url-lib (http, https, ftp, possibly -nfs) and the image can be anything supported by img-lib (xz/gzip -compressed cpio/tar, uncompressed cpio/tar, filesystem image, etc.) ---- - modules.d/90livenet/fetch-liveupdate.sh | 32 +++++++++++++++++++++++++++++++ - modules.d/90livenet/module-setup.sh | 1 + - modules.d/90livenet/parse-livenet.sh | 12 +++++++++++- - 3 files changed, 44 insertions(+), 1 deletion(-) - create mode 100755 modules.d/90livenet/fetch-liveupdate.sh - -diff --git a/modules.d/90livenet/fetch-liveupdate.sh b/modules.d/90livenet/fetch-liveupdate.sh -new file mode 100755 -index 0000000..8a5fdec ---- /dev/null -+++ b/modules.d/90livenet/fetch-liveupdate.sh -@@ -0,0 +1,32 @@ -+#!/bin/sh -+# fetch-liveupdate - fetch an update image for dmsquash-live media. -+# this gets called by the "initqueue/online" hook for each network interface -+# that comes online. -+ -+# no updates requested? we're not needed. -+[ -e /tmp/liveupdates.info ] || return 0 -+ -+command -v getarg >/dev/null || . /lib/dracut-lib.sh -+command -v fetch_url >/dev/null || . /lib/url-lib.sh -+command -v unpack_img >/dev/null || . /lib/img-lib.sh -+ -+read url < /tmp/liveupdates.info -+ -+info "fetching live updates from $url" -+ -+fetch_url "$url" /tmp/updates.img -+if [ $? != 0 ]; then -+ warn "failed to fetch update image!" -+ warn "url: $url" -+ return 1 -+fi -+ -+unpack_img /tmp/updates.img /updates.tmp.$$ -+if [ $? != 0 ]; then -+ warn "failed to unpack update image!" -+ warn "url: $url" -+ return 1 -+fi -+rm -rf /updates -+mv -f /updates.tmp.$$ /updates -+mv /tmp/liveupdates.info /tmp/liveupdates.done -diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh -index c650ef3..2071553 100755 ---- a/modules.d/90livenet/module-setup.sh -+++ b/modules.d/90livenet/module-setup.sh -@@ -12,6 +12,7 @@ depends() { - - install() { - inst_hook cmdline 29 "$moddir/parse-livenet.sh" -+ inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh" - inst "$moddir/livenetroot.sh" "/sbin/livenetroot" - } - -diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh -index 926dba2..3553cef 100755 ---- a/modules.d/90livenet/parse-livenet.sh -+++ b/modules.d/90livenet/parse-livenet.sh -@@ -1,10 +1,20 @@ --#!/bin/bash -+#!/bin/sh - # live net images - just like live images, but specified like: - # root=live:[url-to-backing-file] - - [ -z "$root" ] && root=$(getarg root=) - . /lib/url-lib.sh - -+# live updates -+updates=$(getarg live.updates=) -+if [ -n "$updates" ]; then -+ # make sure network comes up even if we're doing a local live device -+ [ -z "$netroot" ] && echo "rd.neednet=1" > /etc/cmdline.d/90livenet.conf -+ echo "$updates" > /tmp/liveupdates.info -+ echo '[ -e /tmp/liveupdates.done ]' > \ -+ $hookdir/initqueue/finished/liveupdates.sh -+fi -+ - str_starts "$root" "live:" && liveurl="$root" - str_starts "$liveurl" "live:" || return - liveurl="${liveurl#live:}" diff --git a/0043-README-added-github-and-sourceforge-git-links.patch b/0043-README-added-github-and-sourceforge-git-links.patch deleted file mode 100644 index c47321e..0000000 --- a/0043-README-added-github-and-sourceforge-git-links.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 803be5aa50b4ad7c76b83a2df23a47ae4744aabf Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Mar 2012 11:48:48 +0100 -Subject: [PATCH] README: added github and sourceforge git links - ---- - README | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/README b/README -index 6edc2c0..f9198bf 100644 ---- a/README -+++ b/README -@@ -62,9 +62,17 @@ Git: - http://git.kernel.org/pub/scm/boot/dracut/dracut.git - https://git.kernel.org/pub/scm/boot/dracut/dracut.git - -+ git://github.com/haraldh/dracut.git -+ -+ git://dracut.git.sourceforge.net/gitroot/dracut/dracut -+ - Git Web: - http://git.kernel.org/?p=boot/dracut/dracut.git - -+ https://haraldh@github.com/haraldh/dracut.git -+ -+ http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut -+ - Git Web RSS Feed: - http://git.kernel.org/?p=boot/dracut/dracut.git;a=rss - diff --git a/0044-AUTHORS-update.patch b/0044-AUTHORS-update.patch deleted file mode 100644 index ae8bd4e..0000000 --- a/0044-AUTHORS-update.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3a00cf9eccaadb44fd22d8f49c99b4d6dfe16009 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Mar 2012 11:50:07 +0100 -Subject: [PATCH] AUTHORS: update - ---- - AUTHORS | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index 12dbe15..f7a1007 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -5,24 +5,24 @@ Warren Togami - Amadeusz Żołnowski - Jeremy Katz - David Dillow --Michal Soltys - Will Woods -+Michal Soltys -+Dave Young -+Amerigo Wang - Andrey Borzenkov -+Colin Guthrie - Andreas Thienemann - Hans de Goede - Peter Jones --Amerigo Wang --Colin Guthrie - John Reiser - Luca Berra --Dave Young - Daniel Drake - Marc Grimme -+Dan Horák - Roberto Sassu - Anton Blanchard - Bill Nottingham - Brian C. Lane --Dan Horák - David Cantrell - Lance Albertson - Marian Ganisin -@@ -47,6 +47,7 @@ Frederic Crozat - Glen Gray - Hermann Gausterer - James Laska -+Jan Stodola - Konrad Rzeszutek Wilk - Leho Kraav - Lubomir Rintel diff --git a/0045-remove-dracut-gencmdline.patch b/0045-remove-dracut-gencmdline.patch deleted file mode 100644 index ae01905..0000000 --- a/0045-remove-dracut-gencmdline.patch +++ /dev/null @@ -1,831 +0,0 @@ -From dc824f19943d31bfba33f017be63e0c8ed74bb47 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Mar 2012 13:27:13 +0100 -Subject: [PATCH] remove dracut-gencmdline - ---- - Makefile | 4 +- - dracut-gencmdline.8.xml | 46 --- - dracut-gencmdline.sh | 716 ----------------------------------------------- - dracut.spec | 2 - - 4 files changed, 1 insertion(+), 767 deletions(-) - delete mode 100644 dracut-gencmdline.8.xml - delete mode 100755 dracut-gencmdline.sh - -diff --git a/Makefile b/Makefile -index 13c6c84..d79b2b0 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,7 +9,7 @@ sysconfdir ?= ${prefix}/etc - bindir ?= ${prefix}/bin - mandir ?= ${prefix}/share/man - --manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8 dracut-gencmdline.8 -+manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8 - - .PHONY: install clean archive rpm testimage test all check AUTHORS doc - -@@ -32,7 +32,6 @@ install: doc - mkdir -p $(DESTDIR)$(pkglibdir)/modules.d - mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut -- install -m 0755 dracut-gencmdline.sh $(DESTDIR)$(bindir)/dracut-gencmdline - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages - install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd - install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd -@@ -45,7 +44,6 @@ install: doc - cp -arx modules.d $(DESTDIR)$(pkglibdir) - install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8 - install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8 -- install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8 - install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5 - install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7 - ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7 -diff --git a/dracut-gencmdline.8.xml b/dracut-gencmdline.8.xml -deleted file mode 100644 -index a893d0b..0000000 ---- a/dracut-gencmdline.8.xml -+++ /dev/null -@@ -1,46 +0,0 @@ -- -- -- -- -- --DRACUT-GENCMDLINE --8 --June 2009 --Linux -- -- --dracut-gencmdline --generates kernel command line parameters for the dracut generated initramfs -- -- -- -- -- dracut-gencmdline -- -- -- -- -- --DESCRIPTION --dracut-gencmdline --generates kernel command line parameters for the dracut generated initramfs, which are very specific to the host system. -- -- -- --AUTHORS -- --Harald Hoyer <harald@redhat.com> -- -- -- --AVAILABILITY --The dracut-gencmdline command is part of the dracut package and is available from --https://dracut.wiki.kernel.org -- -- -- --SEE ALSO --dracut8 -- -- -- -diff --git a/dracut-gencmdline.sh b/dracut-gencmdline.sh -deleted file mode 100755 -index c909e27..0000000 ---- a/dracut-gencmdline.sh -+++ /dev/null -@@ -1,716 +0,0 @@ --#!/bin/bash --norc --# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- --# ex: ts=8 sw=4 sts=4 et filetype=sh --# --# Copyright 2005-2009 Red Hat, Inc. 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 . --# --# code taken from mkinitrd --# --#. /usr/libexec/initrd-functions -- --IF_verbose="" --function set_verbose() { -- case $1 in -- 1|true|yes|on) -- IF_verbose="-v" -- ;; -- 0|false|no|off) -- IF_verbose="" -- ;; -- esac --} -- --function is_verbose() { -- [ -n "$IF_verbose" ] && return 0 -- return 1 --} -- --function get_verbose() { -- echo "$IF_verbose" -- is_verbose --} -- -- --function get_numeric_dev() { -- ( -- fmt="%d:%d" -- if [ "$1" == "hex" ]; then -- fmt="%x:%x" -- fi -- ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }' -- ) 2>/dev/null --} -- -- --function error() { -- echo "$@" >&2 --} -- --function vecho() { -- is_verbose && echo "$@" --} -- --# module dep finding and installation functions --moduledep() { -- MPARGS="" -- if [ "$1" == "--ignore-install" ]; then -- MPARGS="$MPARGS --ignore-install" -- shift -- fi -- vecho -n "Looking for deps of module $1" -- deps="" -- deps=$(modprobe $MPARGS --set-version $kernel --quiet --show-depends $1 | awk '/^insmod / { print gensub(".*/","","g",$2) }' | while read foo ; do [ "${foo%%.ko}" != "$1" ] && echo -n "${foo%%.ko} " ; done) -- [ -n "$deps" ] && vecho ": $deps" || vecho --} -- --export MALLOC_PERTURB_=204 -- --PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH --export PATH -- --# Set the umask. For iscsi, the initrd can contain plaintext --# password (chap secret), so only allow read by owner. --umask 077 -- --VERSION=6.0.87 -- --PROBE="yes" --MODULES="" --GRAPHICSMODS="" --PREMODS="" --DMRAIDS="" --ncryptodevs=0 --ncryptoparts=0 --ncryptolvs=0 --ncryptoraids=0 --root="" --scsi_wait_scan="no" -- --NET_LIST="" --LD_SO_CONF=/etc/ld.so.conf --LD_SO_CONF_D=/etc/ld.so.conf.d/ -- --[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd -- --CONFMODS="$MODULES" --MODULES="" --ARCH=$(uname -m | sed -e 's/s390x/s390/') -- --compress=1 --allowmissing="" --target="" --kernel="" --force="" --img_vers="" --builtins="" --modulefile=/etc/modules.conf --[ "$ARCH" != "s390" ] && withusb=1 --rc=0 --nolvm="" --nodmraid="" -- --IMAGESIZE=8000 --PRESCSIMODS="" --fstab="/etc/fstab" -- --vg_list="" --net_list="$NET_LIST" -- --usage () { -- if [ "$1" == "-n" ]; then -- cmd=echo -- else -- cmd=error -- fi -- -- $cmd "usage: `basename $0` [--version] [--help] [-v] [-f]" -- -- if [ "$1" == "-n" ]; then -- exit 0 -- else -- exit 1 -- fi --} -- -- --qpushd() { -- pushd "$1" >/dev/null 2>&1 --} -- --qpopd() { -- popd >/dev/null 2>&1 --} -- -- --freadlink() { -- readlink -f "$1" --} -- --resolve_device_name() { -- if [ -z "${1##UUID=*}" ]; then -- real=$(freadlink /dev/disk/by-uuid/${1##UUID=}) -- [ -b $real ] && { echo $real; return; } -- fi -- if [ -z "${1##LABEL=*}" ]; then -- real=$(freadlink /dev/disk/by-label/${1##LABEL=}) -- [ -b $real ] && { echo $real; return; } -- fi -- echo "$1" --} -- --finddevnoinsys() { -- majmin="$1" -- if [ -n "$majmin" ]; then -- dev=$(for x in /sys/block/* ; do find $x/ -name dev ; done | while read device ; do \ -- echo "$majmin" | cmp -s $device && echo $device ; done) -- if [ -n "$dev" ]; then -- dev=${dev%%/dev} -- dev=${dev%%/} -- echo "$dev" -- return 0 -- fi -- fi -- return 1 --} -- --finddevicedriverinsys () { -- if is_iscsi $PWD; then -- handleiscsi "$PWD" -- return -- fi -- while [ "$PWD" != "/sys/devices" ]; do -- deps= -- if [ -f modalias ]; then -- MODALIAS=$(cat modalias) -- if [ "${MODALIAS::7}" == "scsi:t-" ]; then -- scsi_wait_scan=yes -- fi -- moduledep $MODALIAS -- unset MODALIAS -- fi -- -- cd .. -- done --} -- --findstoragedriverinsys () { -- local sysfs=$(freadlink "$1") -- -- # if its a partition look at the device holding the partition -- if [ -f "$sysfs/start" ]; then -- sysfs=$(freadlink ${sysfs%/*}) -- fi -- -- if [[ ! "$sysfs" =~ ^/sys/.*block/.*$ ]]; then -- #error "WARNING: $sysfs is a not a block sysfs path, skipping" -- return -- fi -- -- case " $handleddevices " in -- *" $sysfs "*) -- return ;; -- *) handleddevices="$handleddevices $sysfs" ;; -- esac -- -- if [[ "$sysfs" =~ ^/sys/.*block/md[0-9]+$ ]]; then -- local raid=${sysfs##*/} -- vecho "Found MDRAID component $raid" -- handleraid $raid -- fi -- if [[ "$sysfs" =~ ^/sys/.*block/dm-[0-9]+$ ]]; then -- vecho "Found DeviceMapper component ${sysfs##*/}" -- handledm $(cat $sysfs/dev |cut -d : -f 1) $(cat $sysfs/dev |cut -d : -f 2) -- fi -- -- for slave in $(ls -d "$sysfs"/slaves/* 2>/dev/null) ; do -- findstoragedriverinsys "$slave" -- done -- -- if [ -L "$sysfs/device" ]; then -- qpushd $(freadlink "$sysfs/device") -- finddevicedriverinsys -- qpopd -- fi --} -- --findstoragedriver () { -- local device="$1" -- -- if [ ! -b "$device" ]; then -- #error "WARNING: $device is a not a block device, skipping" -- return -- fi -- -- local majmin=$(get_numeric_dev dec "$device") -- local sysfs=$(finddevnoinsys "$majmin") -- -- if [ -z "$sysfs" ]; then -- #error "WARNING: $device major:minor $majmin not found, skipping" -- return -- fi -- -- vecho "Looking for driver for $device in $sysfs" -- findstoragedriverinsys "$sysfs" --} -- --iscsi_get_rec_val() { -- -- # The open-iscsi 742 release changed to using flat files in -- # /var/lib/iscsi. -- -- result=$(grep "^${2} = " "$1" | sed -e s'/.* = //') --} -- --iscsi_set_parameters() { -- path=$1 -- vecho setting iscsi parameters -- -- tmpfile=$(mktemp) -- -- # Check once before getting explicit values, so we can output a decent -- # error message. -- /sbin/iscsiadm --show -m session -r $path > $tmpfile -- if [ ! -s $tmpfile ]; then -- echo Unable to find iscsi record for $path -- exit 1 -- fi -- -- nit_name=$(grep "^InitiatorName=" /etc/iscsi/initiatorname.iscsi | \ -- sed -e "s/^InitiatorName=//") -- -- iscsi_get_rec_val $tmpfile "node.name" -- tgt_name=${result} -- iscsi_get_rec_val $tmpfile "node.tpgt" -- tpgt=${result} -- # iscsistart wants node.conn[0].address / port -- iscsi_get_rec_val $tmpfile 'node.conn\[0\].address' -- tgt_ipaddr=${result} -- iscsi_get_rec_val $tmpfile 'node.conn\[0\].port' -- tgt_port=${result} -- -- # Note: we get chap secrets (passwords) in plaintext, and also store -- # them in the initrd. -- -- iscsi_get_rec_val $tmpfile "node.session.auth.username" -- chap=${result} -- if [ -n "${chap}" -a "${chap}" != "" ]; then -- chap="-u ${chap}" -- iscsi_get_rec_val $tmpfile "node.session.auth.password" -- chap_pw="-w ${result}" -- else -- chap="" -- fi -- -- iscsi_get_rec_val $tmpfile "node.session.auth.username_in" -- chap_in=${result} -- if [ -n "${chap_in}" -a "${chap_in}" != "" ]; then -- chap_in="-U ${chap_in}" -- iscsi_get_rec_val $tmpfile "node.session.auth.password_in" -- chap_in_pw="-W ${result}" -- else -- chap_in="" -- fi -- -- rm $tmpfile --} -- --emit_iscsi () { -- if [ -n "${iscsi_devs}" ]; then -- for dev in ${iscsi_devs}; do -- iscsi_set_parameters $dev -- # recid is not really used, just use 0 for it -- echo "/bin/iscsistart -t ${tgt_name} -i ${nit_name} \ -- -g ${tpgt} -a ${tgt_ipaddr} ${chap} ${chap_pw} \ -- ${chap_in} ${chap_in_pw}" -- done -- fi --} -- --is_iscsi() { -- path=$1 -- if echo $path | grep -q "/platform/host[0-9]*/session[0-9]*/target[0-9]*:[0-9]*:[0-9]*/[0-9]*:[0-9]*:[0-9]*:[0-9]*"; then -- return 0 -- else -- return 1 -- fi --} -- --handledm() { -- major=$1 -- minor=$2 -- while read dmstart dmend dmtype r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 ; do -- case "$dmtype" in -- crypt) -- # this device is encrypted; find the slave device and see -- # whether the encryption is LUKS; if not, bail. -- slavedev=$(finddevnoinsys $r3) -- # get the basename, then s,!,/, in case it's a cciss device -- slavedev=$(echo ${slavedev##*/} | tr '!' '/') -- cryptsetup isLuks "/dev/$slavedev" 2>/dev/null || continue -- find_base_dm_mods -- dmname=$(dmsetup info -j $major -m $minor -c --noheadings -o name) -- # do the device resolution dance to get /dev/mapper/foo -- # since 'lvm lvs' doesn't like dm-X device nodes -- if [[ "$slavedev" =~ ^dm- ]]; then -- majmin=$(get_numeric_dev dec "/dev/$slavedev") -- for dmdev in /dev/mapper/* ; do -- dmnum=$(get_numeric_dev dev $dmdev) -- if [ $dmnum = $majmin ]; then -- slavedev=${dmdev#/dev/} -- break -- fi -- done -- fi -- -- # determine if $slavedev is an LV -- # if so, add the device to latecryptodevs -- # if not, add the device to cryptodevs -- local vg=$(lvshow /dev/$slavedev) -- if [ -n "$vg" ]; then -- eval cryptolv${ncryptolvs}='"'/dev/$slavedev $dmname'"' -- let ncryptolvs++ -- elif grep -q "^$slavedev :" /proc/mdstat ; then -- eval cryptoraid${ncryptoraids}='"'/dev/$slavedev $dmname'"' -- let ncryptoraids++ -- else -- eval cryptoparts${ncryptoparts}='"'/dev/$slavedev $dmname'"' -- let ncryptoparts++ -- fi -- -- let ncryptodevs++ -- findstoragedriver "/dev/$slavedev" -- ;; -- esac -- done << EOF -- $(dmsetup table -j $major -m $minor 2>/dev/null) --EOF -- local name=$(dmsetup info --noheadings -c -j $major -m $minor -o name) -- local vg=$(lvshow "/dev/mapper/$name") -- local raids=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks") -- if [ -n "$vg" ]; then -- vg=`echo $vg` # strip whitespace -- case " $vg_list " in -- *" $vg "*) ;; -- *) vg_list="$vg_list $vg" -- [ -z "$nolvm" ] && find_base_dm_mods -- ;; -- esac -- fi -- for raid in $raids ; do -- if [ "$raid" == "$name" ]; then -- case " $DMRAIDS " in -- *" $raid "*) ;; -- *) DMRAIDS="$DMRAIDS $raid" -- [ -z "$nodmraid" ] && find_base_dm_mods -- ;; -- esac -- break -- fi -- done --} -- --handleiscsi() { -- vecho "Found iscsi component $1" -- -- # We call iscsi_set_parameters once here to figure out what network to -- # use (it sets tgt_ipaddr), and once again to emit iscsi values, -- # not very efficient. -- iscsi_set_parameters $1 -- iscsi_devs="$iscsi_devs $1" -- netdev=$(/sbin/ip route get to $tgt_ipaddr | \ -- sed 's|.*dev \(.*\).*|\1|g' | awk '{ print $1; exit }') -- addnetdev $netdev --} -- --handleraid() { -- local start=0 -- -- if [ -n "$noraid" -o ! -f /proc/mdstat ]; then -- return 0 -- fi -- -- levels=$(awk "/^$1[ ]*:/ { print\$4 }" /proc/mdstat) -- -- for level in $levels ; do -- case $level in -- linear) -- start=1 -- ;; -- multipath) -- start=1 -- ;; -- raid[01] | raid10) -- start=1 -- ;; -- raid[456]) -- start=1 -- ;; -- *) -- error "raid level $level (in /proc/mdstat) not recognized" -- ;; -- esac -- done -- if [ "$start" = 1 ]; then -- raiddevices="$raiddevices $1" -- fi -- return $start --} -- --lvshow() { -- lvm lvs --ignorelockingfailure --noheadings -o vg_name \ -- $1 2>/dev/null | egrep -v '^ *(WARNING:|Volume Groups with)' --} -- --vgdisplay() { -- lvm vgdisplay --ignorelockingfailure -v $1 2>/dev/null | -- sed -n 's/PV Name//p' --} -- --dmmods_found="n" --find_base_dm_mods() --{ -- [ "$dmmods_found" == "n" ] || return -- dmmods_found="y" --} -- --savedargs=$* --while [ $# -gt 0 ]; do -- case $1 in -- --fstab*) -- if [ "$1" != "${1##--fstab=}" ]; then -- fstab=${1##--fstab=} -- else -- fstab=$2 -- shift -- fi -- ;; -- -- -- -v|--verbose) -- set_verbose true -- ;; -- --net-dev*) -- if [ "$1" != "${1##--net-dev=}" ]; then -- net_list="$net_list ${1##--net-dev=}" -- else -- net_list="$net_list $2" -- shift -- fi -- ;; -- --rootdev*) -- if [ "$1" != "${1##--rootdev=}" ]; then -- rootdev="${1##--rootdev=}" -- else -- rootdev="$2" -- shift -- fi -- ;; -- --thawdev*) -- if [ "$1" != "${1##--thawdev=}" ]; then -- thawdev="${1##--thawdev=}" -- else -- thawdev="$2" -- shift -- fi -- ;; -- --rootfs*) -- if [ "$1" != "${1##--rootfs=}" ]; then -- rootfs="${1##--rootfs=}" -- else -- rootfs="$2" -- shift -- fi -- ;; -- --rootopts*) -- if [ "$1" != "${1##--rootopts=}" ]; then -- rootopts="${1##--rootopts=}" -- else -- rootopts="$2" -- shift -- fi -- ;; -- --root*) -- if [ "$1" != "${1##--root=}" ]; then -- root="${1##--root=}" -- else -- root="$2" -- shift -- fi -- ;; -- --loopdev*) -- if [ "$1" != "${1##--loopdev=}" ]; then -- loopdev="${1##--loopdev=}" -- else -- loopdev="$2" -- shift -- fi -- ;; -- --loopfs*) -- if [ "$1" != "${1##--loopfs=}" ]; then -- loopfs="${1##--loopfs=}" -- else -- loopfs="$2" -- shift -- fi -- ;; -- --loopopts*) -- if [ "$1" != "${1##--loopopts=}" ]; then -- loopopts="${1##--loopopts=}" -- else -- loopopts="$2" -- shift -- fi -- ;; -- --looppath*) -- if [ "$1" != "${1##--looppath=}" ]; then -- looppath="${1##--looppath=}" -- else -- looppath="$2" -- shift -- fi -- ;; -- --help) -- usage -n -- ;; -- *) -- if [ -z "$target" ]; then -- target=$1 -- elif [ -z "$kernel" ]; then -- kernel=$1 -- else -- usage -- fi -- ;; -- esac -- -- shift --done -- --[ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) --[ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab) --[ -z "$rootopts" ] && rootopts="defaults" -- -- --[ -z "$rootdev" ] && rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab) -- # check if it's nfsroot --physdev="" --if [ "$rootfs" == "nfs" ]; then -- if [ "x$net_list" == "x" ]; then -- handlenfs $rootdev -- fi --else -- # check if it's root by label -- rdev=$rootdev -- rdev=$(resolve_device_name "$rdev") -- rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,_netdev//' -e 's/_netdev//' -e 's/,_rnetdev//' -e 's/_rnetdev//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' -e 's/^r[ow]$/defaults/' -e 's/$/,ro/') -- findstoragedriver "$rdev" --fi -- -- # find the first swap dev which would get used for swsusp --[ -z "$thawdev" ] && thawdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab) --swsuspdev="$thawdev" --if [ -n "$swsuspdev" ]; then -- swsuspdev=$(resolve_device_name "$swsuspdev") -- findstoragedriver "$swsuspdev" --fi -- -- --cemit() --{ -- cat --} -- --emit() --{ -- NONL="" -- if [ "$1" == "-n" ]; then -- NONL="-n" -- shift -- fi -- echo $NONL "$@" --} -- --emitdmraids() --{ -- if [ -z "$nodmraid" -a -n "$DMRAIDS" ]; then -- for raid in $DMRAIDS; do -- echo -n "rd_DM_UUID=$raid " -- done -- fi --} -- -- --# HACK: module loading + device creation isn't necessarily synchronous... --# this will make sure that we have all of our devices before trying --# things like RAID or LVM --emitdmraids -- --emitcrypto() --{ -- local luksuuid=$(grep "^$2 " /etc/crypttab 2>/dev/null| awk '{ print $2 }') -- if [ -z "$luksuuid" ]; then -- luksuuid="$2" -- fi -- luksuuid=${luksuuid##UUID=} -- echo -n "rd_LUKS_UUID=$luksuuid " --} -- --if [ -n "$raiddevices" ]; then -- for dev in $raiddevices; do -- uid=$(udevadm info --query=env --name /dev/${dev}|grep MD_UUID) -- uid=${uid##MD_UUID=} -- [ -n "$uid" ] && echo -n "rd_MD_UUID=$uid " -- done --else -- echo -n "rd_NO_MD " --fi -- --if [ -z "$nolvm" -a -n "$vg_list" ]; then -- for vg in $vg_list; do -- echo -n "rd_LVM_VG=$vg " -- done --else -- echo -n "rd_NO_LVM " --fi -- --cryptdevs="$(echo ${!cryptoraid@} ${!cryptopart@} ${!cryptolv@})" -- --if [ -z "$cryptdevs" ]; then -- echo -n "rd_NO_LUKS " --else -- for cryptdev in ${!cryptoraid@} ${!cryptopart@} ${!cryptolv@} ; do -- emitcrypto `eval echo '$'$cryptdev` -- done --fi -- --# output local keyboard/18n settings --[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard --[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do -- val=$(eval echo \$$i) -- [[ $val ]] && echo -n "$i=$val " --done -- --if [ -n "$KEYBOARDTYPE" -a "$KEYBOARDTYPE" != "pc" ]; then -- echo -n "KEYBOARDTYPE=$KEYBOARDTYPE " --fi -- --if [ -n "$rootdev" ]; then -- echo -n "root=$rootdev " --fi -- --echo -diff --git a/dracut.spec b/dracut.spec -index 0275af3..7a058ae 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -318,9 +318,7 @@ rm -rf $RPM_BUILD_ROOT - - %files tools - %defattr(-,root,root,0755) --%{_mandir}/man8/dracut-gencmdline.8* - %{_mandir}/man8/dracut-catimages.8* --%{_bindir}/dracut-gencmdline - %{_bindir}/dracut-catimages - %dir /boot/dracut - %dir /var/lib/dracut diff --git a/0046-replace-xml-documentation-with-asciidoc.patch b/0046-replace-xml-documentation-with-asciidoc.patch deleted file mode 100644 index 27379f8..0000000 --- a/0046-replace-xml-documentation-with-asciidoc.patch +++ /dev/null @@ -1,5462 +0,0 @@ -From 888d53f270a1a163460d764c886c23f2f276c035 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Mar 2012 13:58:26 +0100 -Subject: [PATCH] replace xml documentation with asciidoc - ---- - Makefile | 7 +- - dracut-catimages.8.asc | 59 +++ - dracut-catimages.8.xml | 116 ----- - dracut.8.asc | 378 ++++++++++++++ - dracut.8.xml | 684 ------------------------- - dracut.asc | 1026 +++++++++++++++++++++++++++++++++++++ - dracut.cmdline.7.asc | 603 ++++++++++++++++++++++ - dracut.cmdline.7.xml | 1324 ------------------------------------------------ - dracut.conf.5.asc | 135 +++++ - dracut.conf.5.xml | 297 ----------- - dracut.xml | 729 -------------------------- - 11 files changed, 2207 insertions(+), 3151 deletions(-) - create mode 100644 dracut-catimages.8.asc - delete mode 100644 dracut-catimages.8.xml - create mode 100644 dracut.8.asc - delete mode 100644 dracut.8.xml - create mode 100644 dracut.asc - create mode 100644 dracut.cmdline.7.asc - delete mode 100644 dracut.cmdline.7.xml - create mode 100644 dracut.conf.5.asc - delete mode 100644 dracut.conf.5.xml - delete mode 100644 dracut.xml - -diff --git a/Makefile b/Makefile -index d79b2b0..bd27d06 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,11 +19,16 @@ all: syncheck - %: %.xml - xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - --dracut.html: dracut.xml $(manpages) -+%.xml: %.asc -+ asciidoc -d manpage -b docbook -o $@ $< -+ -+dracut.html: dracut.asc $(manpages) -+ asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc - xsltproc -o dracut.html --xinclude -nonet \ - --stringparam draft.mode yes \ - --stringparam html.stylesheet http://docs.redhat.com/docs/en-US/Common_Content/css/default.css \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml -+ rm dracut.xml - - install: doc - mkdir -p $(DESTDIR)$(pkglibdir) -diff --git a/dracut-catimages.8.asc b/dracut-catimages.8.asc -new file mode 100644 -index 0000000..57f422c ---- /dev/null -+++ b/dracut-catimages.8.asc -@@ -0,0 +1,59 @@ -+DRACUT-CATIMAGES(8) -+=================== -+:doctype: manpage -+:man source: dracut -+:man manual: dracut -+ -+NAME -+---- -+dracut-catimages - creates initial ramdisk image by concatenating images -+ -+SYNOPSIS -+-------- -+**dracut-catimages** [_OPTION_...] __ [__...] -+ -+DESCRIPTION -+----------- -+dracut-catimages creates an initial ramdisk image by concatenating several -+images from the command line and /boot/dracut/*.img -+ -+OPTIONS -+------- -+**-f, --force**:: -+ overwrite existing initramfs file. -+ -+**-i, --imagedir**:: -+ Directory with additional images to add (default: /boot/dracut/) -+ -+**-o, --overlaydir**:: -+ Overlay directory, which contains additional files that will be used to -+ create an additional image -+ -+**--nooverlay**:: Do not use the overlay directory -+ -+**--noimagedir**:: Do not use the additional image directory -+ -+**-h, --help**:: display help text and exit. -+ -+**--debug**:: output debug information of the build process -+ -+**-v, --verbose**:: verbose output during the build process -+ -+FILES -+----- -+_/boot/dracut/*.img_:: -+ images to work with -+ -+AUTHORS -+------- -+Harald Hoyer -+ -+AVAILABILITY -+------------ -+The dracut-catimages command is part of the dracut package and is available from -+link:$$https://dracut.wiki.kernel.org$$[https://dracut.wiki.kernel.org] -+ -+SEE ALSO -+-------- -+*dracut*(8) -+ -diff --git a/dracut-catimages.8.xml b/dracut-catimages.8.xml -deleted file mode 100644 -index ae8a3ab..0000000 ---- a/dracut-catimages.8.xml -+++ /dev/null -@@ -1,116 +0,0 @@ -- -- -- -- -- --DRACUT-CATIMAGES --8 --June 2009 --Linux -- -- --dracut-catimages --creates initial ramdisk image by concatenating images -- -- -- -- -- dracut-catimages OPTION -- <initramfs -- base -- image> -- <image> -- -- -- -- -- --DESCRIPTION --dracut-catimages --creates an initial ramdisk image by concatenating several images from the command --line and /boot/dracut/*.img -- -- -- --OPTIONS -- -- -- , -- --overwrite existing initramfs file. -- -- -- -- , -- --Directory with additional images to add (default: /boot/dracut/) -- -- -- -- , -- --Overlay directory, which contains additional files that will be used to create an additional image -- -- -- -- -- --Do not use the overlay directory -- -- -- -- -- --Do not use the additional image directory -- -- -- -- , -- --display help text and exit. -- -- -- -- -- --output debug information of the build process -- -- -- -- , -- --verbose output during the build process -- -- -- -- -- -- --FILES -- -- -- /boot/dracut/*.img -- -- -- -- -- -- -- --AUTHORS -- --Harald Hoyer <harald@redhat.com> -- -- -- --AVAILABILITY --The dracut-catimages command is part of the dracut package and is available from --https://dracut.wiki.kernel.org -- -- -- --SEE ALSO --dracut8 -- -- -- -diff --git a/dracut.8.asc b/dracut.8.asc -new file mode 100644 -index 0000000..6ca7347 ---- /dev/null -+++ b/dracut.8.asc -@@ -0,0 +1,378 @@ -+DRACUT(8) -+========= -+:doctype: manpage -+:man source: dracut -+:man manual: dracut -+ -+NAME -+---- -+dracut - low-level tool for generating an initramfs image -+ -+SYNOPSIS -+-------- -+*dracut* ['OPTION...'] [ [__]] -+ -+DESCRIPTION -+----------- -+dracut creates an initial image used by the kernel for preloading the block -+device modules (such as IDE, SCSI or RAID) which are needed to access the root -+filesystem, mounting the root filesystem and booting into the real system. -+ -+At boot time, the kernel unpacks that archive into RAM disk, mounts and uses it -+as initial root file system. All finding of the root device happens in this -+early userspace. -+ -+For a complete list of kernel command line options see *dracut.cmdline*(7) -+ -+OPTIONS -+------- -+**-f, --force**:: -+ overwrite existing initramfs file. -+ -+**-m, --modules** __:: -+ specify a space-separated list of dracut modules to call when building the initramfs. -+ Modules are located in _/usr/lib/dracut/modules.d_. This parameter can be -+ specified multiple times. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --modules "module1 module2" ... -+---- -+=============================== -+ -+**-o, --omit** __:: -+ omit a space-separated list of dracut modules. This parameter can be specified multiple times. -+ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --omit "module1 module2" ... -+---- -+=============================== -+ -+**-a, --add** __:: -+ add a space-separated list of dracut modules to the default set of modules. -+ This parameter can be specified multiple times. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --add "module1 module2" ... -+---- -+=============================== -+ -+**--force-add** __:: -+ force to add a space-separated list of dracut modules to the default set of -+ modules, when -H is specified. This parameter can be specified multiple -+ times. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --force-add "module1 module2" ... -+---- -+=============================== -+ -+**-d, --drivers** __:: -+ specify a space-separated list of kernel modules to exclusively include -+ in the initramfs. The kernel modules have to be specified without the ".ko" -+ suffix. This parameter can be specified multiple times. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --drivers "kmodule1 kmodule2" ... -+---- -+=============================== -+ -+**--add-drivers** __:: -+ specify a space-separated list of kernel modules to add to the initramfs. -+ The kernel modules have to be specified without the ".ko" suffix. This -+ parameter can be specified multiple times. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --add-drivers "kmodule1 kmodule2" ... -+---- -+=============================== -+ -+**--omit-drivers** __:: -+ specify a space-separated list of kernel modules not to add to the -+ initramfs. -+ The kernel modules have to be specified without the ".ko" suffix. This -+ parameter can be specified multiple times. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --omit-drivers "kmodule1 kmodule2" ... -+---- -+=============================== -+ -+**--filesystems** __:: -+ specify a space-separated list of kernel filesystem modules to exclusively -+ include in the generic initramfs. This parameter can be specified multiple -+ times. -+ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --filesystems "filesystem1 filesystem2" ... -+---- -+=============================== -+ -+**-k, --kmoddir** __:: -+ specify the directory, where to look for kernel modules -+ -+**--fwdir** _[:...]++_:: -+ specify additional directories, where to look for firmwares. This parameter -+ can be specified multiple times. -+ -+**--kernel-only**:: -+ only install kernel drivers and firmware files -+ -+**--no-kernel**:: -+ do not install kernel drivers and firmware files -+ -+**--mdadmconf**:: -+ include local _/etc/mdadm.conf_ -+ -+**--nomdadmconf**:: -+ do not include local _/etc/mdadm.conf_ -+ -+**--lvmconf**:: -+ include local _/etc/lvm/lvm.conf_ -+ -+**--nolvmconf**:: -+ do not include local _/etc/lvm/lvm.conf_ -+ -+**--fscks** [LIST]:: -+ add a space-separated list of fsck tools, in addition to _dracut.conf_'s -+ specification; the installation is opportunistic (non-existing tools are -+ ignored) -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -+---- -+# dracut --fscks "fsck.foo barfsck" ... -+---- -+=============================== -+ -+**--nofscks**:: -+ inhibit installation of any fsck tools -+ -+**--strip**:: -+ strip binaries in the initramfs (default) -+ -+**--nostrip**:: -+ do not strip binaries in the initramfs -+ -+**--prefix** __:: -+ prefix initramfs files with the specified directory -+ -+**--noprefix**:: -+ do not prefix initramfs files (default) -+ -+**--ctty**:: -+ if possible, try to spawn an emergency shell on a terminal with job control -+ -+**-h, --help**:: -+ display help text and exit. -+ -+**--debug**:: -+ output debug information of the build process -+ -+**-v, --verbose**:: -+ increase verbosity level (default is info(4)) -+ -+**-q, --quiet**:: decrease verbosity level (default is info(4)) -+ -+**-c, --conf** __:: -+ specify configuration file to use. -++ -+Default: -+ _/etc/dracut.conf_ -+ -+**--confdir** __:: -+ specify configuration directory to use. -++ -+Default: -+ _/etc/dracut.conf.d_ -+ -+**--sshkey** __:: ssh key file used with ssh-client module. -+ -+**-l, --local**:: -+ activates the local mode. dracut will use modules from the current working -+ directory instead of the system-wide installed modules in -+ _/usr/lib/dracut/modules.d_. -+ This is useful when running dracut from a git checkout. -+ -+**-H, --hostonly**:: -+ Host-Only mode: Install only what is needed for booting -+ the local host instead of a generic host. -++ -+[WARNING] -+==== -+If chrooted to another root other than the real root device, use "--fstab" and provide a valid _/etc/fstab_. -+==== -+ -+**--fstab**:: -+ Use _/etc/fstab_ instead of _/proc/self/mountinfo_. -+ -+**--add_fstab** __ :: -+ Add entries of __ to the initramfs /etc/fstab. -+ -+**--mount** "__ __ __ __":: -+ Add entries of __ to the initramfs /etc/fstab. -+ -+**-i, --include** __ __:: -+ include the files in the SOURCE directory into the -+ TARGET directory in the final initramfs. If SOURCE is a file, it will be -+ installed to TARGET in the final initramfs. This parameter can be specified -+ multiple times. -+ -+**-I, --install** __:: -+ install the space separated list of files into the initramfs. -++ -+[NOTE] -+=============================== -+If [LIST] has multiple arguments, then you have to put these in quotes. For -+example: -++ -+---- -+# dracut --install "/bin/foo /sbin/bar" ... -+---- -+=============================== -+ -+**--gzip**:: -+ Compress the generated initramfs using gzip. This will be done by default, -+ unless another compression option or --no-compress is passed. Equivalent to -+ "--compress=gzip -9" -+ -+**--bzip2**:: -+ Compress the generated initramfs using bzip2. -++ -+[WARNING] -+==== -+Make sure your kernel has bzip2 decompression support compiled in, otherwise you -+will not be able to boot. Equivalent to "--compress=bzip2" -+==== -+ -+**--lzma**:: -+ Compress the generated initramfs using lzma. -++ -+[WARNING] -+==== -+Make sure your kernel has lzma decompression support compiled in, otherwise you -+will not be able to boot. Equivalent to "--compress=lzma -9" -+==== -+ -+**--xz**:: -+ Compress the generated initramfs using xz. -++ -+[WARNING] -+==== -+Make sure your kernel has xz decompression support compiled in, otherwise you -+will not be able to boot. Equivalent to "--compress=xz --check=crc32 -+--lzma2=dict=1MiB" -+==== -+ -+**--compress** __:: -+ Compress the generated initramfs using the passed compression program. If -+ you pass it just the name of a compression program, it will call that -+ program with known-working arguments. If you pass a quoted string with -+ arguments, it will be called with exactly those arguments. Depending on what -+ you pass, this may result in an initramfs that the kernel cannot decompress. -+ -+**--no-compress**:: -+ Do not compress the generated initramfs. This will override any other -+ compression options. -+ -+**--list-modules**:: -+ List all available dracut modules. -+ -+**-M, --show-modules**:: -+ Print included module's name to standard output during build. -+ -+**--keep**:: -+ Keep the initramfs temporary directory for debugging purposes. -+ -+FILES -+----- -+_/var/log/dracut.log_:: -+ logfile of initramfs image creation -+ -+_/tmp/dracut.log_:: -+ logfile of initramfs image creation, if _/var/log/dracut.log_ is not -+ writable -+ -+_/etc/dracut.conf_:: -+ see dracut.conf5 -+ -+_/etc/dracut.conf.d/*.conf_:: -+ see dracut.conf5 -+ -+Configuration in the initramfs -+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+_/etc/conf.d/_:: -+ Any files found in _/etc/conf.d/_ will be sourced in the initramfs to -+ set initial values. Command line options will override these values -+ set in the configuration files. -+ -+_/etc/cmdline_:: -+ Can contain additional command line options. -+ -+AVAILABILITY -+------------ -+The dracut 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*:: -+ Project Leader and Developer -+ -+*Victor Lowther*:: -+ Developer -+ -+*Philippe Seewer*:: -+ Developer -+ -+*Warren Togami*:: -+ Developer -+ -+*Amadeusz Żołnowski*:: -+ Developer -+ -+*Jeremy Katz*:: -+ Developer -+ -+*David Dillow*:: -+ Developer -+ -+*Will Woods*:: -+ Developer -+ -+SEE ALSO -+-------- -+*dracut.cmdline*(7) *dracut.conf*(5) -diff --git a/dracut.8.xml b/dracut.8.xml -deleted file mode 100644 -index de1a0bf..0000000 ---- a/dracut.8.xml -+++ /dev/null -@@ -1,684 +0,0 @@ -- -- -- -- -- -- dracut -- dracut -- -- -- Project Leader, Developer -- Harald -- Hoyer -- harald@redhat.com -- -- -- Developer -- Victor -- Lowther -- victor.lowther@gmail.com -- -- -- Developer -- Philippe -- Seewer -- philippe.seewer@bfh.ch -- -- -- Developer -- Warren -- Togami -- -- -- Developer -- Amadeusz -- Żołnowski -- aidecoe@aidecoe.name -- -- -- Developer -- Jeremy -- Katz -- -- -- Developer -- David -- Dillow -- dave@thedillows.org -- -- -- -- -- dracut -- 8 -- -- -- -- dracut -- create initial ramdisk images for preloading modules -- -- -- -- dracut -- -- OPTION -- -- -- <image> -- -- <kernel-version> -- -- -- -- -- -- -- Description -- dracut --creates an initial image used by the kernel for --preloading the block device modules (such as IDE, SCSI or RAID) --which are needed to access the root filesystem. -- --For a complete list of kernel command line options see -- -- dracut.cmdline -- 7 -- -- -- -- Options -- -- -- -- -- -- -- -- -- -- overwrite existing initramfs file. -- -- -- -- -- -- -- -- -- -- -- specify a space-separated list of dracut modules to call --when building the initramfs. --Modules are located in --/usr/lib/dracut/modules.d. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --modules "module1 module2" ... -- -- -- -- -- -- -- -- -- -- -- -- omit a space-separated list of dracut modules. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --omit "module1 module2" ... -- -- -- -- -- -- -- -- -- -- -- -- add a space-separated list of dracut modules to the default set of modules. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --add "module1 module2" ... -- -- -- -- -- -- -- -- -- force to add a space-separated list of dracut modules to the default set of modules, when -H is specified. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --force-add "module1 module2" ... -- -- -- -- -- -- -- -- -- -- -- -- -- specify a space-separated list of kernel modules to exclusively include --in the initramfs. --The kernel modules have to be specified without the ".ko" suffix. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --drivers "kmodule1 kmodule2" ... -- -- -- -- -- -- -- -- -- specify a space-separated list of kernel modules to add to the initramfs. --The kernel modules have to be specified without the ".ko" suffix. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --add-drivers "kmodule1 kmodule2" ... -- -- -- -- -- -- -- -- -- specify a space-separated list of kernel modules not to add to the initramfs. --The kernel modules have to be specified without the ".ko" suffix. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --omit-drivers "kmodule1 kmodule2" ... -- -- -- -- -- -- -- -- -- specify a space-separated list of kernel filesystem modules to exclusively --include in the generic initramfs. This parameter can be specified multiple times. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --filesystems "filesystem1 filesystem2" ... -- -- -- -- -- -- -- -- -- -- -- -- specify the directory, where to look for kernel modules -- -- -- -- -- -- -- -- specify additional directories, where to look for firmwares. This parameter can be specified multiple times. -- -- -- -- -- -- -- -- only install kernel drivers and firmware files -- -- -- -- -- -- -- -- do not install kernel drivers and firmware files -- -- -- -- -- -- -- -- include local /etc/mdadm.conf -- -- -- -- -- -- -- -- do not include local /etc/mdadm.conf -- -- -- -- -- -- -- -- include local /etc/lvm/lvm.conf -- -- -- -- -- -- -- -- do not include local /etc/lvm/lvm.conf -- -- -- -- -- -- -- -- add a space-separated list of fsck tools, in addition to -- dracut.conf's specification; the -- installation is opportunistic (non-existing tools are ignored) -- -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --fscks "fsck.foo barfsck" ... -- -- -- -- -- -- -- -- -- inhibit installation of any fsck tools -- -- -- -- -- -- -- -- strip binaries in the initramfs (default) -- -- -- -- -- -- -- -- do not strip binaries in the initramfs -- -- -- -- -- -- -- -- prefix initramfs files with the specified directory -- -- -- -- -- -- -- -- do not prefix initramfs files (default) -- -- -- -- -- -- -- -- if possible, try to spawn an emergency shell on a terminal -- with job control -- -- -- -- -- -- -- -- -- -- -- display help text and exit. -- -- -- -- -- -- -- -- output debug information of the build process -- -- -- -- -- -- -- -- -- -- -- increase verbosity level (default is info(4)) -- -- -- -- -- -- -- -- -- -- -- decrease verbosity level (default is info(4)) -- -- -- -- -- -- -- -- -- -- -- specify configuration file to use. --Default: --/etc/dracut.conf -- -- -- -- -- -- -- -- specify configuration directory to use. --Default: --/etc/dracut.conf.d -- -- -- -- -- -- -- -- ssh key file used with ssh-client module. -- -- -- -- -- -- -- -- -- -- -- activates the local mode. dracut will use modules from the current working --directory instead of the system-wide installed modules in --/usr/lib/dracut/modules.d. --This is useful when running dracut from a git checkout. -- -- -- -- -- -- -- -- -- -- -- Host-Only mode: Install only what is needed for booting --the local host instead of a generic host. -- -- If chrooted to another root other than the real root device, use "--fstab" and provide a valid /etc/fstab. -- -- -- -- -- -- -- -- -- Use /etc/fstab instead of /proc/self/mountinfo. -- -- -- -- -- -- -- -- Add entries of <filename> to the initramfs /etc/fstab. -- -- -- -- -- -- -- -- Add entries of <filename> to the initramfs /etc/fstab. -- -- -- -- -- -- -- -- -- -- -- 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. -- -- -- -- -- -- -- -- -- -- -- install the space separated list of files into the initramfs. -- -- If [LIST] has multiple arguments, then you have to put these in quotes. -- For example: -- # dracut --install "/bin/foo /sbin/bar" ... -- -- -- -- -- -- -- -- -- Compress the generated initramfs using gzip. -- This will be done by default, unless another compression option or --no-compress is passed. Equivalent to "--compress=gzip -9" -- -- -- -- -- -- -- -- Compress the generated initramfs using bzip2. -- -- Make sure your kernel has bzip2 decompression support compiled in, otherwise you will not be able to boot. Equivalent to "--compress=bzip2" -- -- -- -- -- -- -- -- -- Compress the generated initramfs using lzma. -- -- Make sure your kernel has lzma decompression support compiled in, otherwise you will not be able to boot. Equivalent to "--compress=lzma -9" -- -- -- -- -- -- -- -- -- Compress the generated initramfs using xz. -- -- Make sure your kernel has xz decompression support compiled in, otherwise you will not be able to boot. Equivalent to "--compress=xz --check=crc32 --lzma2=dict=1MiB" -- -- -- -- -- -- -- -- -- Compress the generated initramfs using the passed compression program. If you pass it just the name of a compression program, it will call that program with known-working arguments. If you pass a quoted string with arguments, it will be called with exactly those arguments. Depending on what you pass, this may result in an initramfs that the kernel cannot decompress. -- -- -- -- -- -- -- -- Do not compress the generated initramfs. This will override any other compression options. -- -- -- -- -- -- -- -- List all available dracut modules. -- -- -- -- -- -- -- -- -- -- -- Print included module's name to standard output during build. -- -- -- -- -- -- -- -- Keep the initramfs temporary directory for debugging purposes. -- -- -- -- -- -- -- Files -- -- -- -- /var/log/dracut.log -- -- -- logfile of initramfs image creation -- -- -- -- -- /tmp/dracut.log -- -- -- logfile of initramfs image creation, if /var/log/dracut.log is not writable -- -- -- -- -- /etc/dracut.conf -- -- -- see -- dracut.conf -- 5 -- -- -- -- -- -- /etc/dracut.conf.d/*.conf -- -- -- see -- dracut.conf -- 5 -- -- -- -- -- -- Configuration in the Initramfs -- -- -- -- /etc/conf.d/ -- -- -- Any files found in /etc/conf.d/ will be sourced in the initramfs to --set initial values. Command line options will override these values --set in the configuration files. -- -- -- -- -- /etc/cmdline -- -- -- Can contain additional command line options. -- -- -- -- -- -- -- Availability -- The dracut command is part of the dracut package and is available from --https://dracut.wiki.kernel.org -- -- -- See Also -- -- -- dracut.cmdline -- 7 -- -- -- dracut.conf -- 5 -- -- -- -- -diff --git a/dracut.asc b/dracut.asc -new file mode 100644 -index 0000000..a4bf726 ---- /dev/null -+++ b/dracut.asc -@@ -0,0 +1,1026 @@ -+dracut -+====== -+Harald Hoyer -+v2.0, March 2011 -+ -+:language: bash -+ -+= Introduction -+This section is a modified version of -+http://en.wikipedia.org/wiki/Initrd which is licensed under the -+Creative Commons Attribution/Share-Alike License. -+ -+== Definition -+An _initial ramdisk_ is a temporary file system used in the boot process of the -+Linux kernel. _initrd_ and _initramfs_ refer to slightly different schemes for -+loading this file system into memory. Both are commonly used to make -+preparations before the real root file system can be mounted. -+ -+== Rationale -+Many Linux distributions ship a single, generic kernel image that is intended to -+boot as wide a variety of hardware as possible. The device drivers for this -+generic kernel image are included as loadable modules, as it is not possible to -+statically compile them all into the one kernel without making it too large to -+boot from computers with limited memory or from lower-capacity media like floppy -+disks. -+ -+This then raises the problem of detecting and loading the modules necessary to -+mount the root file system at boot time (or, for that matter, deducing where or -+what the root file system is). -+ -+To further complicate matters, the root file system may be on a software RAID -+volume, LVM, NFS (on diskless workstations), or on an encrypted partition. All -+of these require special preparations to mount. -+ -+Another complication is kernel support for hibernation, which suspends the -+computer to disk by dumping an image of the entire system to a swap partition or -+a regular file, then powering off. On next boot, this image has to be made -+accessible before it can be loaded back into memory. -+ -+To avoid having to hardcode handling for so many special cases into the kernel, -+an initial boot stage with a temporary root file system -+—now dubbed early user space— is used. This root file system would contain -+user-space helpers that would do the hardware detection, module loading and -+device discovery necessary to get the real root file system mounted. -+ -+== Implementation -+An image of this initial root file system (along with the kernel image) must be -+stored somewhere accessible by the Linux bootloader or the boot firmware of the -+computer. This can be: -+ -+* The root file system itself -+* A boot image on an optical disc -+* A small ext2/ext3 or FAT-formatted partition on a local disk -+ (a _boot partition_) -+* A TFTP server (on systems that can boot from Ethernet) -+ -+The bootloader will load the kernel and initial root file system image into -+memory and then start the kernel, passing in the memory address of the image. -+ -+Depending on which algorithms were compiled statically into it, the kernel can -+currently unpack initrd/initramfs images compressed with gzip, bzip2 and LZMA. -+ -+== Mount preparations -+dracut can generate a customized initrams image which contains only whatever is -+necessary to boot some particular computer, such as ATA, SCSI and filesystem -+kernel modules (host-only mode). -+ -+dracut can also generate a more generic initramfs image (default mode). -+ -+dracut's initramfs starts only with the device name of the root file system (or -+its UUID) and must discover everything else at boot time. A complex cascade of -+tasks must be performed to get the root file system mounted: -+ -+* Any hardware drivers that the boot process depends on must be loaded. All -+kernel modules for common storage devices are packed onto the initramfs and then -+udev pulls in modules matching the computer's detected hardware. -+ -+* On systems which display a boot rd.splash screen, the video hardware must be -+initialized and a user-space helper started to paint animations onto the display -+in lockstep with the boot process. -+ -+* If the root file system is on NFS, dracut does then: -+** Bring up the primary network interface. -+** Invoke a DHCP client, with which it can obtain a DHCP lease. -+** Extract the name of the NFS share and the address of the NFS server from the -+lease. -+** Mount the NFS share. -+ -+* If the root file system appears to be on a software RAID device, there is no -+way of knowing which devices the RAID volume spans; the standard MD utilities -+must be invoked to scan all available block devices with a raid signature and -+bring the required ones online. -+ -+* If the root file system appears to be on a logical volume, the LVM utilities -+must be invoked to scan for and activate the volume group containing it. -+ -+* If the root file system is on an encrypted block device: -+** Invoke a helper script to prompt the user to type in a passphrase and/or -+insert a hardware token (such as a smart card or a USB security dongle). -+ -+* Create a decryption target with the device mapper. -+ -+dracut uses udev, an event-driven hotplug agent, which invokes helper programs -+as hardware devices, disk partitions and storage volumes matching certain rules -+come online. This allows discovery to run in parallel, and to progressively -+cascade into arbitrary nestings of LVM, RAID or encryption to get at the root -+file system. -+ -+When the root file system finally becomes visible: -+ -+* Any maintenance tasks which cannot run on a mounted root file system -+are done. -+* The root file system is mounted read-only. -+* Any processes which must continue running (such as the rd.splash screen helper -+and its command FIFO) are hoisted into the newly-mounted root file system. -+ -+The final root file system cannot simply be mounted over /, since that would -+make the scripts and tools on the initial root file system inaccessible for any -+final cleanup tasks. On an initramfs, the initial root file system cannot be -+rotated away. Instead, it is simply emptied and the final root file system -+mounted over the top. -+ -+= User Manual -+ -+== Creating an initramfs Image -+To create a initramfs image, the most simple command is: -+---- -+# dracut -+---- -+ -+This will generate a general purpose initramfs image, with all possible -+functionality resulting of the combination of the installed dracut modules and -+system tools. The image is /boot/initramfs-_++++_.img and -+contains the kernel modules of the currently active kernel with version -+_++++_. -+ -+If the initramfs image already exists, dracut will display an error message, and -+to overwrite the existing image, you have to use the --force option. -+---- -+# dracut --force -+---- -+ -+If you want to specify another filename for the resulting image you would issue -+a command like: -+---- -+# dracut foobar.img -+---- -+ -+To generate an image for a specific kernel version, the command would be: -+---- -+# dracut foobar.img 2.6.40-1.rc5.f20 -+---- -+ -+A shortcut to generate the image at the default location for a specific kernel -+version is: -+---- -+# dracut '' 2.6.40-1.rc5.f20 -+---- -+ -+If you want to create lighter, smaller initramfs images, you may want to specify -+the --host-only or -H option. Using this option, the resulting image will -+contain only those dracut modules, kernel modules and filesystems, which are -+needed to boot this specific machine. This has the drawback, that you can't put -+the disk on another controller or machine, and that you can't switch to another -+root filesystem, without recreating the initramfs image. The usage of the -+--host-only option is only for experts and you will have to keep the broken -+pieces. At least keep a copy of a general purpose image (and corresponding -+kernel) as a fallback to rescue your system. -+ -+=== Inspecting the Contents -+To see the contents of the image created by dracut, you can use the lsinitrd tool. -+---- -+# lsinitrd /boot/initramfs-$(uname -r).img | less -+---- -+ -+To display the contents of a file in the initramfs also use the lsinitrd tool: -+---- -+# lsinitrd /boot/initramfs-$(uname -r).img /etc/ld.so.conf -+include ld.so.conf.d/*.conf -+---- -+ -+=== Adding dracut Modules -+Some dracut modules are turned off by default and have to be activated manually. -+You can do this by adding the dracut modules to the configuration file -+_/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See <>. -+You can also add dracut modules on the command line -+by using the -a or --add option: -+---- -+# dracut --add bootchart initramfs-bootchart.img -+---- -+ -+To see a list of available dracut modules, use the --list-modules option: -+---- -+# dracut --list-modules -+---- -+ -+or, if you have a dracut version earlier than +008+, issue the command: -+---- -+# for mod in /usr/lib/dracut/modules.d/*; do echo ${mod##*/??}; done -+---- -+ -+=== Omitting dracut Modules -+Sometimes you don't want a dracut module to be included for reasons of speed, -+size or functionality. To do this, either specify the omit_dracutmodules -+variable in the _dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_ configuration -+file (see <>), or use the -o or --omit option -+on the command line: -+---- -+# dracut -o "multipath lvm" no-multipath-lvm.img -+---- -+ -+=== Adding Kernel Modules -+If you need a special kernel module in the initramfs, which is not -+automatically picked up by dracut, you have the use the --add-drivers option -+on the command line or the drivers vaiable in the _/etc/dracut.conf_ -+or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <>): -+---- -+# dracut --add-drivers mymod initramfs-with-mymod.img -+---- -+ -+== Boot parameters -+The generated initramfs.img file normally does not contain any system -+configuration files (except for some special exceptions), so the configuration -+has to be done on the kernel command line. With this flexibility, you can easily -+boot from a changed root partition, without the need to recompile the initramfs -+image. So, you could completly change your root partition (move it inside a md -+raid with encryption and LVM on top), as long as you specify the correct -+filesystem LABEL or UUID on the kernel command line for your root device, dracut -+will find it and boot from it. -+ -+The kernel command line usually can be configured in _/boot/grub/grub.conf_, if -+grub is your bootloader and it also can be edited in the real boot process in -+the grub menu. -+ -+The kernel command line can also be provided by the dhcp server with the -+root-path option. See <>. -+ -+For a full reference of all kernel command line parameters, see <>. -+ -+=== Specifying the root Device -+This is the only option dracut really needs to boot from your root partition. -+Because your root partition can live in various environments, there are a lot of -+formats for the root= option. The most basic one is root=_++++_: -+---- -+root=/dev/sda2 -+---- -+ -+Because device node names can change, dependent on the drive ordering, you are -+encouraged to use the filesystem identifier (UUID) or filesystem label (LABEL) -+to specify your root partition: -+---- -+root=UUID=19e9dda3-5a38-484d-a9b0-fa6b067d0331 -+---- -+ -+or -+ -+---- -+root=LABEL=myrootpartitionlabel -+---- -+ -+To see all UUIDs or LABELs on your system, do: -+---- -+# ls -l /dev/disk/by-uuid -+---- -+ -+or -+ -+---- -+# ls -l /dev/disk/by-label -+---- -+ -+If your root partition is on the network see <>. -+ -+=== Keyboard Settings -+If you have to input passwords for encrypted disk volumes, you might want to set -+the keyboard layout and specify a display font. -+ -+A typical german kernel command would contain: -+---- -+vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys locale.LANG=de_DE.UTF-8 -+---- -+ -+Setting these options can override the setting stored on your system, if you use -+a modern init system, like systemd. -+ -+For dracut versions prior to version +008+ the line would look like: -+---- -+LANG=de_DE.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=de-latin1-nodeadkeys -+---- -+ -+=== Blacklisting Kernel Modules -+Sometimes it is required to prevent the automatic kernel module loading of a -+specific kernel module. To do this, just add rd.blacklist=_++++_, with _++++_ not containing the _.ko_ -+suffix, to the kernel command line. For example: -+---- -+rd.driver.blacklist=mptsas rd.driver.blacklist=nouveau -+---- -+ -+The option can be specified multiple times on the kernel command line. -+ -+=== Speeding up the Boot Process -+If you want to speed up the boot process, you can specify as much information -+for dracut on the kernel command as possible. For example, you can tell dracut, -+that you root partition is not on a LVM volume or not on a raid partition, or -+that it lives inside a specific crypto LUKS encrypted volume. By default, dracut -+searches everywhere. A typical dracut kernel command line for a plain primary or -+logical partition would contain: -+---- -+rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 -+---- -+ -+On systems with dracut version prior to +008+ the line would look like: -+---- -+rd_NO_LUKS rd_NO_LVM rd_NO_MD rd_NO_DM -+---- -+ -+This turns off every automatic assembly of LVM, MD raids, DM raids and crypto LUKS. -+ -+Of course, you could also omit the dracut modules in the initramfs creation -+process, but then you would lose the posibility to turn it on on demand. -+ -+ -+[[Injecting]] -+=== Injecting custom Files -+To add your own files to the initramfs image, you have several possibilities. -+ -+The --include option let you specify a source path and a target path. For example -+---- -+# dracut --include cmdline-preset /etc/cmdline initramfs-cmdline-pre.img -+---- -+will create an initramfs image, where the file cmdline-preset will be copied -+inside the initramfs to _/etc/cmdline_. --include can only be specified once. -+ -+ -+---- -+# mkdir rd.live.overlay -+# mkdir rd.live.overlay/etc -+# mkdir rd.live.overlay/etc/conf.d -+# echo "ip=auto" >> rd.live.overlay/etc/cmdline -+# echo export TESTVAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf -+# echo export TESTVAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf -+# tree rd.live.overlay/ -+rd.live.overlay/ -+└── etc -+ ├── cmdline -+ └── 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 rd.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_, with a method described -+in <>. -+ -+ -+ -+ -+=== Reducing the Image Size -+ -+To reduce the size of the initramfs, you should create it with by ommitting all -+dracut modules, which you know, you don't need to boot the machine. -+ -+You can also specify the exact dracut and kernel modules to produce a very tiny -+initramfs image. -+ -+For example for a NFS image, you would do: -+ -+ -+---- -+# dracut -m "nfs network base" initramfs-nfs-only.img -+---- -+ -+Then you would boot from this image with your target machine and reduce the size -+once more by creating it on the target machine with the --host-only option: -+ -+ -+---- -+# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img -+---- -+ -+This will reduce the size of the initramfs image significantly. -+ -+ -+ -+=== NFS Root Device -+ -+FIXME -+ -+=== iSCSI Root Device -+ -+FIXME -+ -+=== FCoE Root Device -+ -+FIXME -+ -+== Troubleshooting -+ -+If the boot process does not succeed, you have several options to debug the -+situation. Some of the basic operations are covered here. For more information -+you should also visit: -+http://fedoraproject.org/wiki/How_to_debug_Dracut_problems -+ -+ -+[[identifying-your-problem-area]] -+=== Identifying your problem area -+. Remove ''rhgb'' and ''quiet'' from the kernel command line -+. Add ''rd.shell'' to the kernel command line. This will present a shell should -+dracut be unable to locate your root device -+. Add ''rd.shell rd.debug log_buf_len=1M'' to the kernel command line so that -+dracut shell commands are printed as they are executed -+. With dracut >= 002-11, you can inspect the rd.debug output with: -++ -+---- -+# less /run/initramfs/init.log -+# dmesg | less -+---- -+ -+[[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 including vol_id compatible mode. This can -+be obtained by running the commands: -++ -+---- -+# blkid -p -+# blkid -p -o udev -+---- -+* Turn on dracut debugging (see _the 'debugging dracut' section_), and attach -+all relevant information from the boot log. This can be obtained by running the -+command -++ -+---- -+# dmesg|grep dracut -+---- -++ -+* If you use a dracut configuration file, please include _/etc/dracut.conf_ and -+all files in _/etc/dracut.conf.d/*.conf_ -+ -+[[logical-volume-management-related-problems]] -+==== Logical Volume Management related problems -+As well as the information from <> include the following -+information: -+ -+* Include physical volume information by running the command: -++ -+---- -+# lvm pvdisplay -+---- -++ -+* Include volume group information by running the command: -++ -+---- -+# lvm vgdisplay -+---- -++ -+* Include logical volume information by running the command: -++ -+---- -+# lvm lvdisplay -+---- -+ -+[[software-raid-related-problems]] -+==== Software RAID related problems -+As well as the information from <>, include the following -+information: -+ -+* If using software RAID disk partitions, please include the output of -++ -+---- -+# cat /proc/mdstat -+---- -+ -+[[network-root-device-related-problems]] -+==== Network root device related problems -+This section details information to include when experiencing problems on a -+system whose root device is located on a network attached volume (e.g. iSCSI, -+NFS or NBD). As well as the information from <>, include the -+following information: -+ -+ -+* Please include the output of -++ -+---- -+# /sbin/ifup -+# ip addr show -+---- -+ -+[[debugging-dracut]] -+=== Debugging dracut -+ -+ -+[[configure-a-serial-console]] -+==== Configure a serial console -+ -+Successfully debugging dracut will require some form of console -+logging during the system boot. This section documents configuring a -+serial console connection to record boot messages. -+ -+. First, enable serial console output for both the kernel and the bootloader. -+. Open the file _/etc/grub.conf_ for editing. Below the line ''timeout=5'', add -+the following: -++ -+---- -+serial --unit=0 --speed=9600 -+terminal --timeout=5 serial console -+---- -++ -+. Also in _/etc/grub.conf_, add the following boot arguemnts to the ''kernel'' -+line: -++ -+---- -+console=tty0 console=ttyS0,9600 -+---- -++ -+. When finished, the _/etc/grub.conf_ file should look similar to the example -+below. -++ -+---- -+default=0 -+timeout=5 -+serial --unit=0 --speed=9600 -+terminal --timeout=5 serial console -+title Fedora (2.6.29.5-191.fc11.x86_64) -+ root (hd0,0) -+ kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 console=ttyS0,9600 -+ initrd /dracut-2.6.29.5-191.fc11.x86_64.img -+---- -++ -+. More detailed information on how to configure the kernel for console output -+can be found at -+http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL. -+. Redirecting non-interactive output -++ -+-- -+NOTE: You can redirect all non-interactive output to _/dev/kmsg_ and the kernel -+will put it out on the console when it reaches the kernel buffer by doing -+ -+---- -+# exec >/dev/kmsg 2>&1 >). -+ -+[[accessing-the-root-volume-from-the-dracut-shell]] -+==== Accessing the root volume from the dracut shell -+From the dracut debug shell, you can manually perform the task of locating and -+preparing your root volume for boot. The required steps will depend on how your -+root volume is configured. Common scenarios include: -+ -+* A block device (e.g. _/dev/sda7_) -+* A LVM logical volume (e.g. _/dev/VolGroup00/LogVol00_) -+* An encrypted device (e.g. _/dev/mapper/luks-4d5972ea-901c-4584-bd75-1da802417d83_) -+* A network attached device (e.g. netroot=iscsi:@192.168.0.4::3260::iqn.2009-02.org.fedoraproject:for.all) -+ -+The exact method for locating and preparing will vary. However, to continue with -+a successful boot, the objective is to locate your root volume and create a -+symlink _/dev/root_ which points to the file system. For example, the following -+example demonstrates accessing and booting a root volume that is an encrypted -+LVM Logical volume. -+ -+. Inspect your partitions using parted -++ -+---- -+# parted /dev/sda -s p -+Model: ATA HTS541060G9AT00 (scsi) -+Disk /dev/sda: 60.0GB -+Sector size (logical/physical): 512B/512B -+Partition Table: msdos -+Number Start End Size Type File system Flags -+1 32.3kB 10.8GB 107MB primary ext4 boot -+2 10.8GB 55.6GB 44.7GB logical lvm -+---- -++ -+. You recall that your root volume was a LVM logical volume. Scan and activate -+any logical volumes. -++ -+---- -+# lvm vgscan -+# lvm vgchange -ay -+---- -++ -+. You should see any logical volumes now using the command blkid: -++ -+---- -+# blkid -+/dev/sda1: UUID="3de247f3-5de4-4a44-afc5-1fe179750cf7" TYPE="ext4" -+/dev/sda2: UUID="Ek4dQw-cOtq-5MJu-OGRF-xz5k-O2l8-wdDj0I" TYPE="LVM2_member" -+/dev/mapper/linux-root: UUID="def0269e-424b-4752-acf3-1077bf96ad2c" TYPE="crypto_LUKS" -+/dev/mapper/linux-home: UUID="c69127c1-f153-4ea2-b58e-4cbfa9257c5e" TYPE="ext3" -+/dev/mapper/linux-swap: UUID="47b4d329-975c-4c08-b218-f9c9bf3635f1" TYPE="swap" -+---- -++ -+. From the output above, you recall that your root volume exists on an encrypted -+block device. Following the guidance disk encryption guidance from the -+Installation Guide, you unlock your encrypted root volume. -++ -+---- -+# UUID=$(cryptsetup luksUUID /dev/mapper/linux-root) -+# cryptsetup luksOpen /dev/mapper/linux-root luks-$UUID -+Enter passphrase for /dev/mapper/linux-root: -+Key slot 0 unlocked. -+---- -++ -+. Next, make a symbolic link to the unlocked root volume -++ -+---- -+# ln -s /dev/mapper/luks-$UUID /dev/root -+---- -++ -+. With the root volume available, you may continue booting the system by exiting -+the dracut shell -++ -+---- -+# exit -+---- -+ -+[[additional-dracut-boot-parameters]] -+==== Additional dracut boot parameters -+For more debugging options, see <> in <>. -+ -+= Developer Manual -+ -+== dracut Components -+ -+dracut uses a modular system to build and extend the initramfs image. All -+modules are located in _/usr/lib/dracut/modules.d_ or in _/modules.d_. -+The most basic dracut module is _99base_. In _99base_ the initial shell script -+init is defined, which gets run by the kernel after initramfs loading. Although -+you can replace init with your own version of _99base_, this is not encouraged. -+Instead you should use, if possible, the hooks of dracut. All hooks, and the -+point of time in which they are executed, are described in <>. -+ -+The main script, which creates the initramfs is dracut itsself. It parses all -+arguments and sets up the directory, in which everything is installed. It then -+executes all check, install, installkernel scripts found in the modules, which -+are to be processed. After everything is installed, the install directory is -+archived and compressed to the final initramfs image. All helper functions used -+by check, install and installkernel are found in in the file _dracut-functions_. -+These shell functions are available to all module installer (install, -+installkernel) scripts, without the need to source _dracut-functions_. -+ -+A module can check the preconditions for install and installkernel with the -+check script. Also dependencies can be expressed with check. If a module passed -+check, install and installkernel will be called to install all of the necessary -+files for the module. To split between kernel and non-kernel parts of the -+installation, all kernel module related parts have to be in installkernel. All -+other files found in a module directory are module specific and mostly are hook -+scripts and udev rules. -+ -+ -+[[stages]] -+== Boot Process Stages -+ -+The init script in _99base_ is the main script, which prepares the root file -+system for usage, runs udev, mounts the real root device, kills the remaining -+processes, and switches to the real root device for further booting. 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. -+ -+ -+ -+=== Basic Setup -+ -+The first thing init does, is to mount _/proc_ and _/sys_ and manually create -+the basic device nodes and symbolic links in _/dev_ needed to execute basic -+commands. Then logging is setup according to kernel command line arguments. -+_/dev/pts_ and _/dev/shm_ are mounted and the first hook is sourced. -+ -+ -+ -+=== 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 -+ -+Now the main loop of 99base/init begins. Here we loop 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 gets executed every time udev has settled. -+ -+ -+ -+==== Initqueue timeout -+ -+This hooks gets executed, when the main loop counter becomes half of the -+rd.retry counter. -+ -+ -+ -+==== Initqueue finished -+ -+This hook is called after udev has settled and if all scripts herein return 0 -+the main loop will be ended. -+ -+ -+ -+=== 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 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 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() -+ -+dracut_install -+ -+inst -+ -+inst_hook -+ -+inst_rules -+ -+ -+ -+ -+ -+=== installkernel() -+ -+instmods -+ -+ -+ -+=== Creation Functions -+ -+ -+FIXME -+ -+ -+=== Initramfs Functions -+ -+ -+FIXME -+ -+ -+=== Network Modules -+ -+FIXME -+ -+[[dracut8]] -+include::dracut.8.asc[] -+ -+[[dracutconf5]] -+include::dracut.conf.5.asc[] -+ -+[[dracutcmdline7]] -+include::dracut.cmdline.7.asc[] -+ -+[appendix] -+License -+------- -+This work is licensed under the Creative Commons Attribution/Share-Alike -+License. To view a copy of this license, visit -+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative -+Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. -+ -diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -new file mode 100644 -index 0000000..8924b89 ---- /dev/null -+++ b/dracut.cmdline.7.asc -@@ -0,0 +1,603 @@ -+DRACUT.CMDLINE(7) -+================= -+:doctype: manpage -+:man source: dracut -+:man manual: dracut -+ -+NAME -+---- -+dracut.cmdline - dracut kernel command line options -+ -+DESCRIPTION -+----------- -+The root device used by the kernel is specified in the boot configuration -+file on the kernel command line, as always. -+ -+The traditional _root=/dev/sda1_ style device specification is allowed, but not -+encouraged. The root device should better be identified by LABEL or UUID. If a -+label is used, as in _root=LABEL=_ the initramfs will search all -+available devices for a filesystem with the appropriate label, and mount that -+device as the root filesystem. _root=UUID=_ will mount the partition -+with that UUID as the root filesystem. -+ -+In the following all kernel command line parameters, which are processed by -+dracut, are described. -+ -+"rd.*" parameters mentioned without "=" are boolean parameters. They can be -+turned on/off by setting them to {0|1}. If the assignment with "=" is missing -+"=1" is implied. For example _rd.info_ can be turned off with _rd.info=0_ or -+turned on with _rd.info=1_ or _rd.info_. The last value in the kernel command -+line is the value, which is honored. -+ -+Standard -+~~~~~~~~ -+**init=**__:: -+ specify the path to the init programm to be started after the initramfs has -+ finished -+ -+**root=**__:: -+ specify the block device to use as the root filesystem. -++ -+E.g.: -++ -+---- -+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 -+root=LABEL=Root -+root=/dev/disk/by-uuid/3f5ad593-4546-4a94-a374-bcfb68aa11f7 -+root=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 -+---- -+ -+**rootfstype=**__:: "auto" if not specified, e.g.: -++ -+---- -+rootfstype=ext3 -+---- -+ -+**rootflags=**__:: -+ specify additional mount options for the root filesystem. If not set, -+ _/etc/fstab_ of the real root will be parsed for special mount options and -+ mounted accordingly. -+ -+**rd.fstab=0**:: -+ do not honor special mount options for the root filesystem found in -+ _/etc/fstab_ of the real root. -+ -+Misc -+~~~~ -+**rd.driver.blacklist=**_[,,...]_:: -+ do not load kernel module . This parameter can be specified -+ multiple times. -+ -+**rd.driver.pre=**_[,,...]_:: -+ force loading kernel module . This parameter can be specified -+ multiple times. -+ -+**rd.driver.post=**_[,,...]_:: -+ force loading kernel module after all automatic loading modules -+ have been loaded. This parameter can be specified multiple times. -+ -+**rd.ctty=**__:: -+ if the dracut image was generated with --ctty option, try to spawn an -+ emergency shell on the specified terminal; if rd.ctty is specified without a -+ value or not provided at all, the default is /dev/tty1. The '/dev' prefix -+ can be omitted. -+ -+[[dracutkerneldebug]] -+Debug -+~~~~~ -+**rd.info**:: -+ print informational output though "quiet" is set -+ -+**rd.shell**:: -+ allow dropping to a shell, if root mounting fails -+ -+**rd.debug**:: -+ set -x for the dracut shell and logs to dmesg, console and -+ _/run/initramfs/init.log_ -+ -+**rd.break**:: -+ drop to a shell at the end -+ -+**rd.break=**_{cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot}_:: -+ drop to a shell on defined breakpoint -+ -+**rd.udev.info**:: -+ set udev to loglevel info -+ -+**rd.udev.debug**:: -+ set udev to loglevel debug -+ -+I18N -+~~~~ -+**vconsole.keymap=**__:: -+ keyboard translation table loaded by loadkeys; taken from keymaps directory; -+ will be written as KEYMAP to _/etc/vconsole.conf_ in the initramfs, e.g.: -++ -+---- -+vconsole.keymap=de-latin1-nodeadkeys -+---- -+ -+**vconsole.keymap.ext=**__:: -+ list of extra keymaps to bo loaded (sep. by space); will be written as -+ EXT_KEYMAP to _/etc/vconsole.conf_ in the initramfs -+ -+**vconsole.unicode**[=_{0|1}_]:: -+ boolean, indicating UTF-8 mode; will be written as UNICODE to -+ _/etc/vconsole.conf_ in the initramfs -+ -+**vconsole.font=**__:: -+ console font; taken from consolefonts directory; will be written as FONT to -+ _/etc/vconsole.conf_ in the initramfs; e.g.: -++ -+---- -+vconsole.font=LatArCyrHeb-16 -+---- -+ -+**vconsole.font.map=**__:: -+ see description of '-m' parameter in setfont manual; taken from consoletrans -+ directory; will be written as FONT_MAP to _/etc/vconsole.conf_ in the -+ initramfs -+ -+**vconsole.font.unimap=**__:: -+ 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=**__:: -+ 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.: -++ -+---- -+locale.LANG=pl_PL.utf8 -+---- -+ -+**locale.LC_ALL=**__:: -+ taken from the environment; will be written as LC_ALL to _/etc/locale.conf_ -+ in the initramfs -+ -+LVM -+~~~ -+**rd.lvm=0**:: -+ disable LVM detection -+ -+**rd.lvm.vg=**__:: -+ only activate the volume groups with the given name. rd.lvm.vg can be -+ specified multiple times on the kernel command line. -+ -+**rd.lvm.lv=**__:: -+ only activate the logical volumes with the given name. rd.lvm.lv can be -+ specified multiple times on the kernel command line. -+ -+**rd.lvm.conf=0**:: -+ remove any _/etc/lvm/lvm.conf_, which may exist in the initramfs -+ -+crypto LUKS -+~~~~~~~~~~~ -+**rd.luks=0**:: -+ disable crypto LUKS detection -+ -+**rd.luks.uuid=**__:: -+ only activate the LUKS partitions with the given UUID. Any "luks-" of the -+ LUKS UUID is removed before comparing to __. -+ The comparisons also matches, if __ is only the beginning of the -+ LUKS UUID, so you don't have to specify the full UUID. -+ This parameter can be specified multiple times. -+ -+**rd.luks.crypttab=0**:: -+ do not check, if LUKS partition is in _/etc/crypttab_ -+ -+crypto LUKS - key on removable device support -+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+**rd.luks.key=**_::_:: -+ _keypath_ is a path to key file to look for. It's REQUIRED. When _keypath_ ends with '.gpg' it's considered to be key encrypted symmetrically with GPG. You will be prompted for password on boot. GPG support comes with 'crypt-gpg' module which needs to be added explicitly. -++ -+_keydev_ is a device on which key file resides. It might be kernel name of devices (should start with "/dev/"), UUID (prefixed with "UUID=") or label (prefix with "LABEL="). You don't have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time. -++ -+If _luksdev_ is given, the specified key will only be applied for that LUKS device. Possible values are the same as for _keydev_. Unless you have several LUKS devices, you don't have to specify this parameter. The simplest usage is: -++ -+---- -+rd.luks.key=/foo/bar.key -+---- -++ -+As you see, you can skip colons in such a case. -+ -+MD RAID -+~~~~~~~ -+**rd.md=0**:: -+ disable MD RAID detection -+ -+**rd.md.imsm=0**:: -+ disable MD RAID for imsm/isw raids, use DM RAID instead -+ -+**rd.md.ddf=0**:: -+ disable MD RAID for SNIA ddf raids, use DM RAID instead -+ -+**rd.md.conf=0**:: -+ ignore mdadm.conf included in initramfs -+ -+**rd.md.waitclean=1**:: -+ wait for any resync, recovery, or reshape activity to finish before continuing -+ -+**rd.md.uuid=**__:: -+ only activate the raid sets with the given UUID. This parameter can be -+ specified multiple times. -+ -+DM RAID -+~~~~~~~ -+**rd.dm=0**:: -+ disable DM RAID detection -+ -+**rd.dm.uuid=**__:: -+ only activate the raid sets with the given UUID. This parameter can be -+ specified multiple times. -+ -+FIPS -+~~~~ -+**rd.fips**:: -+ enable FIPS -+ -+**boot=**__:: -+ specify the device, where /boot is located. e.g. -++ -+---- -+boot=/dev/sda1 -+boot=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1 -+boot=UUID= -+boot=LABEL=