network: do not destroy the team interface on teamd shutdown

when doing switch-root teamd gets killed, which tears down the team
interface, if teamd is not started with "-N".

(cherry picked from commit 2a12e97475)

.astylerc

@@ -1,9 +0,0 @@
-lineend=linux
-style=linux
-indent=spaces=8
-convert-tabs
-min-conditional-indent=0
-max-instatement-indent=120
-align-pointer=name
-max-code-length=120
-

.dir-locals.el

@@ -1,25 +1,2 @@
-; Directory Local Variables
-; For more information see (info "(emacs) Directory Variables")
-; Sets emacs variables based on mode.
-; A list of (major-mode . ((var1 . value1) (var2 . value2)))
-; Mode can be nil, which gives default values.
-; Characters width is set to 109 for .c and XML but for everything else 79.
-; If you update this file make sure to update .vimrc and .editorconfig too.
-
-((c-mode . ((fill-column . 109)
-            (c-basic-offset . 8)
-            (eval . (c-set-offset 'substatement-open 0))
-            (eval . (c-set-offset 'statement-case-open 0))
-            (eval . (c-set-offset 'case-label 0))
-            (eval . (c-set-offset 'arglist-intro '++))
-            (eval . (c-set-offset 'arglist-close 0))
-            (eval . (c-set-offset 'arglist-cont-nonempty '(c-lineup-gcc-asm-reg c-lineup-arglist)))))
- (nxml-mode . ((nxml-child-indent . 2)
-               (fill-column . 109)))
- (meson-mode . ((meson-indent-basic . 8)))
- (sh-mode . ((sh-basic-offset . 4)
-             (sh-indentation . 4)))
- (awk-mode . ((c-basic-offset . 8)))
- (nil . ((indent-tabs-mode . nil)
-         (tab-width . 4)
-         (fill-column . 79))) )
+(setq sh-basic-offset: 4)
+(setq indent-tabs-mode nil)

.editorconfig

@@ -1,39 +0,0 @@
-# EditorConfig configuration for dracut
-# http://EditorConfig.org
-
-# If you update this file make sure to update .dir-locals.el and .vimrc too.
-
-# Top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file, utf-8 charset
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-indent_style = space
-indent_size = 4
-switch_case_indent = true
-function_next_line = false
-binary_next_line   = true
-space_redirects    = true
-
-# Match config files, set indent to spaces with width of eight.
-[*.{c,h}]
-indent_style = space
-indent_size = 8
-
-# Match config files, set indent to spaces with width of four.
-[*.sh]
-indent_style = space
-indent_size = 4
-switch_case_indent = true
-function_next_line = false
-binary_next_line   = true
-space_redirects    = true
-
-# Match xml man pages, set indent to spaces with width of two.
-[man/*.xml]
-indent_style = space
-indent_size = 2

.github/CODEOWNERS

@@ -1,9 +0,0 @@
-# This is a comment.
-# Each line is a file pattern followed by one or more owners.
-
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-*       @haraldh @danimo @johannbg
-

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,26 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: A report of an error in a recent Dracut version
-labels: 'bug'
----
-
-**Describe the bug**
-A clear and concise description of what the error is.
-
-**Distribution used**
-Which distribution was this behaviour seen in?
-
-**Dracut version**
-Which dracut version was this behaviour seen in?
-
-**Init system**
-Which init system is being used?
-
-**To Reproduce**
-Steps or code to reproduce the behavior.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Additional context**
-Add any other context you like about the problem here.

.github/ISSUE_TEMPLATE/documentation.md

@@ -1,8 +0,0 @@
----
-name: "\U0001F4D6 Documentation"
-about: Suggest an improvement for documentation in Dracut
-labels: 'documents'
----
-
-**Describe the documentation**
-A clear and concise description of what should be better documented.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +0,0 @@
----
-name: "\U00002728 Feature Request"
-about: A request for enhancement in Dracut
-labels: 'enhancement'
----
-
-**Describe the enhancement**
-A clear and concise description of what the enhancement is that you would like to see.

.github/labeler.yml

@@ -1,293 +0,0 @@
-repository:
-  - ./*
-
-github:
-  - .github/*
-  - .github/**/*
-
-dracut-install:
-  - install/*
-  - install/**/*
-
-example:
-  - examples/*
-  - examples/**/*
-  - examples/**/**/*
-
-modules:
-  - modules.d/*
-  - modules.d/**/*
-
-bash:
-  - modules.d/00bash/*
-
-bootchart:
-  - modules.d/00bootchart/*
-
-dash:
-  - modules.d/00dash/*
-
-mksh:
-  - modules.d/00mksh/*
-
-systemd:
-  - modules.d/00systemd/*
-
-warpclock:
-  - modules.d/00warpclock/*
-
-fips:
-  - modules.d/01fips/*
-
-systemd-initrd:
-  - modules.d/01systemd-initrd/*
-
-caps:
-  - modules.d/02caps/*
-
-systemd-networkd:
-  - modules.d/02systemd-networkd/*
-
-modsign:
-  - modules.d/03modsign/*
-
-rescue:
-  - modules.d/03rescue/*
-
-watchdog:
-  - modules.d/04watchdog/*
-
-busybox:
-  - modules.d/05busybox/*
-
-rngd:
-  - modules.d/06rngd/*
-
-i18n:
-  - modules.d/10i18n/*
-
-convertfs:
-  - modules.d/30convertfs/*
-
-network-legacy:
-  - modules.d/35network-legacy/*
-
-network-manager:
- - modules.d/35network-manager/*
-
-network:
-  - modules.d/40network/*
-
-ifcfg:
-  - modules.d/45ifcfg/*
-
-url-lib:
-  - modules.d/45url-lib/*
-
-drm:
-  - modules.d/50drm/*
-
-gensplash:
-  - modules.d/50gensplash/*
-
-plymouth:
-  - modules.d/50plymouth/*
-
-cms:
-  - modules.d/80cms/*
-
-lvmmerge:
-  - modules.d/80lvmmerge/*
-
-cio_ignore:
-  - modules.d/81cio_ignore/*
-
-btrfs:
-  - modules.d/90btrfs/*
-
-crypt:
-  - modules.d/90crypt/*
-
-dm:
-  - modules.d/90dm/*
-
-dmraid:
-  - modules.d/90dmraid/*
-
-dmsquash-live:
-  - modules.d/90dmsquash-live/*
-
-dmsquash-live-ntfs:
-  - modules.d/90dmsquash-live-ntfs/*
-
-kernel-modules:
-  - modules.d/90kernel-modules/*
-
-kernel-modules-extra:
-  - modules.d/90kernel-modules-extra/*
-
-kernel-network-modules:
-  - modules.d/90kernel-network-modules/*
-
-livenet:
-  - modules.d/90livenet/*
-
-lvm:
-  - modules.d/90lvm/*
-
-mdraid:
-  - modules.d/90mdraid/*
-
-multipath:
-  - modules.d/90multipath/*
-
-nvdimm:
-  - modules.d/90nvdimm/*
-
-ppcmac:
-  - modules.d/90ppcmac/*
-
-qemu:
-  - modules.d/90qemu/*
-
-qemu-net:
-  - modules.d/90qemu-net/*
-
-stratis:
-  - modules.d/90stratis/*
-
-crypt-gpg:
-  - modules.d/91crypt-gpg/*
-
-crypt-loop:
-  - modules.d/91crypt-loop/*
-
-zipl:
-  - modules.d/91zipl/*
-
-cifs:
-  - modules.d/95cifs/*
-
-dasd:
-  - modules.d/95dasd/*
-
-dasd_mod:
-  - modules.d/95dasd_mod/*
-
-dasd_rules:
-  - modules.d/95dasd_rules/*
-
-dcssblk:
-  - modules.d/95dcssblk/*
-
-debug:
-  - modules.d/95debug/*
-
-fcoe:
-  - modules.d/95fcoe/*
-
-fcoe-uefi:
-  - modules.d/95fcoe-uefi/*
-
-fstab-sys:
-  - modules.d/95fstab-sys/*
-
-iscsi:
-  - modules.d/95iscsi/*
-
-lunmask:
-  - modules.d/95lunmask/*
-
-nbd:
-  - modules.d/95nbd/*
-
-nfs:
-  - modules.d/95nfs/*
-
-nvmf:
-  - modules.d/95nvmf/*
-
-qeth_rules:
-  - modules.d/95qeth_rules/*
-
-resume:
-  - modules.d/95resume/*
-
-rootfs-block:
-  - modules.d/95rootfs-block/*
-
-ssh-client:
-  - modules.d/95ssh-client/*
-
-terminfo:
-  - modules.d/95terminfo/*
-
-udev-rules:
-  - modules.d/95udev-rules/*
-
-virtfs:
-  - modules.d/95virtfs/*
-
-zfcp:
-  - modules.d/95zfcp/*
-
-zfcp_rules:
-  - modules.d/95zfcp_rules/*
-
-znet:
-  - modules.d/95znet/*
-
-securityfs:
-  - modules.d/96securityfs/*
-
-biosdevname:
-  - modules.d/97biosdevname/*
-
-masterkey:
-- modules.d/97masterkey/*
-
-dracut-systemd:
-  - modules.d/98dracut-systemd/*
-
-ecryptfs:
-  - modules.d/98ecryptfs/*
-
-integrity:
-  - modules.d/98integrity/*
-
-pollcdrom:
-  - modules.d/98pollcdrom/*
-
-selinux:
-  - modules.d/98selinux/*
-
-syslog:
-  - modules.d/98syslog/*
-
-usrmount:
-  - modules.d/98usrmount/*
-
-base:
-  - modules.d/99base/*
-
-fs-lib:
-  - modules.d/99fs-lib/*
-
-img-lib:
-  - modules.d/99img-lib/*
-
-memstrack:
-  - modules.d/99memstrack/*
-
-shutdown:
-  - modules.d/99shutdown/*
-
-squash:
-  - modules.d/99squash/*
-
-uefi-lib:
-  - modules.d/99uefi-lib/*
-
-test:
-  - test/*
-  - test/**/*

.github/pull_request_template.md

@@ -1,10 +0,0 @@
-This pull request changes...
-
-## Changes
-
-## Checklist
-- [ ] I have tested it locally
-- [ ] I have reviewed and updated any documentation if relevant
-- [ ] I am providing new code and test(s) for it
-
-Fixes #

.github/stale.yml

@@ -1,21 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - documents
-  - enhancement
-  - regression
-  - wiki
-  - bug
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue is being marked as stale because it has not had any recent activity. 
-  It will be closed if no further activity occurs. 
-  If this is still an issue in the latest release of Dracut and you would like to keep it open please comment on this issue within the next 7 days. 
-  Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/container.yml

@@ -1,54 +0,0 @@
-name: Container
-on:
-    schedule:
-        -  cron: '30 11 * * *'   # every day at 4:40
-    push:
-        branches: [ master ]
-        paths:
-            - 'test/container/**'
-            - '.github/workflows/container.yml'
-    pull_request:
-        branches: [ master ]
-        paths:
-            - 'test/container/**'
-            - '.github/workflows/container.yml'
-
-permissions:
-    packages: write
-    contents: read
-
-jobs:
-    push_to_registry:
-        name: Build and push containers image to GitHub Packages
-        runs-on: ubuntu-latest
-        concurrency:
-            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
-            cancel-in-progress: true
-        strategy:
-            fail-fast: false
-            matrix:
-                config:
-                    - { dockerfile: 'Dockerfile-Fedora-33',         tag: 'fedora:33' }
-                    - { dockerfile: 'Dockerfile-Fedora-latest',     tag: 'fedora:latest' }
-                    - { dockerfile: 'Dockerfile-Fedora-rawhide',    tag: 'fedora:rawhide' }
-                    - { dockerfile: 'Dockerfile-OpenSuse-latest',   tag: 'opensuse:latest' }
-                    - { dockerfile: 'Dockerfile-Arch',              tag: 'arch:latest' }
-        steps:
-            -   name: Check out the repo
-                uses: actions/checkout@v2
-            -   name: Set up Docker Buildx
-                uses: docker/setup-buildx-action@v1
-#                with:
-#                    buildkitd-flags: --debug
-            -   name: Login to GitHub Container Registry
-                uses: docker/login-action@v1
-                with:
-                    registry: ghcr.io
-                    username: ${{ github.repository_owner }}
-                    password: ${{ secrets.GITHUB_TOKEN }}
-            -   name: Build and Push Container
-                uses: docker/build-push-action@v2
-                with:
-                    file: test/container/${{ matrix.config.dockerfile }}
-                    tags: ghcr.io/dracutdevs/${{ matrix.config.tag }}
-                    push: ${{ github.event_name == 'push' ||  github.event_name == 'schedule' }}

.github/workflows/integration.yml

@@ -1,81 +0,0 @@
-name: Integration Test
-
-on:
-    pull_request:
-        branches: [ master ]
-
-jobs:
-    basic:
-        runs-on: ubuntu-latest
-        timeout-minutes: 45
-        concurrency:
-            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}
-            cancel-in-progress: true
-        strategy:
-            matrix:
-                container: [
-                        "fedora:33",
-                        "fedora:rawhide",
-                        "opensuse:latest",
-                        "arch:latest",
-                ]
-                test: [
-                        "04",
-                ]
-            fail-fast: false
-        container:
-            image: ghcr.io/dracutdevs/${{ matrix.container }}
-            options: "--privileged -v /dev:/dev"
-        steps:
-            -   name: "Checkout Repository"
-                uses: actions/checkout@v2
-                with:
-                    fetch-depth: 0
-
-            -   name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-                run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
-    test:
-        runs-on: ubuntu-latest
-        timeout-minutes: 45
-        concurrency:
-            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}
-            cancel-in-progress: true
-        strategy:
-            matrix:
-                container: [
-                        "fedora:latest",
-                ]
-                test: [
-                        "01",
-                        "02",
-                        "03",
-                        "04",
-                        "10",
-                        "11",
-                        "12",
-                        "13",
-                        "14",
-                        "15",
-                        "17",
-                        "20",
-                        "21",
-                        "30",
-                        "31",
-                        "35",
-                        "36",
-                        "40",
-                        "41",
-                        "98",
-                ]
-            fail-fast: false
-        container:
-            image: ghcr.io/dracutdevs/${{ matrix.container }}
-            options: "--privileged -v /dev:/dev"
-        steps:
-            -   name: "Checkout Repository"
-                uses: actions/checkout@v2
-                with:
-                    fetch-depth: 0
-
-            -   name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-                run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}

.github/workflows/labels.yml

@@ -1,11 +0,0 @@
-name: "Pull Request Labeler"
-
-on: pull_request_target
-
-jobs:
-    triage:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/labeler@main
-              with:
-                  repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

@@ -1,38 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  lint-c:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: install tools
-        run: sudo apt-get install astyle
-
-      - name: indent
-        run: make indent-c
-
-      - name: check formatting
-        run: git diff --exit-code
-
-  lint-shell:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: shfmt
-        uses: luizm/action-sh-checker@v0.2.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SHFMT_OPTS: -s # arguments to shfmt.
-        with:
-          sh_checker_shellcheck_disable: false
-          sh_checker_comment: true

.github/workflows/pr.yml

@@ -1,19 +0,0 @@
-name: Commisery
-on:
-  pull_request:
-    types: [edited, opened, synchronize, reopened]
-
-jobs:
-  commit-message:
-    name: Conventional Commit Message Checker (Commisery)
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check-out the repo under $GITHUB_WORKSPACE
-      uses: actions/checkout@v2
-
-    - name: Run Commisery
-      uses: dracutdevs/commisery-action@master
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        pull_request: ${{ github.event.number }}
-

.gitignore

@@ -6,11 +6,8 @@
 /dracut-gencmdline.8
 /dracut.html
 /dracut.kernel.7
-/dracut.pc
-/dracut-install
 /modules.d/99base/switch_root
 /test/*/test.log
-/test/*/.testdir
 test*.img
 /.buildpath
 /.project
@@ -18,10 +15,5 @@ test*.img
 /install/dracut-install
 /*.rpm
 /*.[0-9]
-/modules.d/98dracut-systemd/*.service.8
+/modules.d/98systemd/*.service.8
 /*.sign
-*.o
-skipcpio/skipcpio
-/util/util
-/dracut-util
-.idea/

.kateproject

@@ -1,8 +1,8 @@
 {
-  "name": "Dracut"
+  "name": "Kate"
   , "files": [ { "git": 1 } ]
   , "build": {
-    "directory": "./"
+    "directory": "build"
   , "build": "make -j $(getconf _NPROCESSORS_ONLN) all"
   , "clean": "make clean"
   }

.mailmap

@@ -4,34 +4,12 @@ Philippe Seewer <philippe.seewer@bfh.ch> 	<philippe.seewer@bfh.ch>
 Victor Lowther <victor.lowther@gmail.com> 	<victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
 Harald Hoyer <harald@redhat.com> 		<harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
 Harald Hoyer <harald@redhat.com> 		<harald@eeepc.(none)>
-Harald Hoyer <harald@redhat.com> 		<harald@hoyer.xyz>
 Mike Snitzer <snitzer@redhat.com> 		<msnitzer@redhat.com>
 Amerigo Wang <amwang@redhat.com> 		<xiyou.wangcong@gmail.com>
 Andrey Borzenkov <arvidjaar@gmail.com> 		<arvidjaar@mail.ru>
 Dan Horák <dhorak@redhat.com> 			<dan@danny.cz>
 John Reiser <jreiser@bitwagon.com> 		<jreiser@BitWagon.com>
 Luca Berra <bluca@vodka.it> 			<bluca@comedia.it>
-Dave Young <dyoung@redhat.com>	 		<dyoung@redhat.com>
-Dave Young <dyoung@redhat.com>	 		<dave@redhat.com>
+Dave Young <dyoung@redhat.com>	 		dyoung@redhat.com
 Frederick Grose <fgrose@sugarlabs.org> 		<fgrose@gmail.com>
 Frederic Crozat <fcrozat@suse.com> 		<fcrozat@mandriva.com>
-Shawn W Dunn <sfalken@opensuse.org> 		<sfalken@opensuse.org>
-Kyle McMartin <kmcmarti@redhat.com>             <kyle@redhat.com>
-Angelo "pallotron" Failla <pallotron@fb.com>     <pallotron@fb.com>
-Yu Watanabe <watanabe.yu+github@gmail.com>
-Martin Wilck <mwilck@suse.de>   <mwilck@suse.com>
-Thomas Renninger <trenn@suse.com>   <trenn@suse.de>
-Andrey Borzenkov <arvidjaar@gmail.com>
-Cristian Rodríguez <crrodriguez@opensuse.org>
-Daniel Drake <drake@endlessm.com> <dsd@laptop.org>
-Fabian Vogt <fvogt@suse.com>
-Hannes Reinecke <hare@suse.com>  <hare@suse.de>
-Julian Wolf <juwolf@suse.com>  <juwolf@suse.de>
-Lidong Zhong <lidong.zhong@suse.com> <lzhong@suse.com>
-Nikoli <nikoli@gmx.us> <nikoli@lavabit.com>
-Peter Robinson <pbrobinson@fedoraproject.org> <pbrobinson@gmail.com>
-Xunlei Pang <xlpang@redhat.com> <xpang@redhat.com>
-Daniel Molkentin <daniel.molkentin@suse.com> <dmolkentin@suse.com>
-Thomas Blume <thomas.blume@suse.com> <Thomas.Blume@suse.com>
-Brian C. Lane <bcl@redhat.com> <bcl@brianlane.com>
-Tomasz Paweł Gajc <tpgxyz@gmail.com> <tpgxyz@gmail.com>

.packit.yml

@@ -1,55 +0,0 @@
-# This file is part of dracut.
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# The name of the upstream package
-upstream_package_name: dracut
-
-# The upstream tag versioning scheme
-upstream_tag_template: "{version}"
-
-# The URL of the upstream project
-upstream_project_url: https://github.com/dracutdevs/dracut
-
-# Relative path to a spec file within the upstream repository
-specfile_path: pkgbuild/dracut.spec
-
-# Name of the downstream package
-downstream_package_name: dracut
-
-# The URL of the downstream project
-dist_git_base_url: https://src.fedoraproject.org/
-
-# Sync file(s) from upstream repo to dist-git
-synced_files:
-  # The dracut spec file is maintained upstream so we sync it downstream.
-  - dracut.spec
-  # We sync the packit file downstream be able to optionally use the sync-from-downstream command
-  - .packit.yaml
-
-# We want new releases to be automatically built on rawhide and have few jobs
-# on copr.
-create_pr: false
-jobs:
-- job: propose_downstream
-  trigger: release
-  metadata:
-    dist_git_branches: master
-
-- job: tests
-  trigger: pull_request
-  metadata:
-    targets:
-      - fedora-rawhide
-
-- job: copr_build
-  trigger: pull_request
-  metadata:
-    targets:
-      - fedora-development
-
-- job: copr_build
-  trigger: commit
-  metadata:
-    targets:
-      - fedora-all
-      - fedora-development

.shellcheckrc

@@ -1,34 +0,0 @@
-# SC2039: In POSIX sh, 'local' is undefined.
-# https://github.com/koalaman/shellcheck/wiki/SC2039
-disable=SC2039
-
-# SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
-# https://github.com/koalaman/shellcheck/wiki/SC2166
-disable=SC2166
-
-# SC2154: Variable is referenced but not assigned
-# https://github.com/koalaman/shellcheck/wiki/SC2154
-disable=SC2154
-
-# SC1091: Not following <file>
-# https://github.com/koalaman/shellcheck/wiki/SC1091
-disable=SC1091
-
-# SC2174: When used with -p, -m only applies to the deepest directory.
-# https://github.com/koalaman/shellcheck/wiki/SC2174
-disable=SC2174
-
-# SC3043: In POSIX sh, 'local' is undefined.
-# https://github.com/koalaman/shellcheck/wiki/SC3043
-# ... but dash supports it
-disable=SC3043
-
-# SC3013: In POSIX sh, -ef is undefined.
-# https://github.com/koalaman/shellcheck/wiki/SC3013
-# ... but dash supports it
-disable=SC3013
-
-# SC3045: In POSIX sh, read -p is undefined.
-# https://github.com/koalaman/shellcheck/wiki/SC3045
-# ... but dash supports it
-disable=SC3045

.vimrc

@@ -1,15 +0,0 @@
-" Vim can use per directory configuration files like this.
-" To enable that feature two lines are needed in your ~/.vimrc
-" set exrc   " enables per-directory .vimrc files
-" set secure   " disable unsafe commands in local .vimrc files
-" Characters width is set to 109 for .c and XML but for everything else 79.
-" If you update this file make sure to update .dir-locals.el & .editorconfig
-
-set tabstop=4
-set shiftwidth=4
-set expandtab
-set makeprg=GCC_COLORS=\ make
-set tw=79
-au BufRead,BufNewFile *.xml set tw=109 shiftwidth=2 smarttab
-au FileType sh set tw=80 shiftwidth=4 smarttab
-au FileType c set tw=109 shiftwidth=8 tabstop=8 smarttab expandtab

50-dracut.install

@@ -0,0 +1,33 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
+fi
+
+if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
+    readarray -t BOOT_OPTIONS < /proc/cmdline
+fi
+
+unset noimageifnotneeded
+
+for ((i=0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
+    if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
+        noimageifnotneeded="yes"
+        break
+    fi
+done
+
+ret=0
+case "$1" in
+    add)
+	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$3"/initrd "$2"
+        ret=$?
+	;;
+    remove)
+        rm -f -- "$3"/initrd
+        ret=$?
+	;;
+esac
+exit $ret

51-dracut-rescue-postinst.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+export LANG=C
+
+KERNEL_VERSION="$1"
+KERNEL_IMAGE="$2"
+
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
+fi
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+[[ $MACHINE_ID ]] || exit 1
+[[ -f $KERNEL_IMAGE ]] || exit 1
+
+INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img"
+NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}"
+
+[[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0
+
+dropindirs_sort()
+{
+    suffix=$1; shift
+    args=("$@")
+    files=$(
+        while (( $# > 0 )); do
+            for i in ${1}/*${suffix}; do
+                [[ -f $i ]] && echo ${i##*/}
+            done
+            shift
+        done | sort -Vu
+    )
+
+    for f in $files; do
+        for d in "${args[@]}"; do
+            if [[ -f "$d/$f" ]]; then
+                echo "$d/$f"
+                continue 2
+            fi
+        done
+    done
+}
+
+# source our config dir
+for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
+    [[ -e $f ]] && . "$f"
+done
+
+[[ $dracut_rescue_image != "yes" ]] && exit 0
+
+if [[ ! -f $INITRDFILE ]]; then
+    dracut --no-hostonly -a "rescue" "$INITRDFILE" "$KERNEL_VERSION"
+    ((ret+=$?))
+fi
+
+if [[ ! -f $NEW_KERNEL_IMAGE ]]; then
+    cp "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
+    ((ret+=$?))
+fi
+
+new-kernel-pkg --install "$KERNEL_VERSION" --kernel-image "$NEW_KERNEL_IMAGE" --initrdfile "$INITRDFILE" --banner "$NAME $VERSION_ID Rescue $MACHINE_ID"
+
+((ret+=$?))
+
+exit $ret

51-dracut-rescue.install

@@ -0,0 +1,103 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+export LANG=C
+
+COMMAND="$1"
+KERNEL_VERSION="$2"
+BOOT_DIR_ABS="${3%/*}/0-rescue"
+KERNEL_IMAGE="$4"
+
+
+dropindirs_sort()
+{
+    suffix=$1; shift
+    args=("$@")
+    files=$(
+        while (( $# > 0 )); do
+            for i in ${1}/*${suffix}; do
+                [[ -f $i ]] && echo ${i##*/}
+            done
+            shift
+        done | sort -Vu
+    )
+
+    for f in $files; do
+        for d in "${args[@]}"; do
+            if [[ -f "$d/$f" ]]; then
+                echo "$d/$f"
+                continue 2
+            fi
+        done
+    done
+}
+
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
+fi
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
+fi
+if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
+    readarray -t BOOT_OPTIONS < /proc/cmdline
+fi
+if ! [[ $BOOT_OPTIONS ]]; then
+    exit 1
+fi
+
+LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"
+BOOT_DIR="/${MACHINE_ID}/0-rescue"
+
+ret=0
+
+case "$COMMAND" in
+    add)
+        for i in "/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"; do
+            [[ -f $i ]] && exit 0
+        done
+
+        # source our config dir
+        for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
+            [[ -e $f ]] && . "$f"
+        done
+
+        [[ $dracut_rescue_image != "yes" ]] && exit 0
+
+        [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
+
+        if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then
+            echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&2
+        fi
+
+        dracut --no-hostonly  -a "rescue" "$BOOT_DIR_ABS"/initrd "$2"
+        ((ret+=$?))
+
+        {
+            echo "title      $PRETTY_NAME - Rescue Image"
+            echo "version    $KERNEL_VERSION"
+            echo "machine-id $MACHINE_ID"
+            echo "options    ${BOOT_OPTIONS[@]} rd.auto=1"
+            echo "linux      $BOOT_DIR/linux"
+            echo "initrd     $BOOT_DIR/initrd"
+        } > $LOADER_ENTRY
+        ((ret+=$?))
+        ;;
+
+    remove)
+        exit 0
+        ;;
+
+    *)
+        usage
+        ret=1;;
+esac
+
+((ret+=$?))
+
+exit $ret

AUTHORS

@@ -1,318 +1,105 @@
 Harald Hoyer <harald@redhat.com>
 Victor Lowther <victor.lowther@gmail.com>
-Jóhann B. Guðmundsson <johannbg@gmail.com>
 Amadeusz Żołnowski <aidecoe@aidecoe.name>
-Daniel Molkentin <daniel.molkentin@suse.com>
-Hannes Reinecke <hare@suse.com>
 Will Woods <wwoods@redhat.com>
-Kairui Song <kasong@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-Dave Young <dyoung@redhat.com>
 Jeremy Katz <katzj@redhat.com>
-Lukas Nykryn <lnykryn@redhat.com>
+Dave Young <dyoung@redhat.com>
 David Dillow <dave@thedillows.org>
-Lubomir Rintel <lkundrak@v3.sk>
 Michal Soltys <soltys@ziu.info>
-Colin Guthrie <colin@mageia.org>
 Amerigo Wang <amwang@redhat.com>
-Thomas Renninger <trenn@suse.com>
-Alexander Tsoy <alexander@tsoy.me>
-Martin Wilck <mwilck@suse.de>
-Frederick Grose <fgrose@sugarlabs.org>
-WANG Chao <chaowang@redhat.com>
-Yu Watanabe <watanabe.yu+github@gmail.com>
+Colin Guthrie <colin@mageia.org>
 Andrey Borzenkov <arvidjaar@gmail.com>
-Hans de Goede <hdegoede@redhat.com>
-Jonathan Lebon <jonathan@jlebon.com>
 Peter Jones <pjones@redhat.com>
-Peter Robinson <pbrobinson@fedoraproject.org>
 Andreas Thienemann <andreas@bawue.net>
-Frantisek Sumsal <frantisek@sumsal.cz>
-Fabian Vogt <fvogt@suse.com>
-Nicolas Chauvet <kwizart@gmail.com>
-Zoltán Böszörményi <zboszor@pr.hu>
-Beniamino Galvani <bgalvani@redhat.com>
-Colin Walters <walters@verbum.org>
+Hans de Goede <hdegoede@redhat.com>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
-Tomasz Paweł Gajc <tpgxyz@gmail.com>
-Xunlei Pang <xlpang@redhat.com>
-Brian C. Lane <bcl@redhat.com>
-Daniel Drake <drake@endlessm.com>
-Renaud Métrich <rmetrich@redhat.com>
-Angelo "pallotron" Failla <pallotron@fb.com>
-Thomas Blume <thomas.blume@suse.com>
-Ville Skyttä <ville.skytta@iki.fi>
-Böszörményi Zoltán <zboszor@pr.hu>
-Cristian Rodríguez <crrodriguez@opensuse.org>
+WANG Chao <chaowang@redhat.com>
+Daniel Drake <dsd@laptop.org>
 Dan Horák <dhorak@redhat.com>
-Javier Martinez Canillas <javierm@redhat.com>
-Ondrej Mosnacek <omosnace@redhat.com>
 Baoquan He <bhe@redhat.com>
-Brendan Germain <brendan.germain@nasdaqomx.com>
-David Tardon <dtardon@redhat.com>
-Dusty Mabe <dusty@dustymabe.com>
-Jonas Witschel <diabonas@gmx.de>
 Leho Kraav <leho@kraav.com>
-Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
-Moritz Maxeiner <moritz@ucworks.org>
-Nathan Rini <nate@ucar.edu>
-Radek Vykydal <rvykydal@redhat.com>
-Đoàn Trần Công Danh <congdanhqx@gmail.com>
-Fabian Deutsch <fabiand@fedoraproject.org>
+Brian C. Lane <bcl@redhat.com>
 Kamil Rytarowski <n54@gmx.com>
-Lidong Zhong <lidong.zhong@suse.com>
 Marc Grimme <grimme@atix.de>
-Mike Gilbert <floppym@gentoo.org>
-NeilBrown <neilb@suse.de>
-Peter Rajnoha <prajnoha@redhat.com>
-Thorsten Behrens <tbehrens@suse.com>
-Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-q66 <daniel@octaforge.org>
-Adam Williamson <awilliam@redhat.com>
 Chao Wang <chaowang@redhat.com>
 Frederic Crozat <fcrozat@suse.com>
-James Lee <jlee@thestaticvoid.com>
 Jesse Keating <jkeating@redhat.com>
 Milan Broz <mbroz@redhat.com>
-Mimi Zohar <zohar@linux.vnet.ibm.com>
-Norbert Lange <norbert.lange@andritz.com>
+Radek Vykydal <rvykydal@redhat.com>
 Roberto Sassu <roberto.sassu@polito.it>
-Stefan Reimer <it@startux.de>
-Takashi Iwai <tiwai@suse.de>
 Anton Blanchard <anton@samba.org>
 Bill Nottingham <notting@redhat.com>
-Chapman Flack <g2@anastigmatix.net>
-Chris Leech <cleech@redhat.com>
+Colin Walters <walters@verbum.org>
 David Cantrell <dcantrell@redhat.com>
 Dennis Gilmore <dennis@ausil.us>
-Doan Tran Cong Danh <congdanhqx@gmail.com>
-Gaël PORTAY <gael.portay@collabora.com>
-Jan Synacek <jsynacek@redhat.com>
-Jiri Konecny <jkonecny@redhat.com>
 Jon Ander Hernandez <jonan.h@gmail.com>
 Juan RP <xtraeme@gmail.com>
 Lance Albertson <lance@osuosl.org>
-Marcos Mello <marcosfrm@gmail.com>
 Marian Ganisin <mganisin@redhat.com>
-Matthias Gerstner <matthias.gerstner@suse.de>
-Max Resch <resch.max@gmail.com>
 Michael Ploujnikov <plouj@somanetworks.com>
-Pratyush Anand <panand@redhat.com>
-Silvio Fricke <silvio.fricke@gmail.com>
-Steven Brudenell <steven.brudenell@gmail.com>
-Stig Telfer <stelfer@cray.com>
-Thomas Backlund <tmb@mageia.org>
-Topi Miettinen <toiwoton@gmail.com>
-Vasiliy Tolstov <v.tolstov@selfip.ru>
+Peter Rajnoha <prajnoha@redhat.com>
 Wim Muskee <wimmuskee@gmail.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Alan Pevec <apevec@redhat.com>
-Alex Harpin <development@landsofshadow.co.uk>
-Alexey Shabalin <shaba@altlinux.org>
-Ankit Kumar <ankit@linux.vnet.ibm.com>
-Antony Messerli <amesserl@rackspace.com>
-Chao Fan <cfan@redhat.com>
-Daniel Cordero <dracut@0xdc.io>
-Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Daniel Schaal <farbing@web.de>
-Denis Silakov <dsilakov@virtuozzo.com>
-Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
-Erwan Velu <erwan.velu@enovance.com>
-Evgeny Vereshchagin <evvers@ya.ru>
-Guido Trentalancia <guido@trentalancia.net>
-Hari Bathini <hbathini@linux.vnet.ibm.com>
+Frederick Grose <fgrose@sugarlabs.org>
 Ian Dall <ian@beware.dropbear.id.au>
-Imran Haider <imran1008@gmail.com>
 James Buren <ryuo@frugalware.org>
-Jan Macku <jamacku@redhat.com>
+James Lee <jlee@thestaticvoid.com>
 Joey Boggs <jboggs@redhat.com>
-Julian Wolf <juwolf@suse.com>
-Koen Kooi <koen@dominion.thruhere.net>
 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Kyle McMartin <kmcmarti@redhat.com>
-Luiz Angelo Daros de Luca <luizluca@gmail.com>
-Lukas Wunner <lukas@wunner.de>
-Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Marko Myllynen <myllynen@redhat.com>
-Matthew Thode <mthode@mthode.org>
-Michal Koutný <mkoutny@suse.com>
 Mike Snitzer <snitzer@redhat.com>
-Minfei Huang <mhuang@redhat.com>
-Nikoli <nikoli@gmx.us>
-Patrick Talbert <ptalbert@redhat.com>
-Pedro Monreal <pmgdeb@gmail.com>
-Petr Pavlu <petr.pavlu@suse.com>
-Pingfan Liu <piliu@redhat.com>
 Przemysław Rudy <prudy1@o2.pl>
-Robert LeBlanc <robert@leblancnet.us>
-Robert Scheck <robert@fedoraproject.org>
-Stefan Berger <stefanb@us.ibm.com>
+Stefan Reimer <it@startux.de>
 Thomas Lange <lange@informatik.uni-koeln.de>
-Till Maas <opensource@till.name>
-Tony Asleson <tasleson@redhat.com>
 Vivek Goyal <vgoyal@redhat.com>
 Vladislav Bogdanov <bubble@hoster-ok.com>
-Érico Rolim <erico.erc@gmail.com>
-наб <nabijaczleweli@nabijaczleweli.xyz>
-A. Wilcox <AWilcox@Wilcox-Tech.com>
-Adam Alves <adamoa@gmail.com>
-Alexander Kurtz <alexander@kurtz.be>
-Alexander Miroshnichenko <alex@millerson.name>
-Alexander Sosedkin <asosedkin@redhat.com>
+Adam Williamson <awilliam@redhat.com>
 Alexander Todorov <atodorov@redhat.com>
-Alexey Kodanev <alexey.kodanev@oracle.com>
-Andreas Schwab <schwab@suse.de>
-Andreas Stieger <astieger@suse.com>
-Andrew J. Hesford <ajh@sideband.org>
 Andy Lutomirski <luto@mit.edu>
-Anjali Kulkarni <anjali.k.kulkarni@oracle.com>
 Anssi Hannula <anssi@mageia.org>
-Antz <antzz@protonmail.ch>
-Arnaud Rebillout <arnaud.rebillout@collabora.com>
-Artem Savkov <asavkov@redhat.com>
-Attila Bruncsak <bruncsak@users.noreply.github.com>
-B. Wilson <x@wilsonb.com>
-Ben Howard <ben.howard@redhat.com>
-Benjamin Marzinski <bmarzins@redhat.com>
 Brandon Philips <brandon@ifup.co>
-Bruno E. O. Meneguele <bmeneg@redhat.com>
-Bryn M. Reeves <bmr@redhat.com>
 Canek Peláez Valdés <caneko@gmail.com>
-Carlo Caione <carlo@endlessm.com>
-Chad Dupuis <chad.dupuis@cavium.com>
+Chris Leech <cleech@redhat.com>
 Christian Heinz <christian.ch.heinz@gmail.com>
 Cong Wang <amwang@redhat.com>
-Dan Fuhry <dfuhry@datto.com>
+Daniel Schaal <farbing@web.de>
 Dave Jones <davej@redhat.com>
-David Disseldorp <ddiss@suse.de>
-David Hildenbrand <david@redhat.com>
-David Michael <david.michael@coreos.com>
-Denis Volkov <denis@simpletexting.net>
+Dave Young <dave@redhat.com>
 Dennis Schridde <devurandom@gmx.net>
-Derek Hageman <hageman@inthat.cloud>
-Derek Higgins <derekh@redhat.com>
-Donovan Tremura <neurognostic@protonmail.ch>
 Duane Griffin <duaneg@dghda.com>
-Elan Ruusamäe <glen@delfi.ee>
-Enno Boland <g@s01.de>
-Enzo Matsumiya <ematsumiya@suse.de>
-Eugene S. Sobolev <sobolev@protei.ru>
-Eugene Syromiatnikov <esyr@redhat.com>
-Evgeni Golov <evgeni@golov.de>
-Fabian Vogt <fvogt@suse.de>
-Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
-Florian Gamböck <mail@floga.de>
-Frank Deng <frank.deng@oracle.com>
-François Cami <fcami@fedoraproject.org>
-Gerd von Egidy <gerd.von.egidy@intra2net.com>
 Glen Gray <slaine@slaine.org>
-GuoChuang <guo.chuang@zte.com.cn>
-HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
-Hendrik Brueckner <brueckner@linux.ibm.com>
 Hermann Gausterer <git-dracut-2012@mrq1.org>
-Hiroaki Mizuguchi <hiroaki-m@iij.ad.jp>
-Hongxu Jia <hongxu.jia@windriver.com>
-Hui Wang <john.wanghui@huawei.com>
-Ignaz Forster <iforster@suse.com>
-Jacob Wen <jian.w.wen@oracle.com>
 James Laska <jlaska@redhat.com>
 Jan Stodola <jstodola@redhat.com>
-Jaroslav Jindrak <dzejrou@gmail.com>
-Jason Dana <jasondana@quarksecurity.com>
-Jens Heise <46450477+heisej@users.noreply.github.com>
-Jeremy Linton <lintonrjeremy@gmail.com>
 Jiri Pirko <jiri@resnulli.us>
 Joe Lawrence <Joe.Lawrence@stratus.com>
-Johannes Thumshirn <jthumshirn@suse.com>
-Jonas Jelten <jj@sft.lol>
-Jonas Jonsson <jonas@websystem.se>
-Jonas Witschel <diabonas@archlinux.org>
 Kevin Yung <Kevin.Yung@myob.com>
+Kyle McMartin <kyle@redhat.com>
 Lars R. Damerow <lars@pixar.com>
-Lee Duncan <lduncan@suse.com>
-Lennart Poettering <lennart@poettering.net>
 Lennert Buytenhek <buytenh@wantstofly.org>
-Lev Veyde <lveyde@redhat.com>
-Lianbo Jiang <lijiang@redhat.com>
-Lucas C. Villa Real <lucasvr@gmail.com>
-Major Hayden <major@mhtx.net>
-Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-Marian Csontos <mcsontos@redhat.com>
-Mark Fasheh <mfasheh@suse.de>
+Lubomir Rintel <lkundrak@v3.sk>
 Matt <smoothsailing72@hotmail.com>
 Matt Smith <shadowfax@gmx.com>
-Mei Liu <liumbj@linux.vnet.ibm.com>
-Michael Chapman <mike@very.puzzling.org>
-Michael McCracken <michael.mccracken@gmail.com>
 Michal Schmidt <mschmidt@redhat.com>
-Michal Sekletar <msekleta@redhat.com>
 Mike Gorse <mgorse@suse.com>
-Moritz 'Morty' Strübe <morty@gmx.net>
 Munehiro Matsuda <haro@kgt.co.jp>
-Nicolas Porcel <nicolasporcel06@gmail.com>
-Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Nicolas Chauvet <kwizart@gmail.com>
+Nikoli <nikoli@lavabit.com>
 Olivier Blin <dev@blino.org>
-Ondrej Dubaj <odubaj@redhat.com>
-P J P <ppandit@redhat.com>
 Paolo Bonzini <pbonzini@redhat.com>
-Paul Robins <exp@users.noreply.github.com>
-Pavel Zhukov <pzhukov@redhat.com>
-Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
-Pekka Wallendahl <wyrmiyu@gmail.com>
-Peter Georg <peter.georg@physik.uni-regensburg.de>
-Peter Levine <plevine457@gmail.com>
-Petr Tesarik <ptesarik@suse.com>
-Petr Vorel <pvorel@suse.cz>
-Prarit Bhargava <prarit@redhat.com>
-Praveen_Paladugu@Dell.com <Praveen_Paladugu@Dell.com>
+Peter Robinson <pbrobinson@fedoraproject.org>
 Pádraig Brady <P@draigBrady.com>
 Quentin Armitage <quentin@armitage.org.uk>
 Robert Buchholz <rbu@goodpoint.de>
-Ruben Kerkhof <ruben@rubenkerkhof.com>
-Rumbaut Thomas <Thomas.Rumbaut@digipolis.gent>
-Rusty Bird <rustybird@openmailbox.org>
-Sebastian Mitterle <smitterl@redhat.com>
-Sergei Iudin <tsipa740@gmail.com>
 Sergey Fionov <fionov@gmail.com>
-Shawn W Dunn <sfalken@opensuse.org>
 Srinivasa T N <seenutn@linux.vnet.ibm.com>
-Stefan Berger <stefanb@linux.ibm.com>
-Stijn Hoop <stijn@sandcat.nl>
-Sullivan (CTR), Austin <austin.sullivan.ctr@progeny.net>
-Thierry Vignaud <thierry.vignaud@gmail.com>
 Thilo Bangert <thilo.bangert@gmx.net>
-Thomas Abraham <tabraham@suse.com>
-Tobias Geerinckx <tobias.geerinckx@gmail.com>
-Tobias Klauser <tklauser@distanz.ch>
-Tom Gundersen <teg@jklm.no>
+Thomas Backlund <tmb@mageia.org>
 Tomasz Torcz <tomek@pipebreaker.pl>
-Tong Li <tonli@redhat.com>
 Vadim Kuznetsov <vadimk@gentoo.org>
-Vaughan Cao <vaughan.cao@oracle.com>
-Vladius25 <vkorol2509@icloud.com>
-Vratislav Podzimek <vpodzime@redhat.com>
-Yang Liu <50459973+ly4096x@users.noreply.github.com>
+Ville Skyttä <ville.skytta@iki.fi>
 Yanko Kaneti <yaneti@declera.com>
-Zhiguo Deng <bjzgdeng@linux.vnet.ibm.com>
-Ziyue Yang <ziyang@redhat.com>
-foopub <45460217+foopub@users.noreply.github.com>
-gaoyi <ymuemc@163.com>
-honza801 <honza801@gmail.com>
-jbash aka John Bashinski <jbash@velvet.com>
-jloeser <jloeser@suse.de>
-johannes <johannes.brechtmann@gmail.com>
-jonathan-teh <30538043+jonathan-teh@users.noreply.github.com>
-leo-lb <lle-bout@zaclys.net>
-logan <logancaldwell23@gmail.com>
-masem <matej.semian@gmail.com>
 maximilian attems <max@stro.at>
-mulhern <amulhern@redhat.com>
-mwberry <mwberry@users.noreply.github.com>
-nabijaczleweli <nabijaczleweli@gmail.com>
-privb0x23 <privb0x23@users.noreply.github.com>
-realtime-neil <neil@rtr.ai>
-xtraeme <xtraeme@voidlinux.eu>
-Дамјан Георгиевски <gdamjan@gmail.com>

HACKING

@@ -0,0 +1,23 @@
+Right now, most of the testing is done using a qemu/kvm guest and
+generating the initramfs on another box but the support is all present
+to build for the "running" machine.  For the former, you can boot the guest
+using qemu's -kernel and -initrd options.
+
+dracut exists and will build an image.  It is command-line equivalent
+to most mkinitrd implementations and should be pretty straight-forward
+to use.
+
+To use, just run dracut with an output file name and, optionally, a
+kernel version (it defaults to using the current).   The appropriate
+modules will be copied over and things should be good to go.  If you'd
+like to customize the list of modules copied in, edit /etc/dracut.conf
+and set
+  dracutmodules="foo bar baz"
+
+Note that dracut calls functional components in modules.d "modules"
+while kernel modules are called "drivers".
+
+Requirements:
+* udev
+* nfs module: nfs daemon and rpc helper
+* iscsi: iscsi

Makefile

@@ -1,22 +1,10 @@
 -include dracut-version.sh
 
-DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
-ifeq ($(DRACUT_MAIN_VERSION),)
-DRACUT_MAIN_VERSION = $(DRACUT_VERSION)
-endif
-DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
-ifeq ($(DRACUT_FULL_VERSION),)
-DRACUT_FULL_VERSION = $(DRACUT_VERSION)
-endif
-
-HAVE_SHELLCHECK ?= $(shell which shellcheck >/dev/null 2>&1 && echo yes)
-HAVE_SHFMT ?= $(shell which shfmt >/dev/null  2>&1 && echo yes)
-HAVE_RPMBUILD ?= $(shell which rpmbuild >/dev/null  2>&1 && echo yes)
+VERSION = $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
+GITVERSION = $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
 
 -include Makefile.inc
 
-KVERSION ?= $(shell uname -r)
-
 prefix ?= /usr
 libdir ?= ${prefix}/lib
 datadir ?= ${prefix}/share
@@ -24,83 +12,64 @@ pkglibdir ?= ${libdir}/dracut
 sysconfdir ?= ${prefix}/etc
 bindir ?= ${prefix}/bin
 mandir ?= ${prefix}/share/man
-CFLAGS ?= -O2 -g -Wall -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2
+CFLAGS ?= -O2 -g -Wall
+CFLAGS += -std=gnu99  -D_FILE_OFFSET_BITS=64
 bashcompletiondir ?= ${datadir}/bash-completion/completions
-pkgconfigdatadir ?= $(datadir)/pkgconfig
 
-man1pages = man/lsinitrd.1
+man1pages = lsinitrd.1
 
-man5pages = man/dracut.conf.5
+man5pages = dracut.conf.5
 
-man7pages = man/dracut.cmdline.7 \
-            man/dracut.bootup.7 \
-            man/dracut.modules.7
+man7pages = dracut.cmdline.7 \
+            dracut.bootup.7 \
+            dracut.modules.7
 
-man8pages = man/dracut.8 \
-            man/dracut-catimages.8 \
-            modules.d/98dracut-systemd/dracut-cmdline.service.8 \
-            modules.d/98dracut-systemd/dracut-initqueue.service.8 \
-            modules.d/98dracut-systemd/dracut-mount.service.8 \
-            modules.d/98dracut-systemd/dracut-shutdown.service.8 \
-            modules.d/98dracut-systemd/dracut-pre-mount.service.8 \
-            modules.d/98dracut-systemd/dracut-pre-pivot.service.8 \
-            modules.d/98dracut-systemd/dracut-pre-trigger.service.8 \
-            modules.d/98dracut-systemd/dracut-pre-udev.service.8
+man8pages = dracut.8 \
+            dracut-catimages.8 \
+            mkinitrd.8 \
+            modules.d/98systemd/dracut-cmdline.service.8 \
+            modules.d/98systemd/dracut-initqueue.service.8 \
+            modules.d/98systemd/dracut-mount.service.8 \
+            modules.d/98systemd/dracut-shutdown.service.8 \
+            modules.d/98systemd/dracut-pre-mount.service.8 \
+            modules.d/98systemd/dracut-pre-pivot.service.8 \
+            modules.d/98systemd/dracut-pre-trigger.service.8 \
+            modules.d/98systemd/dracut-pre-udev.service.8
 
 manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
-.PHONY: install clean archive rpm srpm testimage test all check AUTHORS CONTRIBUTORS doc dracut-version.sh
+.PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
 
-all: dracut-version.sh dracut.pc dracut-install src/skipcpio/skipcpio dracut-util
-
-%.o : %.c
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
+all: dracut-version.sh dracut-install skipcpio/skipcpio
 
 DRACUT_INSTALL_OBJECTS = \
-        src/install/dracut-install.o \
-        src/install/hashmap.o\
-        src/install/log.o \
-        src/install/strv.o \
-        src/install/util.o
+        install/dracut-install.o \
+        install/hashmap.o\
+        install/log.o \
+        install/util.o
 
 # deps generated with gcc -MM
-src/install/dracut-install.o: src/install/dracut-install.c src/install/log.h src/install/macro.h \
-	src/install/hashmap.h src/install/util.h
-src/install/hashmap.o: src/install/hashmap.c src/install/util.h src/install/macro.h src/install/log.h \
-	src/install/hashmap.h
-src/install/log.o: src/install/log.c src/install/log.h src/install/macro.h src/install/util.h
-src/install/util.o: src/install/util.c src/install/util.h src/install/macro.h src/install/log.h
-src/install/strv.o: src/install/strv.c src/install/strv.h src/install/util.h src/install/macro.h src/install/log.h
+install/dracut-install.o: install/dracut-install.c install/log.h install/macro.h \
+	install/hashmap.h install/util.h
+install/hashmap.o: install/hashmap.c install/util.h install/macro.h install/log.h \
+	install/hashmap.h
+install/log.o: install/log.c install/log.h install/macro.h install/util.h
+install/util.o: install/util.c install/util.h install/macro.h install/log.h
 
-src/install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
-	$(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS)
+install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
 
-logtee: src/logtee/logtee.c
-	$(CC) $(LDFLAGS) -o $@ $<
-
-dracut-install: src/install/dracut-install
+dracut-install: install/dracut-install
 	ln -fs $< $@
 
-SKIPCPIO_OBJECTS = src/skipcpio/skipcpio.o
-skipcpio/skipcpio.o: src/skipcpio/skipcpio.c
-skipcpio/skipcpio: $(SKIPCPIO_OBJECTS)
+SKIPCPIO_OBJECTS= \
+	skipcpio/skipcpio.o
 
-UTIL_OBJECTS = src/util/util.o
-util/util.o: src/util/util.c
-util/util: $(UTIL_OBJECTS)
+skipcpio/skipcpio.o: skipcpio/skipcpio.c
+skipcpio/skipcpio: skipcpio/skipcpio.o
 
-dracut-util: src/util/util
-	cp -a $< $@
-
-.PHONY: indent-c
-indent-c:
-	astyle -n --quiet --options=.astylerc $(wildcard *.[ch] */*.[ch] src/*/*.[ch])
-
-.PHONY: indent
-indent: indent-c
-ifeq ($(HAVE_SHFMT),yes)
-	shfmt -w -s .
-endif
+indent:
+	indent -i8 -nut -br -linux -l120 install/dracut-install.c
+	indent -i8 -nut -br -linux -l120 skipcpio/skipcpio.c
 
 doc: $(manpages) dracut.html
 
@@ -109,38 +78,22 @@ all: doc
 endif
 
 %: %.xml
-	@rm -f -- "$@"
-	xsltproc -o "$@" -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 %.xml: %.asc
-	@rm -f -- "$@"
-	asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $<
+	asciidoc -d manpage -b docbook -o $@ $<
 
-dracut.8: man/dracut.8.asc \
-	man/dracut.usage.asc
+dracut.8: dracut.usage.asc dracut.8.asc
 
-dracut.html: man/dracut.asc $(manpages) docs/dracut.css man/dracut.usage.asc
-	@rm -f -- dracut.xml
-	asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \
-		-a "version=$(DRACUT_FULL_VERSION)" \
-		-a numbered \
-		-d book -b docbook -o dracut.xml man/dracut.asc
-	@rm -f -- dracut.html
+dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
+	asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc
 	xsltproc -o dracut.html --xinclude -nonet \
-		--stringparam custom.css.source docs/dracut.css \
+		--stringparam custom.css.source dracut.css \
 		--stringparam generate.css.header 1 \
 		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
-	@rm -f -- dracut.xml
+	rm -f -- dracut.xml
 
-dracut.pc: Makefile.inc Makefile
-	@echo "Name: dracut" > dracut.pc
-	@echo "Description: dracut" >> dracut.pc
-	@echo "Version: $(DRACUT_FULL_VERSION)" >> dracut.pc
-	@echo "dracutdir=$(pkglibdir)" >> dracut.pc
-	@echo "dracutmodulesdir=$(pkglibdir)/modules.d" >> dracut.pc
-	@echo "dracutconfdir=$(pkglibdir)/dracut.conf.d" >> dracut.pc
-
-install: all
+install: dracut-version.sh
 	mkdir -p $(DESTDIR)$(pkglibdir)
 	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(sysconfdir)
@@ -148,11 +101,11 @@ install: all
 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
 	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
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
 	mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
-	install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh
 	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
 	install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
 	ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
@@ -168,10 +121,10 @@ ifneq ($(enable_documentation),no)
 endif
 	if [ -n "$(systemdsystemunitdir)" ]; then \
 		mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
-		ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98dracut-systemd/dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown.service; \
-		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants; \
+		ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown.service; \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
 		ln -s ../dracut-shutdown.service \
-		$(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/dracut-shutdown.service; \
+		$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
 		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants; \
 		for i in \
 		    dracut-cmdline.service \
@@ -182,32 +135,26 @@ endif
 		    dracut-pre-trigger.service \
 		    dracut-pre-udev.service \
 		    ; do \
-			ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98dracut-systemd/$$i $(DESTDIR)$(systemdsystemunitdir); \
+			ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/$$i $(DESTDIR)$(systemdsystemunitdir); \
 			ln -s ../$$i \
 			$(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
 		done \
 	fi
-	if [ -f src/install/dracut-install ]; then \
-		install -m 0755 src/install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
+	if [ -f install/dracut-install ]; then \
+		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
 	fi
-	if [ -f src/skipcpio/skipcpio ]; then \
-		install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
-	fi
-	if [ -f dracut-util ]; then \
-		install -m 0755 dracut-util $(DESTDIR)$(pkglibdir)/dracut-util; \
+	if [ -f skipcpio/skipcpio ]; then \
+		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
 	fi
 	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
-	install -m 0755 install.d/50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
-	install -m 0755 install.d/51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
+	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
+	install -m 0755 51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
 	mkdir -p $(DESTDIR)${bashcompletiondir}
-	install -m 0644 shell-completion/bash/dracut $(DESTDIR)${bashcompletiondir}/dracut
-	install -m 0644 shell-completion/bash/lsinitrd $(DESTDIR)${bashcompletiondir}/lsinitrd
-	mkdir -p $(DESTDIR)${pkgconfigdatadir}
-	install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
+	install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
+	install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
 
 dracut-version.sh:
-	@rm -f dracut-version.sh
-	@printf "#!/bin/sh\n# shellcheck disable=SC2034\nDRACUT_VERSION=%s\n" "$(DRACUT_FULL_VERSION)" > dracut-version.sh
+	@echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh
 
 clean:
 	$(RM) *~
@@ -215,113 +162,70 @@ clean:
 	$(RM) */*/*~
 	$(RM) $(manpages:%=%.xml) dracut.xml
 	$(RM) test-*.img
-	$(RM) dracut-*.rpm dracut-*.tar.bz2 dracut-*.tar.xz
+	$(RM) dracut-*.rpm dracut-*.tar.bz2
 	$(RM) dracut-version.sh
-	$(RM) dracut-install src/install/dracut-install $(DRACUT_INSTALL_OBJECTS)
+	$(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS)
 	$(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
-	$(RM) dracut-util util/util $(UTIL_OBJECTS)
 	$(RM) $(manpages) dracut.html
-	$(RM) dracut.pc
 	$(MAKE) -C test clean
 
-dist: dracut-$(DRACUT_MAIN_VERSION).tar.xz
+dist: dracut-$(VERSION).tar.bz2
 
-dracut-$(DRACUT_MAIN_VERSION).tar.xz: doc syncheck
-	@echo "DRACUT_VERSION=$(DRACUT_MAIN_VERSION)" > dracut-version.sh
-	git archive --format=tar $(DRACUT_MAIN_VERSION) --prefix=dracut-$(DRACUT_MAIN_VERSION)/ > dracut-$(DRACUT_MAIN_VERSION).tar
-	mkdir -p dracut-$(DRACUT_MAIN_VERSION)
-	for i in $(manpages) dracut.html dracut-version.sh; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(DRACUT_MAIN_VERSION)/$${i%/*}"; cp "$$i" "dracut-$(DRACUT_MAIN_VERSION)/$$i"; done
-	tar --owner=root --group=root -rf dracut-$(DRACUT_MAIN_VERSION).tar $$(find dracut-$(DRACUT_MAIN_VERSION) -type f)
-	rm -fr -- dracut-$(DRACUT_MAIN_VERSION).tar.xz dracut-$(DRACUT_MAIN_VERSION)
-	xz -9 dracut-$(DRACUT_MAIN_VERSION).tar
-	rm -f -- dracut-$(DRACUT_MAIN_VERSION).tar
+dracut-$(VERSION).tar.bz2: doc syncheck
+	@echo "DRACUT_VERSION=$(VERSION)" > dracut-version.sh
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar
+	mkdir -p dracut-$(VERSION)
+	for i in $(manpages) dracut.html dracut-version.sh; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(VERSION)/$${i%/*}"; cp "$$i" "dracut-$(VERSION)/$$i"; done
+	tar --owner=root --group=root -rf dracut-$(VERSION).tar $$(find dracut-$(VERSION) -type f)
+	rm -fr -- dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
+	bzip2 -9 dracut-$(VERSION).tar
+	rm -f -- dracut-$(VERSION).tar
 
-ifeq ($(HAVE_RPMBUILD),yes)
-rpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
-	rpmbuild=$$(mktemp -d -p /var/tmp rpmbuild-dracut.XXXXXX); src=$$(pwd); \
-	cp dracut-$(DRACUT_MAIN_VERSION).tar.xz "$$rpmbuild"; \
-	LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < pkgbuild/dracut.spec > $$rpmbuild/dracut.spec; \
-	(cd "$$rpmbuild"; \
-	wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+rpm: dracut-$(VERSION).tar.bz2 syncheck
+	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
+	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
+	LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
 	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
-	( mv "$$rpmbuild"/{,$$(uname -m)/}*.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
-
-srpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
-	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
-	cp dracut-$(DRACUT_MAIN_VERSION).tar.xz "$$rpmbuild"; \
-	LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < pkgbuild/dracut.spec > $$rpmbuild/dracut.spec; \
-	(cd "$$rpmbuild"; \
-	[ -f $$src/lgpl-2.1.txt ] && cp $$src/lgpl-2.1.txt . || wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
-	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
-		--define "_rpmdir $$PWD" -bs dracut.spec; ) && \
-	( mv "$$rpmbuild"/*.src.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
-else
-.PHONY: rpm srpm
-rpm: syncheck
-srpm: syncheck
-endif
+	( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr -- "$$rpmbuild"; ls *.rpm )
 
 syncheck:
 	@ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \
                 [ "$${i##*/}" = "module-setup.sh" ] && continue; \
                 read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \
 		[ $$V ] && echo "posix syntax check: $$i"; bash --posix -n "$$i" ; ret=$$(($$ret+$$?)); \
-		[ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi; \
-		[ $$V ] && echo "checking for echo -n: $$i"; if grep -Fq 'echo -n ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains echo -n"; fi \
+		[ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi \
 	done;exit $$ret
-	@ret=0;for i in *.sh modules.d/*/*.sh modules.d/*/module-setup.sh; do \
+	@ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \
+	                modules.d/*/module-setup.sh; do \
 		[ $$V ] && echo "bash syntax check: $$i"; bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
-ifeq ($(HAVE_SHELLCHECK),yes)
-ifeq ($(HAVE_SHFMT),yes)
-	shellcheck $$(shfmt -f .)
-else
-	find . -name '*.sh' -print0 | xargs -0 shellcheck
-endif
-endif
 
 check: all syncheck rpm
 	@[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
 	@$(MAKE) -C test check
 
 testimage: all
-	./dracut.sh -N -l -a debug -f test-$(KVERSION).img $(KVERSION)
-	@echo wrote  test-$(KVERSION).img
-
-debugtestimage: all
-	./dracut.sh --debug -l -a debug -f test-$(KVERSION).img $(KVERSION)
-	@echo wrote  test-$(KVERSION).img
+	./dracut.sh -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img
 
 testimages: all
-	./dracut.sh -l -a debug --kernel-only -f test-kernel-$(KVERSION).img $(KVERSION)
-	@echo wrote  test-$(KVERSION).img
-	./dracut.sh -l -a debug --no-kernel -f test-dracut.img $(KVERSION)
+	./dracut.sh -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img
+	./dracut.sh -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
 	@echo wrote  test-dracut.img
 
-debughostimage: all
-	./dracut.sh --debug -H -l -f test-$(KVERSION).img $(KVERSION)
-	@echo wrote  test-$(KVERSION).img
-
 hostimage: all
-	./dracut.sh -H -l -f test-$(KVERSION).img $(KVERSION)
-	@echo wrote  test-$(KVERSION).img
-
-efi: all
-	./dracut.sh --uefi -H -l -f linux-$(KVERSION).efi $(KVERSION)
-	@echo wrote linux-$(KVERSION).efi
+	./dracut.sh -H -l -f test-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img
 
 AUTHORS:
-	git shortlog  --numbered --summary -e |while read a rest || [ -n "$$rest" ]; do echo $$rest;done > AUTHORS
+	git shortlog  --numbered --summary -e |while read a rest; do echo $$rest;done > AUTHORS
 
-CONTRIBUTORS:
-	@git shortlog $(DRACUT_MAIN_VERSION).. --numbered --summary -e |while read a rest || [ -n "$$rest" ]; do echo "- $$rest";done
-
-dracut.html.sign: dracut-$(DRACUT_MAIN_VERSION).tar.xz dracut.html
-	gpg-sign-all dracut-$(DRACUT_MAIN_VERSION).tar.xz dracut.html
+dracut.html.sign: dracut-$(VERSION).tar.bz2
+	gpg-sign-all dracut-$(VERSION).tar.bz2 dracut.html
 
 upload: dracut.html.sign
-	kup put dracut-$(DRACUT_MAIN_VERSION).tar.xz dracut-$(DRACUT_MAIN_VERSION).tar.sign /pub/linux/utils/boot/dracut/
+	kup put dracut-$(VERSION).tar.bz2 dracut-$(VERSION).tar.sign /pub/linux/utils/boot/dracut/
 	kup put dracut.html dracut.html.sign /pub/linux/utils/boot/dracut/

NEWS

@@ -0,0 +1,841 @@
+dracut-033
+==========
+- improved hostonly device recognition
+- improved hostonly module recognition
+- add dracut.css for dracut.html
+- do not install udev rules from /etc in generic mode
+- fixed LABEL= parsing for swap devices
+- fixed iBFT network setup
+- url-lib.sh: handle 0-size files with curl
+- dracut.asc: document debugging dracut on shutdown
+- if rd.md=0, use dmraid for imsm and ddf
+- skip empty dracut modules
+- removed caching of kernel cmdline
+- fixed iso-scan, if the loop device driver is a kernel module
+- bcache: support new blkid
+- fixed ifup udev rules
+- ifup with dhcp, if no "ip=" specified for the interface
+
+dracut-032
+==========
+- add parameter --print-cmdline
+    This prints the kernel command line parameters for the current disk
+    layout.
+    $ dracut --print-cmdline
+    rd.luks.uuid=luks-e68c8906-6542-4a26-83c4-91b4dd9f0471
+    rd.lvm.lv=debian/root rd.lvm.lv=debian/usr root=/dev/mapper/debian-root
+    rootflags=rw,relatime,errors=remount-ro,user_xattr,barrier=1,data=ordered
+    rootfstype=ext4
+- dracut.sh: add --persistent-policy option and persistent_policy conf option
+    --persistent-policy <policy>:
+        Use <policy> to address disks and partitions.
+        <policy> can be any directory name found in /dev/disk.
+        E.g. "by-uuid", "by-label"
+- dracut now creates the initramfs without udevadm
+  that means the udev database does not have to populated
+  and the initramfs can be built in a chroot with
+  /sys /dev /proc mounted
+- renamed dracut_install() to inst_multiple() for consistent naming
+- if $libdirs is unset, fall back to ld.so.cache paths
+- always assemble /usr device in initramfs
+- bash module added (disable it, if you really want dash)
+- continue to boot, if the main loop times out, in systemd mode
+- removed inst*() shell pure versions, dracut-install binary is in charge now
+- fixed ifcfg file generation for vlan
+- do not include adjtime and localtime anymore
+- fixed generation of zfcp.conf of CMS setups
+- install vt102 terminfo
+  dracut_install() is still there for backwards compat
+- do not strip files in FIPS mode
+- fixed iBFT interface configuration
+- fs-lib: install fsck and fsck.ext*
+- shutdown: fixed killall_proc_mountpoint()
+- network: also wait for ethernet interfaces to setup
+- fixed checking for FIPS mode
+
+Contributions from:
+Harald Hoyer
+WANG Chao
+Baoquan He
+Daniel Schaal
+Dave Young
+James Lee
+Radek Vykydal
+
+
+dracut-031
+==========
+- do not include the resume dracut module in hostonly mode,
+  if no swap is present
+- don't warn twice about omitted modules
+- use systemd-cat for logging on systemd systems, if logfile is unset
+- fixed PARTUUID parsing
+- support kernel module signing keys
+- do not install the usrmount dracut module in hostonly mode,
+  if /sbin/init does not live in /usr
+- add debian udev rule files
+- add support for bcache
+- network: handle bootif style interfaces
+  e.g. ip=77-77-6f-6f-64-73:dhcp
+- add support for kmod static devnodes
+- add vlan support for iBFT
+
+Contributions from:
+Harald Hoyer
+Amadeusz Żołnowski
+Brandon Philips
+Colin Walters
+James Lee
+Kyle McMartin
+Peter Jones
+
+dracut-030
+==========
+- support new persistent network interface names
+- fix findmnt calls, prevents hang on stale NFS mounts
+- add systemd.slice and slice.target units
+- major shell cleanup
+- support root=PARTLABEL= and root=PARTUUID=
+- terminfo: only install l/linux v/vt100 and v/vt220
+- unset all LC_* and LANG, 10% faster
+- fixed dependency loop for dracut-cmdline.service
+- do not wait_for_dev for the root devices
+- do not wait_for_dev for devices, if dracut-initqueue is not needed
+- support early microcode loading with --early-microcode
+- dmraid, let dmraid setup its own partitions
+- sosreport renamed to rdsosreport
+
+Contributions from:
+Harald Hoyer
+Konrad Rzeszutek Wilk
+WANG Chao
+
+dracut-029
+==========
+- wait for IPv6 autoconfiguration
+- i18n: make the default font configurable
+  To set the default font for your distribution, add
+  i18n_default_font="latarcyrheb-sun16"
+  to your /lib/dracut/dracut.conf.d/01-dist.conf distribution config.
+- proper handle "rd.break" in systemd mode before switch-root
+- systemd: make unit files symlinks
+- build without dash requirement
+- add dracut-shutdown.service.8 manpage
+- handle MACs for "ip="
+  "ip=77-77-6f-6f-64-73:dhcp"
+- don't explode when mixing BOOTIF and ip=
+- 90lvm/module-setup.sh: redirect error message of lvs to /dev/null
+
+Contributions from:
+Harald Hoyer
+Will Woods
+Baoquan He
+
+dracut-028
+==========
+- full integration of crypto devs in systemd logic
+- support for bridge over team and vlan tagged team
+- support multiple bonding interfaces
+- new kernel command line param "rd.action_on_fail"
+  to control the emergency action
+- support for bridge over a vlan tagged interface
+- support for "iso-scan/filename" kernel parameter
+- lsinitrd got some love and does not use "file" anymore
+- fixed issue with noexec mounted tmp dirs
+- FIPS mode fixed
+- dracut_install got some love
+- fixed some /usr mounting problems
+- ifcfg dracut module got some love and fixes
+- default installed font is now latarcyrheb-sun16
+- new parameters rd.live.dir and rd.live.squashimg
+- lvm: add tools for thin provisioning
+- also install non-hwcap libs
+- setup correct system time and time zone in initrd
+- s390: fixed cms setup
+- add systemd-udevd persistent network interface naming
+
+Contributions from:
+Harald Hoyer
+Kamil Rytarowski
+WANG Chao
+Baoquan He
+Adam Williamson
+Colin Guthrie
+Dan Horák
+Dave Young
+Dennis Gilmore
+Dennis Schridde
+
+dracut-027
+==========
+- dracut now has bash-completion
+- require bash version 4
+- systemd module now requires systemd >= 199
+- dracut makes use of native systemd initrd units
+- added hooks for new-kernel-pkg and kernel-install
+- hostonly is now default for fedora
+- comply with the BootLoaderSpec paths
+  http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
+- added rescue module
+- host_fs_types is now a hashmap
+- new dracut argument "--regenerate-all"
+- new dracut argument "--noimageifnotneeded"
+- new man page dracut.bootup
+- install all host filesystem drivers
+- use -D_FILE_OFFSET_BITS=64 to build dracut-install
+
+dracut-026
+==========
+- introduce /usr/lib/dracut/dracut.conf.d/ drop-in directory
+
+  /usr/lib/dracut/dracut.conf.d/*.conf can be overwritten by the same
+  filenames in /etc/dracut.conf.d.
+
+  Packages should use /usr/lib/dracut/dracut.conf.d rather than
+  /etc/dracut.conf.d for drop-in configuration files.
+
+  /etc/dracut.conf and /etc/dracut.conf.d belong to the system administrator.
+
+- uses systemd-198 native initrd units
+- totally rely on the fstab-generator in systemd mode for block devices
+- dracut systemd now uses dracut.target rather than basic.target
+- dracut systemd services optimize themselves away
+- fixed hostonly parameter generation
+- turn off curl globbing (fixes IPv6)
+- modify the udev rules on install and not runtime time
+- enable initramfs building without kernel modules (fixed regression)
+- in the initqueue/timeout,
+  reset the main loop counter, as we see new udev events or initqueue/work
+- fixed udev rule installation
+
+dracut-025
+==========
+- do not strip signed kernel modules
+- add sosreport script and generate /run/initramfs/sosreport.txt
+- make short uuid specification for allow-discards work
+- turn off RateLimit for the systemd journal
+- fixed MAC address assignment
+- add systemd checkisomd5 service
+- splitout drm kernel modules from plymouth module
+- add 'swapoff' to initramfs to fix shutdown/reboot
+- add team device support
+- add pre-shutdown hook
+- kill all processes in shutdown and report remaining ones
+- "--device" changed to "--add-device" and "add_device=" added for conf files
+- add memory usage trace to different hook points
+- cope with optional field #7 in /proc/self/mountinfo
+- lots of small bugfixes
+
+dracut-024
+==========
+- new dracut option "--device"
+- new dracut kernel command line options "rd.auto"
+- new dracut kernel command line options "rd.noverifyssl"
+- new dracut option "--kernel-cmdline" and "kernel_cmdline" option for default parameters
+- fixes for systemd and crypto
+- fix for kexec in shutdown, if not included in initramfs
+- create the initramfs non-world readable
+- prelink/preunlink in the initramfs
+- strip binaries in the initramfs by default now
+- various FIPS fixes
+- various dracut-install fixes
+
+dracut-023
+==========
+- resume from hibernate fixes
+- -N option for --no-hostonly
+- support for systemd crypto handling
+- new dracut module "crypt-loop"
+- deprecate the old kernel command line options
+- more documentation
+- honor CFLAGS for dracut-install build
+- multipath fixes
+- / is mounted according to rootflags parameter but forced ro at first.
+  Later it is remounted according to /etc/fstab + rootflags parameter
+  and "ro"/"rw".
+- support for xfs / reiserfs separate journal device
+- new "ro_mnt" option to force ro mount of / and /usr
+- root on cifs support
+- dracut-install: fixed issue for /var/tmp containing a symlink
+- only lazy resolve with ldd, if the /var/tmp partition is not mounted with "noexec"
+- i18n: fixed inclusion of "include" keymaps
+
+dracut-022
+==========
+- fixed host-only kernel module bug
+
+dracut-021
+==========
+- fixed systemd in the initramfs (requires systemd >= 187)
+- dracut-install: massive speedup with /var on the same filesystem with COW copy
+- dracut-install: moved to /usr/lib/dracut until it becomes a general purpose tool
+- new options: "rd.usrmount.ro" and "rd.skipfsck"
+- less mount/umount
+- apply "ro" on the kernel command line also to /usr
+- mount according to fstab, if neither "ro" or "rw" is specified
+- skip fsck for xfs and btrfs. remount is enough
+- give emergency_shell if /usr mount failed
+- dracut now uses getopt:
+  * options can be position independent now!!
+  * we can now use --option=<arg>
+- added option "--kver=<kernel-version>", and the image location can be omitted
+  # dracut --kver 3.5.0-0.rc7.git1.2.fc18.x86_64
+- dracut.sh: for --include copy also the symbolic links
+- man pages: lsinitrd and mkinitrd added
+- network: We do not support renaming in the kernel namespace anymore (as udev does
+  that not anymore). So, if a user wants to use ifname, he has to rename
+  to a custom namespace. "eth[0-9]+" is not allowed anymore. !!!!!
+- resume: moved the resume process to the initqueue.
+  This should prevent accidently mounting the root file system.
+- testsuite: add support for: make V=1 TESTS="01 20 40" check
+    $ sudo make V=1 clean check
+    now runs the testsuite in verbose mode
+
+    $ sudo make TESTS="01 20 40" clean check
+    now only runs the 01, 20 and 40 tests.
+
+dracut-020
+==========
+- changed rd.dasd kernel parameter
+- arm kernel modules added to kernel-modules
+- make udevdir systemdutildir systemdsystemunitdir global vars
+  your distribution should ship those settings in
+  /etc/dracut.conf.d/01-distro.conf
+  see dracut.conf.d/fedora.conf.example
+- kernel modules are now only handled with /sys/modules and modules.dep
+- systemd fixups
+- mdraid: wait for md devices to be clean, before shutdown
+- ifup fixed for ipv6
+- add PARTUUID as root=PARTUUID=<partition uuid> parameter
+- fixed instmods() return code and set pipefail globally
+- add 04watchdog dracut module
+- dracut-shutdown.service: fixed ordering to be before shutdown.target
+- make use of "ln -r" instead of shell functions, if new coreutils is installed
+- network: support vlan tagged bonding
+- new dracut module qemu and qemu-net to install all kernel driver
+- fs-lib/fs-lib.sh: removed test mounting of btrfs and xfs
+- no more "mknod" in the initramfs!!
+- replaced all "tr" calls with "sed"
+- speedup with lazy kernel module dependency resolving
+- lots of speedup optimizations and last but not least
+- dracut-install:
+  - new binary to significanlty speedup the installation process
+  - dracut-functions.sh makes use of it, if installed
+
+
+dracut-019
+==========
+- initqueue/online hook
+- fixes for ifcfg write out
+- rootfs-block: avoid remount when options don't change
+- Debian multiarch support
+- virtfs root filesystem support
+- cope with systemd-udevd
+- mount tmpfs with strictatime
+- include all kernel/drivers/net/phy drivers
+- add debug_on() and debug_off() functions
+- add arguments for source_hook() and source_all()
+- cleanup hook
+- plymouth: get consoledev from /sys/class/tty/console/active
+- experimental systemd dracut module for systemd in the initramfs
+- install xhci-hcd kernel module
+- dracut: new "--mount" option
+- lsinitrd: new option --printsize
+- ARM storage kernel modules added
+- s390 cms conf file support
+- /etc/initrd-release in the initrd
+- vlan support
+- full bonding and bridge support
+- removed scsi_wait_scan kernel module from standard install
+- support rd.luks.allow-discards and honor options in crypttab
+- lots of bugfixes
+
+dracut-018
+==========
+- lvm: ignore lvm mirrors
+- lsinitrd: handle LZMA images
+- iscsi: add rd.iscsi.param
+- iscsi: add iscsi interface binding
+- new module cms to read and handle z-Series cms config files
+- fixed fstab.sys handling
+- new dracut option "--tmpdir"
+- new dracut option "--no-hostonly"
+- nbd: name based nbd connects
+- converted manpage and documentation source to asciidoc
+- write-ifcfg fixes and cleanups
+- ifup is now done in the initqueue
+- netroot cleanup
+- initqueue/online is now for hooks, which require network
+- no more /tmp/root.info
+- 98pollcdrom: factored out the ugly cdrom polling in the main loop
+- simplified rd.luks.uuid testing
+- removed "egrep" and "ls" calls
+- speedup kernel module installation
+- make bzip2 optional
+- lots of bugfixes
+
+dracut-017
+==========
+- a _lot_ faster than dracut-016 in image creation
+- systemd service dracut-shutdown.service
+- livenet fixes
+- ssh-client module install fix
+- root=iscsi:... fixed
+- lots of restructuring and optimizing in dracut-functions.sh
+- usrmount: honor fs_passno in /etc/fstab
+- renamed all shell scripts to .sh
+- new option "--omit-drivers" and config option "omit_drivers"
+- hostonly mode fixups
+
+dracut-016
+==========
+- fixed lsinitrd
+- honor binaries in sbin first
+- fixed usrmount module
+- added systemd service for shutdown
+- fixed terminfo on distros with /usr/share/terminfo
+- reload udev rules after "pre-trigger" hook
+- improved test suite
+- new parameter "--omit-drivers" and new conf param omit_drivers
+- "--offroot" support for mdraid
+- new libs: net-lib.sh, nfs-lib.sh, url-lib.sh, img-lib.sh
+  full of functions to use in your dracut module
+
+dracut-015
+==========
+- hostonly mode automatically adds command line options for root and /usr
+- --add-fstab --mount parameters
+- ssh-client module
+- --ctty option: add job control
+- cleanup /run/initramfs
+- convertfs module
+- /sbin/ifup can be called directly
+- support kernel modules compressed with xz
+- s390 iscsi modules added
+- terminfo module
+- lsinitrd can handle concatened images
+- lsinitrd can sort by size
+
+dracut-014
+==========
+- new dracut arguments:
+  --lvmconf
+  --nolvmconf
+  --fscks [LIST]
+  --nofscks
+- new .conf options:
+  install_items
+  fscks
+  nofscks
+- new kernel options:
+  rd.md.ddf
+  rd.md.waitclean
+  plymouth.enable
+- dracut move from /sbin to /usr/bin
+- dracut modules dir moved from /usr/share/dracut to /usr/lib/dracut
+- profiling with "dracut --profile"
+- new TEST-16-DMSQUASH, test for Fedora LiveCDs
+- speedup of initramfs creation
+- ask_for_password fallback to CLI
+- mdraid completely switched to incremental assembly
+- no more cdrom polling
+- "switch_root" breakpoint is now very late
+- /dev/live is gone
+- /dev/root is gone
+- fs-lib dracut module for fscks added
+- xen dracut module removed
+- usb mass storage kernel drivers now included
+- usrmount dracut module added:
+  mount /usr if found in /sysroot/etc/fstab
+- only include fsck helper needed for hostonly
+- fcoe: support for bnx2fc
+- support iSCSI drivers: qla4xxx, cxgb3i, cxgb4i, bnx2i, be2iscsi
+- fips-aesni dracut module added
+- add install_items to dracut.conf
+    install_items+=" <file>[ <file> ...] "
+- speedup internal testsuite
+- internal testsuite: store temporary data in a temporary dir
+
+dracut-013
+==========
+- speedup of initramfs creation
+- fixed inst_dir for symbolic links
+- add unix kernel module
+
+dracut-012
+==========
+- better fsck handling
+- fixed wait condition for LVM volumes
+- fix for hardlinks (welcome Debian! :-)
+- shutdown bugfixes
+- automatic busybox symlink creation
+- try to mount /usr, if init points to a path in /usr
+- btrfs with multiple devices
+- "--force-add" option for dracut, to force-add dracut modules,
+  without hostonly checks
+- lsinitrd also display the initramfs size in human readable form
+- livenet module, to mount live-isos over http
+- masterkey,ecryptfs,integrity security modules
+- initqueue/timeout queue e.g. for starting degraded raids
+- "make rpm" creates an rpm with an increasing release number from any
+  git checkout
+- support lvm mirrors
+- start degraded lvm mirrors after a timeout
+- start degraded md raids after a timeout
+- getarg() now returns wildcards without file matching to the current fs
+- lots of bugfixes
+
+dracut-011
+==========
+- use udev-168 features for shutting down udev
+- introduce "--prefix" to put all initramfs files in e.g "/run/initramfs"
+- new shutdown script (called by systemd >= 030) to disassemble the root device
+- lots of bugfixes
+- new module for gpg-encrypted keys - 91crypt-gpg
+
+dracut-010
+==========
+- lots of bugfixes
+- plymouth: use /run/plymouth/pid instead of /run/initramfs/plymouth
+- add "/lib/firmware/updates" to default firmware path
+
+dracut-009
+==========
+- dracut generator
+  - dracut-logger
+  - xz compression
+  - better argument handling
+
+- initramfs
+  - hooks moved to /lib/dracut/hooks in initramfs
+  - rd.driver.{blacklist|pre|post} accept comma separated driver list
+  - iSCSI: iSCSI Boot Firmware Table (iBFT) support
+  - support for /run
+  - live image: support for generic rootfs.img (instead of ext3fs.img)
+  - caps module
+  - FCoE: EDD support
+
+dracut-008
+==========
+- removed --ignore-kernel-modules option (no longer necessary)
+- renamed kernel command line arguments to follow the rd. naming scheme
+- merged check, install, installkernel to module-setup.sh
+- support for bzip2 and xz compressed initramfs images.
+- source code beautification
+- lots of documentation
+- lsinitrd: "catinitrd" functionality
+- dracut: --list-modules
+- lvm: support for dynamic LVM SNAPSHOT root volume
+- 95fstab-sys: mount all /etc/fstab.sys volumes before switch_root
+- 96insmodpost dracut module
+- rd.shell=1 per default
+- rootfs-block:mount-root.sh add fsck
+- busybox shell replacements module
+- honor old "real_init="
+- 97biosdevname dracut module
+
+dracut-007
+==========
+- module i18n is no longer fedora/red hat specific (Amadeusz Żołnowski)
+- distribution specific conf file
+- bootchartd support
+- debug module now has fsck
+- use "hardlink", if available, to save some space
+- /etc/dracut.conf can be overwritten by settings in /etc/dracut.conf.d/*.conf
+- gentoo splash module
+- --ignore-kernel-modules option
+- crypto keys on external devices support
+- bugfixes
+
+dracut-006
+==========
+- fixed mdraid with IMSM
+- fixed dracut manpages
+- dmraid parse different error messages
+- add cdrom polling mechanism for slow cdroms
+- add module btrfs
+- add btrfsctl scan for btrfs multi-devices (raid)
+- teach dmsquash live-root to use rootflags
+- trigger udev with action=add
+- fixed add_drivers handling
+- add sr_mod
+- use pigz instead of gzip, if available
+- boot from LVM mirrors and snapshots
+- iscsi: add support for multiple netroot=iscsi:
+- Support old version of module-init-tools
+- got rid of rdnetdebug
+- fixed "ip=auto6"
+- dracut.conf: use "+=" as default for config variables
+- bugfixes
+
+dracut-005
+==========
+- dcb support to dracut's FCoE support
+- add readonly overlay support for dmsquash
+- add keyboard kernel modules
+- dracut.conf: added add_dracutmodules
+- add /etc/dracut.conf.d
+- add preliminary IPv6 support
+- bugfixes
+
+dracut-004
+==========
+- dracut-lib: read multiple lines from $init/etc/cmdline
+- lsinitrd and mkinitrd
+- dmsquash: add support for loopmounted *.iso files
+- lvm: add rd_LVM_LV and "--poll n"
+- user suspend support
+- add additional drivers in host-only mode, too
+- improved emergency shell
+- support for compressed kernel modules
+- support for loading Xen modules
+- rdloaddriver kernel command line parameter
+- man pages for dracut-catimages and dracut-gencmdline
+- bugfixes
+
+dracut-003
+==========
+- add debian package modules
+- add dracut.conf manpage
+- add module 90multipath
+- add module 01fips
+- crypt: ignore devices in /etc/crypttab (root is not in there)
+  unless rd_NO_CRYPTTAB is specified
+- kernel-modules: add scsi_dh scsi_dh_rdac scsi_dh_emc
+- add multinic support
+- add s390 zfcp support
+- add s390 dasd support
+- add s390 network support
+- fixed dracut-gencmdline for root=UUID or LABEL
+- do not destroy assembled raid arrays if mdadm.conf present
+- mount /dev/shm
+- let udevd not resolve group and user names
+- moved network from udev to initqueue
+- improved debug output: specifying "rdinitdebug" now logs
+  to dmesg, console and /init.log
+- strip kernel modules which have no x bit set
+- redirect stdin, stdout, stderr all RW to /dev/console
+  so the user can use "less" to view /init.log and dmesg
+- add new device mapper udev rules and dmeventd
+- fixed dracut-gencmdline for root=UUID or LABEL
+- do not destroy assembled raid arrays if mdadm.conf present
+- mount /dev/shm
+- let udevd not resolve group and user names
+- preserve timestamps of tools on initramfs generation
+- generate symlinks for binaries correctly
+- moved network from udev to initqueue
+- mount nfs3 with nfsvers=3 option and retry with nfsvers=2
+- fixed nbd initqueue-finished
+- improved debug output: specifying "rdinitdebug" now logs
+  to dmesg, console and /init.log
+- strip kernel modules which have no x bit set
+- redirect stdin, stdout, stderr all RW to /dev/console
+  so the user can use "less" to view /init.log and dmesg
+- make install of new dm/lvm udev rules optionally
+- add new device mapper udev rules and dmeventd
+- Fix LiveCD boot regression
+- bail out if selinux policy could not be loaded and
+  selinux=0 not specified on kernel command line
+- do not cleanup dmraids
+- copy over lvm.conf
+
+dracut-002
+==========
+- add ifname= argument for persistent netdev names
+- new /initqueue-finished to check if the main loop can be left
+- copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf
+- plymouth: use plymouth-populate-initrd
+- add add_drivers for dracut and dracut.conf
+- add modprobe scsi_wait_scan to be sure everything was scanned
+- fix for several problems with md raid containers
+- fix for selinux policy loading
+- fix for mdraid for IMSM
+- fix for bug, which prevents installing 61-persistent-storage.rules (bug #520109)
+- fix for missing grep for md
+
+dracut-001
+==========
+- better --hostonly checks
+- better lvm/mdraid/dmraid handling
+- fcoe booting support
+    Supported cmdline formats:
+    fcoe=<networkdevice>:<dcb|nodcb>
+    fcoe=<macaddress>:<dcb|nodcb>
+
+    Note currently only nodcb is supported, the dcb option is reserved for
+    future use.
+
+    Note letters in the macaddress must be lowercase!
+
+    Examples:
+    fcoe=eth0:nodcb
+    fcoe=4A:3F:4C:04:F8:D7:nodcb
+
+- Syslog support for dracut
+    This module provides syslog functionality in the initrd.
+    This is especially interesting when complex configuration being
+    used to provide access to the device the rootfs resides on.
+
+
+dracut-0.9
+==========
+- let plymouth attach to the terminal (nice text output now)
+- new kernel command line parameter "rdinfo" show dracut output, even when
+  "quiet" is specified
+- rd_LUKS_UUID is now handled correctly
+- dracut-gencmdline: rd_LUKS_UUID and rd_MD_UUID is now correctly generated
+- now generates initrd-generic with around 15MB
+- smaller bugfixes
+
+dracut-0.8
+==========
+- iSCSI with username and password
+- support for live images (dmsquashed live images)
+- iscsi_firmware fixes
+- smaller images
+- bugfixes
+
+dracut-0.7
+==========
+- dracut:     strip binaries in initramfs
+
+           --strip
+                  strip binaries in the initramfs (default)
+
+           --nostrip
+                  do not strip binaries in the initramfs
+- dracut-catimages
+
+    Usage: ./dracut-catimages [OPTION]... <initramfs> <base image>
+    [<image>...]
+    Creates initial ramdisk image by concatenating several images from the
+    command
+    line and /boot/dracut/
+
+      -f, --force           Overwrite existing initramfs file.
+      -i, --imagedir        Directory with additional images to add
+                            (default: /boot/dracut/)
+      -o, --overlaydir      Overlay directory, which contains 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            This message
+      --debug               Output debug information of the build process
+      -v, --verbose         Verbose output during the build process
+
+- s390 dasd support
+
+dracut-0.6
+==========
+- dracut: add --kernel-only and --no-kernel arguments
+
+           --kernel-only
+                  only install kernel drivers and firmware files
+
+           --no-kernel
+                  do not install kernel drivers and firmware files
+
+    All kernel module related install commands moved from "install"
+    to "installkernel".
+
+    For "--kernel-only" all installkernel scripts of the specified
+    modules are used, regardless of any checks, so that all modules
+    which might be needed by any dracut generic image are in.
+
+    The basic idea is to create two images. One image with the kernel
+    modules and one without. So if the kernel changes, you only have
+    to replace one image.
+
+    Grub and the kernel can handle multiple images, so grub entry can
+    look like this:
+
+    title Fedora (2.6.29.5-191.fc11.i586)
+            root (hd0,0)
+            kernel /vmlinuz-2.6.29.5-191.fc11.i586 ro rhgb quiet
+            initrd /initrd-20090722.img /initrd-kernel-2.6.29.5-191.fc11.i586.img /initrd-config.img
+
+    initrd-20090722.img
+      the image provided by the initrd rpm
+      one old backup version is kept like with the kernel
+
+    initrd-kernel-2.6.29.5-191.fc11.i586.img
+      the image provided by the kernel rpm
+
+    initrd-config.img
+      optional image with local configuration files
+
+- dracut: add --kmoddir directory, where to look for kernel modules
+
+           -k, --kmoddir [DIR]
+                  specify the directory, where to look for kernel modules
+
+
+
+dracut-0.5
+==========
+- more generic (all plymouth modules, all keyboards, all console fonts)
+- more kernel command line parameters (see also man dracut(8))
+- a helper tool, which generates the kernel command line (dracut-gencmdline)
+- bridged network boot
+- a lot of new command line parameter
+
+dracut-0.4
+==========
+- bugfixes
+- firmware loading support
+- new internal queue (initqueue)
+    initqueue now loops until /dev/root exists or root is mounted
+
+    init now has the following points to inject scripts:
+
+    /cmdline/*.sh
+       scripts for command line parsing
+
+    /pre-udev/*.sh
+       scripts to run before udev is started
+
+    /pre-trigger/*.sh
+       scripts to run before the main udev trigger is pulled
+
+    /initqueue/*.sh
+       runs in parallel to the udev trigger
+       Udev events can add scripts here with /sbin/initqueue.
+       If /sbin/initqueue is called with the "--onetime" option, the script
+       will be removed after it was run.
+       If /initqueue/work is created and udev >= 143 then this loop can
+       process the jobs in parallel to the udevtrigger.
+       If the udev queue is empty and no root device is found or no root
+       filesystem was mounted, the user will be dropped to a shell after
+       a timeout.
+       Scripts can remove themselves from the initqueue by "rm $job".
+
+    /pre-mount/*.sh
+       scripts to run before the root filesystem is mounted
+       NFS is an exception, because it has no device node to be created
+       and mounts in the udev events
+
+    /mount/*.sh
+       scripts to mount the root filesystem
+       NFS is an exception, because it has no device node to be created
+       and mounts in the udev events
+       If the udev queue is empty and no root device is found or no root
+       filesystem was mounted, the user will be dropped to a shell after
+       a timeout.
+
+    /pre-pivot/*.sh
+       scripts to run before the real init is executed and the initramfs
+       disappears
+       All processes started before should be killed here.
+
+    The behaviour of the dmraid module demonstrates how to use the new
+    mechanism. If it detects a device which is part of a raidmember from a
+    udev rule, it installs a job to scan for dmraid devices, if the udev
+    queue is empty. After a scan, it removes itsself from the queue.
+
+
+
+dracut-0.3
+==========
+
+- first public version
+

PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=dracut-git
-pkgver=1
-pkgrel=1
+pkgver=$(date +%s)
+pkgrel=$(git log --pretty=format:%h |head -n 1)
 pkgdesc="Initramfs generation utility"
 arch=('i686' 'x86_64')
 url="https://dracut.wiki.kernel.org/"
@@ -14,25 +14,8 @@ backup=(etc/dracut.conf)
 source=()
 md5sums=()
 
-# out of tree builds disallowed for this PKGFILE
-BUILDDIR="${PWD}"
-PKGDEST="${PWD}"
-SRCDEST=""
-SRCPKGDEST=""
-LOGDEST=""
-
-pkgver() {
-  cd ..
-  desc="$(git describe)"
-  printf "%s.%s.%s" ${desc//-/ }
-}
-
 build() {
   cd ..
   make sysconfdir=/etc || return 1
-}
-
-package() {
-  cd ..
   make DESTDIR="${pkgdir}" sysconfdir=/etc install || return 1
 }

README

@@ -0,0 +1,92 @@
+dracut
+------
+dracut is a new initramfs infrastructure.
+
+Information about the initial goals and aims can be found at
+https://fedoraproject.org/wiki/Initrdrewrite
+
+Unlike existing initramfs's, this is an attempt at having as little as
+possible hard-coded into the initramfs as possible.  The initramfs has
+(basically) one purpose in life -- getting the rootfs mounted so that
+we can transition to the real rootfs.  This is all driven off of
+device availability.  Therefore, instead of scripts hard-coded to do
+various things, we depend on udev to create device nodes for us and
+then when we have the rootfs's device node, we mount and carry on.
+This helps to keep the time required in the initramfs as little as
+possible so that things like a 5 second boot aren't made impossible as
+a result of the very existence of an initramfs.  It's likely that
+we'll grow some hooks for running arbitrary commands in the flow of
+the script, but it's worth trying to resist the urge as much as we can
+as hooks are guaranteed to be the path to slow-down.
+
+Most of the initramfs generation functionality in dracut is provided by a bunch
+of generator modules that are sourced by the main dracut script to install
+specific functionality into the initramfs.  They live in the modules.d
+subdirectory, and use functionality provided by dracut-functions to do their
+work.
+
+Some general rules for writing modules:
+ * Use one of the inst family of functions to actually install files
+   on to the initramfs.  They handle mangling the pathnames and (for binaries,
+   scripts, and kernel modules) installing dependencies as appropriate so
+   you do not have to.
+ * Scripts that end up on the initramfs should be POSIX compliant. dracut
+   will try to use /bin/dash as /bin/sh for the initramfs if it is available,
+   so you should install it on your system -- dash aims for strict POSIX
+   compliance to the extent possible.
+ * Hooks MUST be POSIX compliant -- they are sourced by the init script,
+   and having a bashism break your user's ability to boot really sucks.
+ * Generator modules should have a two digit numeric prefix -- they run in
+   ascending sort order. Anything in the 90-99 range is stuff that dracut
+   relies on, so try not to break those hooks.
+ * Hooks must have a .sh extension.
+ * Generator modules are described in more detail in README.modules.
+ * We have some breakpoints for debugging your hooks.  If you pass 'rdbreak'
+   as a kernel parameter, the initramfs will drop to a shell just before
+   switching to a new root. You can pass 'rdbreak=hookpoint', and the initramfs
+   will break just before hooks in that hookpoint run.
+
+Also, there is an attempt to keep things as distribution-agnostic as
+possible.  Every distribution has their own tool here and it's not
+something which is really interesting to have separate across them.
+So contributions to help decrease the distro-dependencies are welcome.
+
+Currently dracut lives on kernel.org.
+
+The tarballs can be found here:
+	http://www.kernel.org/pub/linux/utils/boot/dracut/
+	ftp://ftp.kernel.org/pub/linux/utils/boot/dracut/
+
+Git:
+	git://git.kernel.org/pub/scm/boot/dracut/dracut.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
+
+Project Page:
+	http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html
+
+Project Wiki:
+	http://dracut.wiki.kernel.org
+
+See the TODO file for things which still need to be done and HACKING for
+some instructions on how to get started.  There is also a mailing list
+that is being used for the discussion -- initramfs@vger.kernel.org.
+It is a typical vger list, send mail to majordomo@vger.kernel.org with body
+of 'subscribe initramfs email@host.com'
+
+
+Licensed under the GPLv2

README.md

@@ -1,55 +0,0 @@
-dracut
-====
-
-dracut is an event driven initramfs infrastructure.
-
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](.github/CODE_OF_CONDUCT.md)
-[![Fedora-32](https://github.com/dracutdevs/dracut/workflows/Fedora-32/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-32)
-[![Fedora-33](https://github.com/dracutdevs/dracut/workflows/Fedora-33/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-33)
-[![Fedora-latest](https://github.com/dracutdevs/dracut/workflows/Fedora-latest/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-latest)
-
-dracut (the tool) is used to create an initramfs image by copying tools
-and files from an installed system and combining it with the
-dracut framework, usually found in /usr/lib/dracut/modules.d.
-
-Unlike other implementations, dracut hard-codes as little
-as possible into the initramfs. The initramfs has
-(basically) one purpose in life -- getting the rootfs mounted so that
-we can transition to the real rootfs.  This is all driven off of
-device availability.  Therefore, instead of scripts hard-coded to do
-various things, we depend on udev to create device nodes for us and
-then when we have the rootfs's device node, we mount and carry on.
-This helps to keep the time required in the initramfs as little as
-possible so that things like a 5 second boot aren't made impossible as
-a result of the very existence of an initramfs.
-
-Most of the initramfs generation functionality in dracut is provided by a bunch
-of generator modules that are sourced by the main dracut script to install
-specific functionality into the initramfs.  They live in the modules.d
-subdirectory, and use functionality provided by dracut-functions to do their
-work.
-
-Currently dracut lives on github.com and kernel.org.
-
-The tarballs can be found here:
-	http://www.kernel.org/pub/linux/utils/boot/dracut/
-	ftp://ftp.kernel.org/pub/linux/utils/boot/dracut/
-
-Git:
-        https://github.com/dracutdevs/dracut.git
-        http://git.kernel.org/?p=boot/dracut/dracut.git
-
-Project Documentation:
-	http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html
-
-Project Wiki:
-	http://dracut.wiki.kernel.org
-
-See the github issue tracker for things which still need to be done and HACKING.md
-for some instructions on how to get started.  There is also a mailing list
-that is being used for the discussion -- initramfs@vger.kernel.org.
-It is a typical vger list, send mail to majordomo@vger.kernel.org with body
-of 'subscribe initramfs email@host.com'
-
-
-Licensed under the GPLv2

README.modules

@@ -0,0 +1,112 @@
+Most of the functionality that dracut implements are actually implemented
+by dracut modules.  dracut modules live in modules.d, and have the following
+structure:
+
+dracut_install_dir/modules.d/
+	00modname/
+		module-setup.sh
+		check
+		<other files as needed by the hook>
+
+00modname: The name of the module prefixed by a two-digit numeric sort code.
+	   The numeric code must be present and in the range of 00 - 99.
+	   Modules with lower numbers are installed first.  This is important
+	   because the dracut install functions (which install files onto
+	   the initrd) refuse to overwrite already installed files. This makes
+	   it easy for an earlier module to override the functionality of a
+	   later module, so that you can have a distro or system specific
+	   module override or modify the functionality of a generic module
+	   without having to patch the more generic module.
+
+module-setup.sh:
+	 dracut sources this script to install the functionality that a
+	 module implements onto the initrd.  For the most part, this amounts
+	 to copying files from the host system onto the initrd in a controlled
+	 manner.
+
+install():
+	 This function of module-setup.sh is called to install all
+	 non-kernel files. dracut supplies several install functions that are
+	 specialized for different file types.  Browse through dracut-functions
+	 fore more details.  dracut also provides a $moddir variable if you
+	 need to install a file from the module directory, such as an initrd
+	 hook, a udev rule, or a specialized executable.
+
+installkernel():
+	 This function of module-setup.sh is called to install all
+	 kernel related files.
+
+
+check():
+       dracut calls this function to check and see if a module can be installed
+       on the initrd.
+
+       When called without options, check should check to make sure that
+       any files it needs to install into the initrd from the host system
+       are present.  It should exit with a 0 if they are, and a 1 if they are
+       not.
+
+       When called with $hostonly set, it should perform the same check
+       that it would without it set, and it should also check to see if the
+       functionality the module implements is being used on the host system.
+       For example, if this module handles installing support for LUKS
+       encrypted volumes, it should return 0 if all the tools to handle
+       encrpted volumes are available and the host system has the root
+       partition on an encrypted volume, 1 otherwise.
+
+depends():
+       This function should output a list of dracut modules
+       that it relies upon.  An example would be the nfs and iscsi modules,
+       which rely on the network module to detect and configure network
+       interfaces.
+
+Any other files in the module will not be touched by dracut directly.
+
+You are encouraged to provide a README that describes what the module is for.
+
+
+HOOKS
+=====
+
+init has the following hook points to inject scripts:
+
+/lib/dracut/hooks/cmdline/*.sh
+   scripts for command line parsing
+
+/lib/dracut/hooks/pre-udev/*.sh
+   scripts to run before udev is started
+
+/lib/dracut/hooks/pre-trigger/*.sh
+   scripts to run before the main udev trigger is pulled
+
+/lib/dracut/hooks/initqueue/*.sh
+   runs in parallel to the udev trigger
+   Udev events can add scripts here with /sbin/initqueue.
+   If /sbin/initqueue is called with the "--onetime" option, the script
+   will be removed after it was run.
+   If /lib/dracut/hooks/initqueue/work is created and udev >= 143 then
+   this loop can process the jobs in parallel to the udevtrigger.
+   If the udev queue is empty and no root device is found or no root
+   filesystem was mounted, the user will be dropped to a shell after
+   a timeout.
+   Scripts can remove themselves from the initqueue by "rm $job".
+
+/lib/dracut/hooks/pre-mount/*.sh
+   scripts to run before the root filesystem is mounted
+   Network filesystems like NFS that do not use device files are an
+   exception. Root can be mounted already at this point.
+
+/lib/dracut/hooks/mount/*.sh
+   scripts to mount the root filesystem
+   If the udev queue is empty and no root device is found or no root
+   filesystem was mounted, the user will be dropped to a shell after
+   a timeout.
+
+/lib/dracut/hooks/pre-pivot/*.sh
+   scripts to run before latter initramfs cleanups
+
+/lib/dracut/hooks/cleanup/*.sh
+   scripts to run before the real init is executed and the initramfs
+   disappears
+   All processes started before should be killed here.
+

README.testsuite

@@ -0,0 +1,30 @@
+For the testsuite to work, you will have to install at least the following software packages:
+dash
+asciidoc
+mdadm
+lvm2
+cryptsetup
+nfs-utils
+netbsd-iscsi
+nbd
+dhcp (dhcp-server on openSUSE)
+iscsi-initiator-utils
+TEST-04-FULL-SYSTEMD: systemd >= 187
+
+How to run the testsuite:
+
+$ sudo make clean check
+
+in verbose mode:
+$ sudo make V=1 clean check
+
+only specific test:
+$ sudo make TESTS="01 20 40" clean check
+only runs the 01, 20 and 40 tests.
+
+debug a specific test case:
+$ cd TEST-01-BASIC
+$ sudo make clean setup run
+... change some kernel parameters ...
+$ sudo make run
+to run the test without doing the setup

TODO

@@ -0,0 +1,44 @@
+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
+
+- use info and warn prefix
+- generate systemd unit dracut-initramfs-restore in /run/systemd dynamically
+- 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 / careful about resume!
+- the hard-coded list of udev rules that we care about is kind of lame.
+- panic fallback
+- bridging/bonding without "netroot=" https://bugzilla.redhat.com/show_bug.cgi?id=822750
+- progress indication for fsck https://bugzilla.redhat.com/show_bug.cgi?id=827118
+- domain, searchdomain https://bugzilla.redhat.com/show_bug.cgi?id=840778
+- disable write-ifcfg https://bugzilla.redhat.com/show_bug.cgi?id=840784
+- check for /var to be mounted in convertfs https://bugzilla.redhat.com/show_bug.cgi?id=848172
+- probably fix "--include" https://bugzilla.redhat.com/show_bug.cgi?id=849338
+
+GENERATOR TODO
+
+- remove wait for swap devs, if no "resume=" is given on the kernel command line
+- add presets (predefined set of modules)
+- add interpreter/plugin-scripts to be sourced at the beginning or end (can use dracut-functions)
+- add mechanism for module specific command line options
+- pkg-config integration, to make it easy for other packages to use us.
+- default module specification could use some work
+- udev rule copying, as mentioned above, is a bit too hard-coded
+
+- dracut-install parse LD_SHOW_AUXV="" AT_PLATFORM for lib install
+
+CODE TODO
+
+- 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)
+- https://bugzilla.redhat.com/show_bug.cgi?id=524727 - dracut + encrypted root + networking
+

configure

@@ -1,15 +1,14 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 # We don't support srcdir != builddir
-echo \#buildapi-variable-no-builddir > /dev/null
+echo \#buildapi-variable-no-builddir >/dev/null
 
 prefix=/usr
 
 enable_documentation=yes
 
-CC="${CC:-cc}"
-PKG_CONFIG="${PKG_CONFIG:-pkg-config}"
-
 # Little helper function for reading args from the commandline.
 # it automatically handles -a b and -a=b variants, and returns 1 if
 # we need to shift $3.
@@ -19,9 +18,9 @@ read_arg() {
     # $3 = arg parameter
     local rematch='^[^=]*=(.*)$'
     if [[ $2 =~ $rematch ]]; then
-        read -r "$1" <<< "${BASH_REMATCH[1]}"
+        read "$1" <<< "${BASH_REMATCH[1]}"
     else
-        read -r "$1" <<< "$3"
+        read "$1" <<< "$3"
         # There is no way to shift our callers args, so
         # return 1 to indicate they should do it instead.
         return 1
@@ -31,78 +30,29 @@ read_arg() {
 
 while (($# > 0)); do
     case "${1%%=*}" in
-        --prefix) read_arg prefix "$@" || shift ;;
-        --libdir) read_arg libdir "$@" || shift ;;
-        --datadir) read_arg datadir "$@" || shift ;;
-        --sysconfdir) read_arg sysconfdir "$@" || shift ;;
-        --sbindir) read_arg sbindir "$@" || shift ;;
-        --mandir) read_arg mandir "$@" || shift ;;
-        --disable-documentation) enable_documentation=no ;;
-        --program-prefix) read_arg programprefix "$@" || shift ;;
-        --exec-prefix) read_arg execprefix "$@" || shift ;;
-        --bindir) read_arg bindir "$@" || shift ;;
-        --includedir) read_arg includedir "$@" || shift ;;
-        --libexecdir) read_arg libexecdir "$@" || shift ;;
-        --localstatedir) read_arg localstatedir "$@" || shift ;;
-        --sharedstatedir) read_arg sharedstatedir "$@" || shift ;;
-        --infodir) read_arg infodir "$@" || shift ;;
-        --systemdsystemunitdir) read_arg systemdsystemunitdir "$@" || shift ;;
-        --bashcompletiondir) read_arg bashcompletiondir "$@" || shift ;;
-        *) echo "Ignoring unknown option '$1'" ;;
+        --prefix) read_arg prefix "$@" || shift;;
+        --libdir) read_arg libdir "$@" || shift;;
+        --datadir) read_arg datadir "$@" || shift;;
+        --sysconfdir) read_arg sysconfdir "$@" || shift;;
+        --sbindir) read_arg sbindir "$@" || shift;;
+        --mandir) read_arg mandir "$@" || shift;;
+        --disable-documentation) enable_documentation=no;;
+        --program-prefix) read_arg programprefix "$@" || shift;;
+        --exec-prefix) read_arg execprefix "$@" || shift;;
+        --bindir) read_arg bindir "$@" || shift;;
+        --includedir) read_arg includedir "$@" || shift;;
+        --libexecdir) read_arg libexecdir "$@" || shift;;
+        --localstatedir) read_arg localstatedir "$@" || shift;;
+        --sharedstatedir) read_arg sharedstatedir "$@" || shift;;
+        --infodir) read_arg infodir "$@" || shift;;
+        --systemdsystemunitdir) read_arg systemdsystemunitdir "$@" || shift;;
+        --bashcompletiondir) read_arg bashcompletiondir "$@" || shift;;
+        *) echo "Ignoring unknown option '$1'";;
     esac
     shift
 done
 
-if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 23 "; then
-    echo "dracut needs pkg-config and libkmod >= 23." >&2
-    exit 1
-fi
-
-cat << EOF > conftest.c
-#include <fts.h>
-int main() {
-	return 0;
-}
-EOF
-
-# shellcheck disable=SC2086
-${CC} $CFLAGS $LDFLAGS conftest.c > /dev/null 2>&1
-ret=$?
-rm -f conftest.c a.out
-
-# musl doesn't have fts.h included
-if test $ret -ne 0; then
-    echo "dracut needs fts development files." >&2
-    exit 1
-fi
-
-cat << EOF > conftest.c
-#include <fts.h>
-int main(void) {
-	fts_open(0, 0, 0);
-	return 0;
-}
-EOF
-
-found=no
-for lib in "-lc" "-lfts"; do
-    # shellcheck disable=SC2086
-    ${CC} $CFLAGS $LDFLAGS conftest.c -Wl,$lib > /dev/null 2>&1
-    ret=$?
-    if test $ret -eq 0; then
-        FTS_LIBS="$lib"
-        found=yes
-        break
-    fi
-done
-rm -f conftest.c a.out
-
-if test $found = no; then
-    echo "dracut couldn't find usable fts library" >&2
-    exit 1
-fi
-
-cat > Makefile.inc.$$ << EOF
+cat > Makefile.inc.$$ <<EOF
 prefix ?= ${prefix}
 libdir ?= ${libdir:-${prefix}/lib}
 datadir ?= ${datadir:-${prefix}/share}
@@ -111,9 +61,6 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
 mandir ?= ${mandir:-${prefix}/share/man}
 enable_documentation ?= ${enable_documentation:-yes}
 bindir ?= ${bindir:-${prefix}/bin}
-KMOD_CFLAGS ?= $(${PKG_CONFIG} --cflags " libkmod >= 23 ")
-KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 23 ")
-FTS_LIBS ?= ${FTS_LIBS}
 EOF
 
 {

docs/BASH.md

@@ -1,213 +0,0 @@
-# BASH Notes
-
-## basename
-Don't use `basename`, use:
-```shell
-  file=${path##*/}
-```
-
-## dirname
-Don't use `dirname`, use:
-```shell
-  dir=${path%/*}
-```
-
-## shopt
-If you set `shopt` in a function, reset to its default state with `trap`:
-```shell
-func() {
-  trap "$(shopt -p nullglob globstar)" RETURN
-  shopt -q -s nullglob globstar
-}
-```
-
-## find, grep, print0, -0, -z
-
-Don't use `find` in `for` loops, because filenames can contain spaces.
-Try to use `globstar` and `nullglob` or null byte terminated strings.
-
-Instead of:
-```shell
-func() {
-    for file in $(find /usr/lib* -type f -name 'lib*.a' -print0 ); do
-      echo $file
-    done
-}
-```
-
-use:
-```shell
-func() {
-    trap "$(shopt -p nullglob globstar)" RETURN
-    shopt -q -s nullglob globstar
-
-    for file in /usr/lib*/**/lib*.a; do
-      [[ -f $file ]] || continue
-      echo "$file"
-    done
-}
-```
-
-Or collect the filenames in an array, if you need them more than once:
-```shell
-func() {
-    trap "$(shopt -p nullglob globstar)" RETURN
-    shopt -q -s nullglob globstar
-
-    filenames=( /usr/lib*/**/lib*.a )
-
-    for file in "${filenames[@]}"; do
-      [[ -f $file ]] || continue
-      echo "$file"
-    done
-}
-```
-
-Or, if you really want to use `find`, use `-print0` and an array:
-```shell
-func() {
-    mapfile -t -d '' filenames < <(find /usr/lib* -type f -name 'lib*.a' -print0)
-    for file in "${filenames[@]}"; do
-      echo "$file"
-    done
-}
-```
-
-Note: `-d ''` is the same as `-d $'\0'` and sets the null byte as the delimiter.
-
-or:
-```shell
-func() {
-    find /usr/lib* -type f -name 'lib*.a' -print0 | while read -r -d '' file; do
-      echo "$file"
-    done
-}
-```
-
-or
-```shell
-func() {
-    while read -r -d '' file; do
-      echo "$file"
-    done < <(find /usr/lib* -type f -name 'lib*.a' -print0)
-}
-```
-
-Use the tool options for null terminated strings, like `-print0`, `-0`, `-z`, etc.
-
-## prefix or suffix array elements
-
-Instead of:
-```shell
-func() {
-  other-cmd $(for k in "$@"; do echo "prefix-$k"; done)
-}
-```
-do
-```shell
-func() {
-  other-cmd "${@/#/prefix-}"
-}
-```
-
-or suffix:
-```shell
-func() {
-  other-cmd "${@/%/-suffix}"
-}
-```
-
-## Join array elements with a separator char
-
-Here we have an associate array `_drivers`, where we want to print the keys separated by ',':
-```shell
-    if [[ ${!_drivers[*]} ]]; then
-        echo "rd.driver.pre=$(IFS=, ;echo "${!_drivers[*]}")" > "${initdir}"/etc/cmdline.d/00-watchdog.conf
-    fi
-```
-
-## Optional parameters to commands
-
-If you want to call a command `cmd` with an option, if a variable is set, rather than doing:
-
-```shell
-func() {
-  local param="$1"
-
-  if [[ $param ]]; then
-    param="--this-special-option $param"
-  fi
-
-  cmd $param
-}
-```
-
-do it like this:
-
-```shell
-func() {
-  local param="$1"
-
-  cmd ${param:+--this-special-option "$param"}
-}
-
-# cmd --this-special-option 'abc'
-func 'abc'
-
-# cmd
-func ''
-
-# cmd
-func
-```
-
-If you want to specify the option even with an empty string do this:
-
-```shell
-func() {
-  local -a special_params
-
-  if [[ ${1+_} ]]; then
-    # only declare `param` if $1 is set (even as null string)
-    local param="$1"
-  fi
-
-  # check if `param` is set (even as null string)
-  if [[ ${param+_} ]]; then
-    special_params=( --this-special-option "${param}" )
-  fi
-
-  cmd ${param+"${special_params[@]}"}
-}
-
-# cmd --this-special-option 'abc'
-func 'abc'
-
-# cmd --this-special-option ''
-func ''
-
-# cmd
-func
-```
-
-Or more simple, if you only have to set an option:
-```shell
-func() {
-  if [[ ${1+_} ]]; then
-    # only declare `param` if $1 is set (even as null string)
-    local param="$1"
-  fi
-
-  cmd ${param+--this-special-option}
-}
-
-# cmd --this-special-option
-func 'abc'
-
-# cmd --this-special-option
-func ''
-
-# cmd
-func
-```
-

docs/CODE_OF_CONDUCT.md

@@ -1,56 +0,0 @@
-# Dracut Code of Conduct
-
-This code of conduct outlines our expectations for participants within the Dracut community, as well as steps for reporting unacceptable behavior.
-We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored. 
-Anyone who violates this code of conduct may be banned from the community.
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others’ private information, such as a physical or email address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the project maintainer responsible for enforcement Harald Hoyer <harald@redhat.com>. 
-All complaints will be reviewed and investigated promptly and fairly and will result in a response that is deemed necessary and appropriate to the circumstances.
-Project maintainers are obligated to respect the privacy and security of the reporter of any incident.
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. 
-Translations are available at https://www.contributor-covenant.org/translations.

docs/HACKING.md

@@ -1,278 +0,0 @@
-# Dracut Developer Guidelines
-
-## git
-
-Currently dracut lives on github.com and kernel.org.
-
-* https://github.com/dracutdevs/dracut.git
-* https://git.kernel.org/pub/scm/boot/dracut/dracut.git
-
-Pull requests should be filed preferably on github nowadays.
-
-### Code Format
-
-It is recommended, that you install a plugin for your editor, which reads in `.editorconfig`.
-Additionally `emacs` and `vim` config files are provided for convenience.
-
-To reformat C files use `astyle`:
-```console
-$ astyle --options=.astylerc <FILE>
-```
-
-For convenience there is also a Makefile `indent-c` target `make indent-c`.
-
-To reformat shell files use `shfmt`:
-
-```console
-$ shfmt_version=3.2.4
-$ wget "https://github.com/mvdan/sh/releases/download/v${shfmt_version}/shfmt_v${shfmt_version}_linux_amd64" -O shfmt
-$ chmod u+x shfmt
-$ ./shfmt -w -s .
-```
-
-or
-
-```console
-$ GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
-$ $GOPATH/bin/shfmt -w -s .
-```
-
-or if `shfmt` is already in your `PATH`, use `make indent`.
-
-Some IDEs already have support for shfmt.
-
-For convenience the `make indent` Makefile target also calls shfmt, if it is in `$PATH`.
-
-### Commit Messages
-
-Commit messages should answer these questions:
-
-* What?: a short summary of what you changed in the subject line.
-* Why?: what the intended outcome of the change is (arguably the most important piece of information that should go into a message).
-* How?: if multiple approaches for achieving your goal were available, you also want to explain why you chose the used implementation strategy.
-  Note that you should not explain how your change achieves your goal in your commit message.
-  That should be obvious from the code itself.
-  If you cannot achieve that clarity with the used programming language, use comments within the code instead.
-
-The commit message is primarily the place for documenting the why.
-
-Commit message titles should follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
-
-Format is `<type>[optional scope]: <description>`, where `type` is one of:
-
-* fix: A bug fix
-* feat: A new feature
-* perf: A code change that improves performance
-* refactor: A code change that neither fixes a bug nor adds a feature
-* style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
-* test: Adding missing tests or correcting existing tests
-* docs: Documentation only changes
-* revert: Reverts a previous commit
-* chore: Other changes that don't modify src or test files
-* build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
-* ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
-
-`scope` should be the module name (without numbers) or:
-
-* cli: for the dracut command line interface
-* rt: for the dracut initramfs runtime logic
-* functions: for general purpose dracut functions
-
-Commit messages are checked with [Commisery](https://github.com/tomtom-international/commisery).
-
-## Writing modules
-
-Some general rules for writing modules:
-
-* Use one of the inst family of functions to actually install files
-  on to the initramfs.  They handle mangling the pathnames and (for binaries,
-  scripts, and kernel modules) installing dependencies as appropriate so
-  you do not have to.
-* Scripts that end up on the initramfs should be POSIX compliant. dracut
-  will try to use /bin/dash as /bin/sh for the initramfs if it is available,
-  so you should install it on your system -- dash aims for strict POSIX
-  compliance to the extent possible.
-* Hooks MUST be POSIX compliant -- they are sourced by the init script,
-  and having a bashism break your user's ability to boot really sucks.
-* Generator modules should have a two digit numeric prefix -- they run in
-  ascending sort order. Anything in the 90-99 range is stuff that dracut
-  relies on, so try not to break those hooks.
-* Hooks must have a .sh extension.
-* Generator modules are described in more detail later on.
-* We have some breakpoints for debugging your hooks.  If you pass 'rdbreak'
-  as a kernel parameter, the initramfs will drop to a shell just before
-  switching to a new root. You can pass 'rdbreak=hookpoint', and the initramfs
-  will break just before hooks in that hookpoint run.
-
-Also, there is an attempt to keep things as distribution-agnostic as
-possible.  Every distribution has their own tool here and it's not
-something which is really interesting to have separate across them.
-So contributions to help decrease the distro-dependencies are welcome.
-
-Most of the functionality that dracut implements are actually implemented
-by dracut modules.  dracut modules live in modules.d, and have the following
-structure:
-
-```
-dracut_install_dir/modules.d/
-	00modname/
-		module-setup.sh
-		check
-		<other files as needed by the hook>
-```
-
-`00modname`: The name of the module prefixed by a two-digit numeric sort code.
-	   The numeric code must be present and in the range of 00 - 99.
-	   Modules with lower numbers are installed first.  This is important
-	   because the dracut install functions (which install files onto
-	   the initrd) refuse to overwrite already installed files. This makes
-	   it easy for an earlier module to override the functionality of a
-	   later module, so that you can have a distro or system specific
-	   module override or modify the functionality of a generic module
-	   without having to patch the more generic module.
-
-`module-setup.sh`:
-	 dracut sources this script to install the functionality that a
-	 module implements onto the initrd.  For the most part, this amounts
-	 to copying files from the host system onto the initrd in a controlled
-	 manner.
-
-`install()`:
-	 This function of module-setup.sh is called to install all
-	 non-kernel files. dracut supplies several install functions that are
-	 specialized for different file types.  Browse through dracut-functions
-	 fore more details.  dracut also provides a $moddir variable if you
-	 need to install a file from the module directory, such as an initrd
-	 hook, a udev rule, or a specialized executable.
-
-`installkernel()`:
-	 This function of module-setup.sh is called to install all
-	 kernel related files.
-
-
-`check()`:
-       dracut calls this function to check and see if a module can be installed
-       on the initrd.
-
-       When called without options, check should check to make sure that
-       any files it needs to install into the initrd from the host system
-       are present.  It should exit with a 0 if they are, and a 1 if they are
-       not.
-
-       When called with $hostonly set, it should perform the same check
-       that it would without it set, and it should also check to see if the
-       functionality the module implements is being used on the host system.
-       For example, if this module handles installing support for LUKS
-       encrypted volumes, it should return 0 if all the tools to handle
-       encrpted volumes are available and the host system has the root
-       partition on an encrypted volume, 1 otherwise.
-
-`depends()`:
-       This function should output a list of dracut modules
-       that it relies upon.  An example would be the nfs and iscsi modules,
-       which rely on the network module to detect and configure network
-       interfaces.
-
-Any other files in the module will not be touched by dracut directly.
-
-You are encouraged to provide a README that describes what the module is for.
-
-
-### Hooks
-
-init has the following hook points to inject scripts:
-
-`/lib/dracut/hooks/cmdline/*.sh`
-   scripts for command line parsing
-
-`/lib/dracut/hooks/pre-udev/*.sh`
-   scripts to run before udev is started
-
-`/lib/dracut/hooks/pre-trigger/*.sh`
-   scripts to run before the main udev trigger is pulled
-
-`/lib/dracut/hooks/initqueue/*.sh`
-   runs in parallel to the udev trigger
-   Udev events can add scripts here with /sbin/initqueue.
-   If /sbin/initqueue is called with the "--onetime" option, the script
-   will be removed after it was run.
-   If /lib/dracut/hooks/initqueue/work is created and udev >= 143 then
-   this loop can process the jobs in parallel to the udevtrigger.
-   If the udev queue is empty and no root device is found or no root
-   filesystem was mounted, the user will be dropped to a shell after
-   a timeout.
-   Scripts can remove themselves from the initqueue by "rm $job".
-
-`/lib/dracut/hooks/pre-mount/*.sh`
-   scripts to run before the root filesystem is mounted
-   Network filesystems like NFS that do not use device files are an
-   exception. Root can be mounted already at this point.
-
-`/lib/dracut/hooks/mount/*.sh`
-   scripts to mount the root filesystem
-   If the udev queue is empty and no root device is found or no root
-   filesystem was mounted, the user will be dropped to a shell after
-   a timeout.
-
-`/lib/dracut/hooks/pre-pivot/*.sh`
-   scripts to run before latter initramfs cleanups
-
-`/lib/dracut/hooks/cleanup/*.sh`
-   scripts to run before the real init is executed and the initramfs
-   disappears
-   All processes started before should be killed here.
-
-
-## Testsuite
-
-### Rootless in a container with podman
-
-```console
-$ cd <DRACUT_SOURCE>
-$ podman pull [CONTAINER]
-$ podman run --rm -it \
-    --cap-add=SYS_PTRACE --user 0 \
-    -v /dev:/dev -v ./:/dracut:z \
-    [CONTAINER] \
-    bash -l
-# cd /dracut
-# ./configure
-# make -j $(getconf _NPROCESSORS_ONLN)
-# cd test
-# make V=1 SKIP="16 60 61" clean check
-```
-
-with `[CONTAINER]` being one of the
-[github `dracutdevs` containers](https://github.com/orgs/dracutdevs/packages),
-e.g. `ghcr.io/dracutdevs/fedora:latest`.
-
-### On bare metal
-
-For the testsuite to pass, you will have to install at least the software packages
-mentioned in the `test/container` Dockerfiles.
-
-```
-$ sudo make clean check
-```
-
-in verbose mode:
-```
-$ sudo make V=1 clean check
-```
-
-only specific test:
-```
-$ sudo make TESTS="01 20 40" clean check
-```
-only runs the 01, 20 and 40 tests.
-
-debug a specific test case:
-```
-$ cd TEST-01-BASIC
-$ sudo make clean setup run
-```
-... change some kernel parameters in `test.sh` ...
-```
-$ sudo make run
-```
-to run the test without doing the setup.

docs/README.cross

@@ -1,48 +0,0 @@
-Dracut supports running against a sysroot directory that is different
-from the actual root (/) directory of the running system. It is most
-useful for creating/bootstrapping a new system that may or may not be
-using the same CPU architecture as the host system, i.e. building a
-whole Linux system with a cross-compiler framework like Yocto.
-
-The user-visible frontend change is the introduction of a new option
-called "-r" or "--sysroot". It expects a directory that contains the
-complete Linux system that has all the files (kernel drivers, firmware,
-executables, libraries and others) necessary to construct the initramfs.
-
-E.g: dracut --sysroot /path/to/sysroot initramfs.img kernelversion
-
-To support this, a new global variable was introduced inside dracut.
-This variable is called "dracutsysrootdir" and all the files installed
-into the initramfs image is searched relative to the sysroot directory.
-This variable can also be set externally to dracut without using option
--r/--sysroot.
-
-There are other details that are necessary to tweak to be able to
-run on cross-compiled (a.k.a. foreign) binaries.
-
-dracut uses these crucial utilities during its operation:
-
-ldd
-===
-It lists dynamic library dependencies for executables or libraries
-
-ldconfig
-========
-It creates /etc/ld.so.cache, i.e. the cached information about libraries
-known to the system.
-
-These utilities the way they exist on the host system only work on
-the host system.
-
-To support cross-compiled binaries, a different ldd variant is needed that
-works on those binaries. One such ldd script is found at
-https://gist.github.com/jerome-pouiller/c403786c1394f53f44a3b61214489e6f
-
-ldconfig in GLIBC as is does support a sysroot with its -r option.
-
-Extra environment variables needed to run dracut on the sysroot are
-documented in the dracut(8) man page.
-
-For the Plymouth boot splash to be added to the initramfs image,
-this gitlab PR is needed for Plymouth:
-https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/72

docs/RELEASE.md

@@ -1,70 +0,0 @@
-# Conducting A Successful Release
-
-This documents contains the necessary steps to conduct a successful release.
-
-1. Add all items to `NEWS.md`
-
-    Get a first template with [`clog`](https://github.com/clog-tool/clog-cli)
-    ```console
-    $ clog -F -r https://github.com/dracutdevs/dracut
-    ```
-
-2. Update the contributors list in NEWS.md
-
-   Produce the list with:
-   ```console
-   $ make CONTRIBUTORS
-   ```
-
-   Append the list to the section in `NEWS.md`
-
-3. Update AUTHORS
-
-   ```console
-   $ make AUTHORS
-   ```
-
-4. Check in AUTHORS and NEWS.md
-
-   ```console
-   $ git ci -m "docs: update NEWS.md and AUTHORS" NEWS.md AUTHORS
-   ```
-
-5. Tag the release and push
-
-   ```console
-   $ VERSION=052
-   $ git tag -s "$VERSION"
-   $ git push --tags
-   ```
-
-   Add the section from `NEWS.md` to the git tag message.
-
-6. Push git to kernel.org
-
-   With:
-   ```console
-   $ git remote add kernelorg ssh://gitolite@ra.kernel.org/pub/scm/boot/dracut/dracut.git
-   ```
-
-   Push to kernel.org git:
-   ```console
-   $ git push --atomic kernelorg master "$VERSION"
-   ```
-
-
-7. Sign and upload tarballs to kernel.org
-
-   ```console
-   $ make upload
-   ```
-
-   This requires `kup` and a kernel.org account.
-   Wait until the tarballs are synced to http://www.kernel.org/pub/linux/utils/boot/dracut/ .
-
-8. Create a new release on github (https://github.com/dracutdevs/dracut/releases/new)
-   - Add the section from `NEWS.md` to the release.
-   - Attach the tarballs and signature file from http://www.kernel.org/pub/linux/utils/boot/dracut/ to the github release.
-
-9. Close the github milestone and open a new one (https://github.com/dracutdevs/dracut/milestones)
-10. Ensure that announcement was sent and reached the linux-initramfs mailinglist (https://www.spinics.net/lists/linux-initramfs/)

docs/SECURITY.md

@@ -1,3 +0,0 @@
-Security is very important to us. If you discover any issue regarding security, we'd appreciate a non-public disclosure of
-the information, so  please disclose the information responsibly by sending an email to Harald Hoyer harald@redhat.com and not by creating a GitHub issue. 
-We will respond swiftly to fix verifiable security issues with the disclosure being coordinated with distributions and relevant security teams.

dracut-bash-completion.sh

@@ -0,0 +1,79 @@
+#
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2013 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 <http://www.gnu.org/licenses/>.
+#
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+_dracut() {
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local -A OPTS=(
+                [STANDALONE]='-f -v -q -l -H -h -M -N
+                              --ro-mnt --force --kernel-only --no-kernel --strip --nostrip
+                              --hardlink --nohardlink --noprefix --mdadmconf --nomdadmconf
+                              --lvmconf --nolvmconf --debug --profile --verbose --quiet
+                              --local --hostonly --no-hostonly --fstab --help --bzip2 --lzma
+                              --xz --no-compress --gzip --list-modules --show-modules --keep
+                              --printsize --regenerate-all --noimageifnotneeded --early-microcode
+                              --no-early-microcode --print-cmdline --prelink --noprelink'
+
+                       [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers
+                              --omit-drivers --modules --omit --drivers --filesystems --install
+                              --fwdir --libdirs --fscks --add-fstab --mount --device --nofscks
+                              --kmoddir --conf --confdir --tmpdir --stdlog --compress --prefix
+                              --kernel-cmdline --sshkey --persistent-policy'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --kmoddir|-k|--fwdir|--confdir|--tmpdir)
+                                comps=$(compgen -d -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        -c|--conf|--sshkey|--add-fstab|--add-device|-I|--install)
+                                comps=$(compgen -f -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        -a|-m|-o|--add|--modules|--omit)
+                                comps=$(dracut --list-modules 2>/dev/null)
+                        ;;
+                        --persistent-policy)
+                                comps=$(cd /dev/disk/; echo *)
+                        ;;
+                        --kver)
+                                comps=$(cd /lib/modules; echo [0-9]*)
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        fi
+}
+
+complete -F _dracut dracut

dracut-catimages.sh

@@ -1,4 +1,6 @@
 #!/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 2009 Red Hat, Inc.  All rights reserved.
 #
@@ -16,8 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+
 dwarning() {
-    echo "Warning: $*" >&2
+    echo "Warning: $@" >&2
 }
 
 dinfo() {
@@ -25,11 +28,11 @@ dinfo() {
 }
 
 derror() {
-    echo "Error: $*" >&2
+    echo "Error: $@" >&2
 }
 
 usage() {
-    #                                                   80x25 linebreak here ^
+#                                                       80x25 linebreak here ^
     cat << EOF
 Usage: $0 [OPTION]... <initramfs> <base image> [<image>...]
 Creates initial ramdisk image by concatenating several images from the command
@@ -48,46 +51,27 @@ line and /boot/dracut/
 EOF
 }
 
+
 imagedir=/boot/dracut/
 overlay=/var/lib/dracut/overlay
 
 while (($# > 0)); do
     case $1 in
-        -f | --force) force=yes ;;
-        -i | --imagedir)
-            imagedir=$2
-            shift
-            ;;
-        -o | --overlaydir)
-            overlay=$2
-            shift
-            ;;
-        --nooverlay)
-            no_overlay=yes
-            shift
-            ;;
-        --noimagedir)
-            no_imagedir=yes
-            shift
-            ;;
-        -h | --help)
-            usage
-            exit 1
-            ;;
-        --debug) export debug="yes" ;;
-        -v | --verbose) beverbose="yes" ;;
-        -*)
-            printf "\nUnknown option: %s\n\n" "$1" >&2
-            usage
-            exit 1
-            ;;
+        -f|--force) force=yes;;
+        -i|--imagedir) imagedir=$2;shift;;
+        -o|--overlaydir) overlay=$2;shift;;
+        --nooverlay) no_overlay=yes;shift;;
+        --noimagedir) no_imagedir=yes;shift;;
+        -h|--help) usage; exit 1 ;;
+        --debug) debug="yes";;
+        -v|--verbose) beverbose="yes";;
+        -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
         *) break ;;
     esac
     shift
 done
 
-outfile=$1
-shift
+outfile=$1; shift
 
 if [[ -z $outfile ]]; then
     derror "No output file specified."
@@ -95,8 +79,7 @@ if [[ -z $outfile ]]; then
     exit 1
 fi
 
-baseimage=$1
-shift
+baseimage=$1; shift
 
 if [[ -z $baseimage ]]; then
     derror "No base image specified."
@@ -122,11 +105,8 @@ fi
 if [[ ! $no_overlay ]]; then
     ofile="$imagedir/90-overlay.img"
     dinfo "Creating image $ofile from directory $overlay"
-    type pigz &> /dev/null && gzip=pigz || gzip=gzip
-    (
-        cd "$overlay" || return 1
-        find . | cpio --quiet -H newc -o | $gzip -9 > "$ofile"
-    )
+    type pigz &>/dev/null && gzip=pigz || gzip=gzip
+    ( cd "$overlay"; find . |cpio --quiet -H newc -o |$gzip -9 > "$ofile"; )
 fi
 
 if [[ ! $no_imagedir ]]; then
@@ -135,7 +115,7 @@ if [[ ! $no_imagedir ]]; then
     done
 fi
 
-images+=("$@")
+images+=($@)
 
 dinfo "Using base image $baseimage"
 cat -- "$baseimage" > "$outfile"

dracut-initramfs-restore.sh

@@ -1,47 +1,30 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 set -e
 
-# do some sanity checks first
-[ -e /run/initramfs/bin/sh ] && exit 0
-[ -e /run/initramfs/.need_shutdown ] || exit 0
-
 KERNEL_VERSION="$(uname -r)"
 
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
 SKIP="$dracutbasedir/skipcpio"
-[[ -x $SKIP ]] || SKIP="cat"
+[[ -x $SKIP ]] || SKIP=cat
 
-[[ -f /etc/machine-id ]] && read -r MACHINE_ID < /etc/machine-id
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
 
-mount -o ro /boot &> /dev/null || true
-
-if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \
-    && [[ $MACHINE_ID ]] \
-    && [[ -d /efi/${MACHINE_ID} || -L /efi/${MACHINE_ID} ]]; then
-    IMG="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
-    && [[ $MACHINE_ID ]] \
-    && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then
+if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
     IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
-    IMG="/boot/initramfs-${KERNEL_VERSION}.img"
-elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
-    IMG="/lib/modules/${KERNEL_VERSION}/initrd"
-else
-    echo "No initramfs image found to restore!"
-    exit 1
 fi
+[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img"
 
 cd /run/initramfs
 
-if $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet > /dev/null; then
+[ -f .need_shutdown -a -f "$IMG" ] || exit 1
+if $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet >/dev/null; then
     rm -f -- .need_shutdown
-elif $SKIP "$IMG" | xzcat | cpio -id --no-absolute-filenames --quiet > /dev/null; then
+elif $SKIP "$IMG" | xzcat | cpio -id --no-absolute-filenames --quiet >/dev/null; then
     rm -f -- .need_shutdown
-elif $SKIP "$IMG" | lz4 -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null; then
-    rm -f -- .need_shutdown
-elif $SKIP "$IMG" | zstd -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null; then
+elif $SKIP "$IMG" | lz4 -d -c | cpio -id --no-absolute-filenames --quiet >/dev/null; then
     rm -f -- .need_shutdown
 else
     # something failed, so we clean up
@@ -50,17 +33,4 @@ else
     exit 1
 fi
 
-if [[ -d squash ]]; then
-    if ! unsquashfs -no-xattrs -f -d . squash-root.img > /dev/null; then
-        echo "Squash module is enabled for this initramfs but failed to unpack squash-root.img" >&2
-        rm -f -- /run/initramfs/shutdown
-        exit 1
-    fi
-fi
-
-if [ -e /etc/selinux/config -a -x /usr/sbin/setfiles ]; then
-    . /etc/selinux/config
-    /usr/sbin/setfiles -v -r /run/initramfs /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts /run/initramfs > /dev/null
-fi
-
 exit 0

dracut-logger.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 et filetype=sh
 #
 # logging faciality module for dracut both at build- and boot-time
 #
@@ -17,7 +19,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export __DRACUT_LOGGER__=1
+
+__DRACUT_LOGGER__=1
+
 
 ## @brief Logging facility module for dracut both at build- and boot-time.
 #
@@ -84,6 +88,7 @@ export __DRACUT_LOGGER__=1
 #
 # @see dlog_init()
 
+
 ## @brief Initializes dracut Logger.
 #
 # @retval 1 if something has gone wrong
@@ -102,8 +107,7 @@ export __DRACUT_LOGGER__=1
 # See file doc comment for details.
 dlog_init() {
     local __oldumask
-    local ret=0
-    local errmsg
+    local ret=0; local errmsg
     [ -z "$stdloglvl" ] && stdloglvl=4
     [ -z "$sysloglvl" ] && sysloglvl=0
     [ -z "$kmsgloglvl" ] && kmsgloglvl=0
@@ -112,23 +116,23 @@ dlog_init() {
 
     if [ -z "$fileloglvl" ]; then
         [ -w "$logfile" ] && fileloglvl=4 || fileloglvl=0
-    elif ((fileloglvl > 0)); then
+    elif (( $fileloglvl > 0 )); then
         if [[ $logfile ]]; then
             __oldumask=$(umask)
             umask 0377
-            ! [ -e "$logfile" ] && : > "$logfile"
-            umask "$__oldumask"
-            if [[ -w $logfile ]] && [[ -f $logfile ]]; then
-                # Mark new run in the log file
-                echo >> "$logfile"
-                if command -v date > /dev/null; then
-                    echo "=== $(date) ===" >> "$logfile"
+            ! [ -e "$logfile" ] && >"$logfile"
+            umask $__oldumask
+            if [ -w "$logfile" -a -f "$logfile" ]; then
+            # Mark new run in the log file
+                echo >>"$logfile"
+                if command -v date >/dev/null; then
+                    echo "=== $(date) ===" >>"$logfile"
                 else
-                    echo "===============================================" >> "$logfile"
+                    echo "===============================================" >>"$logfile"
                 fi
-                echo >> "$logfile"
+                echo >>"$logfile"
             else
-                # We cannot log to file, so turn this facility off.
+            # We cannot log to file, so turn this facility off.
                 fileloglvl=0
                 ret=1
                 errmsg="'$logfile' is not a writable file"
@@ -136,22 +140,23 @@ dlog_init() {
         fi
     fi
 
-    if ((UID != 0)); then
+    if (( $UID  != 0 )); then
         kmsgloglvl=0
         sysloglvl=0
     fi
 
-    if ((sysloglvl > 0)); then
+    if (( $sysloglvl > 0 )); then
         if [[ -d /run/systemd/journal ]] \
-            && type -P systemd-cat &> /dev/null \
-            && systemctl --quiet is-active systemd-journald.socket &> /dev/null \
-            && { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &> /dev/null; }; then
-            readonly _systemdcatfile="$DRACUT_TMPDIR/systemd-cat"
+            && type -P systemd-cat &>/dev/null \
+            && systemctl --quiet is-active systemd-journald.socket &>/dev/null \
+            && { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &>/dev/null; } ; then
+            readonly _dlogdir="$(mktemp --tmpdir="$TMPDIR/" -d -t dracut-log.XXXXXX)"
+            readonly _systemdcatfile="$_dlogdir/systemd-cat"
             mkfifo "$_systemdcatfile"
             readonly _dlogfd=15
-            systemd-cat -t 'dracut' --level-prefix=true < "$_systemdcatfile" &
-            exec 15> "$_systemdcatfile"
-        elif ! [[ -S /dev/log ]] && [[ -w /dev/log ]] || ! command -v logger > /dev/null; then
+            systemd-cat -t 'dracut' --level-prefix=true <"$_systemdcatfile" &
+            exec 15>"$_systemdcatfile"
+        elif ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null; then
             # We cannot log to syslog, so turn this facility off.
             kmsgloglvl=$sysloglvl
             sysloglvl=0
@@ -160,7 +165,7 @@ dlog_init() {
         fi
     fi
 
-    if ((sysloglvl > 0)) || ((kmsgloglvl > 0)); then
+    if (($sysloglvl > 0)) || (($kmsgloglvl > 0 )); then
         if [ -n "$dracutbasedir" ]; then
             readonly syslogfacility=user
         else
@@ -169,44 +174,44 @@ dlog_init() {
         export syslogfacility
     fi
 
-    local lvl
-    local maxloglvl_l=0
+    local lvl; local maxloglvl_l=0
     for lvl in $stdloglvl $sysloglvl $fileloglvl $kmsgloglvl; do
-        ((lvl > maxloglvl_l)) && maxloglvl_l=$lvl
+        (( $lvl > $maxloglvl_l )) && maxloglvl_l=$lvl
     done
     readonly maxloglvl=$maxloglvl_l
     export maxloglvl
 
-    if ((stdloglvl < 6)) && ((kmsgloglvl < 6)) && ((fileloglvl < 6)) && ((sysloglvl < 6)); then
+
+    if (($stdloglvl < 6)) && (($kmsgloglvl < 6)) && (($fileloglvl < 6)) && (($sysloglvl < 6)); then
         unset dtrace
-        dtrace() { :; }
+        dtrace() { :; };
     fi
 
-    if ((stdloglvl < 5)) && ((kmsgloglvl < 5)) && ((fileloglvl < 5)) && ((sysloglvl < 5)); then
+    if (($stdloglvl < 5)) && (($kmsgloglvl < 5)) && (($fileloglvl < 5)) && (($sysloglvl < 5)); then
         unset ddebug
-        ddebug() { :; }
+        ddebug() { :; };
     fi
 
-    if ((stdloglvl < 4)) && ((kmsgloglvl < 4)) && ((fileloglvl < 4)) && ((sysloglvl < 4)); then
+    if (($stdloglvl < 4)) && (($kmsgloglvl < 4)) && (($fileloglvl < 4)) && (($sysloglvl < 4)); then
         unset dinfo
-        dinfo() { :; }
+        dinfo() { :; };
     fi
 
-    if ((stdloglvl < 3)) && ((kmsgloglvl < 3)) && ((fileloglvl < 3)) && ((sysloglvl < 3)); then
+    if (($stdloglvl < 3)) && (($kmsgloglvl < 3)) && (($fileloglvl < 3)) && (($sysloglvl < 3)); then
         unset dwarn
-        dwarn() { :; }
+        dwarn() { :; };
         unset dwarning
-        dwarning() { :; }
+        dwarning() { :; };
     fi
 
-    if ((stdloglvl < 2)) && ((kmsgloglvl < 2)) && ((fileloglvl < 2)) && ((sysloglvl < 2)); then
+    if (($stdloglvl < 2)) && (($kmsgloglvl < 2)) && (($fileloglvl < 2)) && (($sysloglvl < 2)); then
         unset derror
-        derror() { :; }
+        derror() { :; };
     fi
 
-    if ((stdloglvl < 1)) && ((kmsgloglvl < 1)) && ((fileloglvl < 1)) && ((sysloglvl < 1)); then
+    if (($stdloglvl < 1)) && (($kmsgloglvl < 1)) && (($fileloglvl < 1)) && (($sysloglvl < 1)); then
         unset dfatal
-        dfatal() { :; }
+        dfatal() { :; };
     fi
 
     [ -n "$errmsg" ] && derror "$errmsg"
@@ -222,13 +227,13 @@ dlog_init() {
 # @result Echoes first letter of level name.
 _lvl2char() {
     case "$1" in
-        1) echo F ;;
-        2) echo E ;;
-        3) echo W ;;
-        4) echo I ;;
-        5) echo D ;;
-        6) echo T ;;
-        *) return 1 ;;
+        1) echo F;;
+        2) echo E;;
+        3) echo W;;
+        4) echo I;;
+        5) echo D;;
+        6) echo T;;
+        *) return 1;;
     esac
 }
 
@@ -239,15 +244,15 @@ _lvl2char() {
 # @retval 0 if @a lvl is correct.
 # @result Echoes logger priority.
 _lvl2syspri() {
-    printf -- "%s" "$syslogfacility."
+    printf $syslogfacility.
     case "$1" in
-        1) echo crit ;;
-        2) echo error ;;
-        3) echo warning ;;
-        4) echo info ;;
-        5) echo debug ;;
-        6) echo debug ;;
-        *) return 1 ;;
+        1) echo crit;;
+        2) echo error;;
+        3) echo warning;;
+        4) echo info;;
+        5) echo debug;;
+        6) echo debug;;
+        *) return 1;;
     esac
 }
 
@@ -261,9 +266,9 @@ _lvl2syspri() {
 # Conversion is done as follows:
 #
 # <tt>
-#   none     -> LOG_EMERG (0)
+#   FATAL(1) -> LOG_EMERG (0)
 #   none     -> LOG_ALERT (1)
-#   FATAL(1) -> LOG_CRIT (2)
+#   none     -> LOG_CRIT (2)
 #   ERROR(2) -> LOG_ERR (3)
 #   WARN(3)  -> LOG_WARNING (4)
 #   none     -> LOG_NOTICE (5)
@@ -277,16 +282,16 @@ _dlvl2syslvl() {
     local lvl
 
     case "$1" in
-        1) lvl=2 ;;
-        2) lvl=3 ;;
-        3) lvl=4 ;;
-        4) lvl=6 ;;
-        5) lvl=7 ;;
-        6) lvl=7 ;;
-        *) return 1 ;;
+        1) lvl=0;;
+        2) lvl=3;;
+        3) lvl=4;;
+        4) lvl=6;;
+        5) lvl=7;;
+        6) lvl=7;;
+        *) return 1;;
     esac
 
-    [ "$syslogfacility" = user ] && echo $((8 + lvl)) || echo $((24 + lvl))
+    [ "$syslogfacility" = user ] && echo $((8+$lvl)) || echo $((24+$lvl))
 }
 
 ## @brief Prints to stderr and/or writes to file, to syslog and/or /dev/kmsg
@@ -316,29 +321,27 @@ _dlvl2syslvl() {
 #   - @c INFO to @c info
 #   - @c DEBUG and @c TRACE both to @c debug
 _do_dlog() {
-    local lvlc
-    local lvl="$1"
-    shift
-    lvlc=$(_lvl2char "$lvl") || return 0
+    local lvl="$1"; shift
+    local lvlc=$(_lvl2char "$lvl") || return 0
     local msg="$*"
     local lmsg="$lvlc: $*"
 
-    ((lvl <= stdloglvl)) && printf -- 'dracut: %s\n' "$msg" >&2
+    (( $lvl <= $stdloglvl )) && echo "$msg" >&2
 
-    if ((lvl <= sysloglvl)); then
+    if (( $lvl <= $sysloglvl )); then
         if [[ "$_dlogfd" ]]; then
-            printf -- "<%s>%s\n" "$(($(_dlvl2syslvl "$lvl") & 7))" "$msg" >&$_dlogfd
+            printf -- "<%s>%s\n" "$(($(_dlvl2syslvl $lvl) & 7))" "$msg" >&$_dlogfd
         else
-            logger -t "dracut[$$]" -p "$(_lvl2syspri "$lvl")" -- "$msg"
+            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) -- "$msg"
         fi
     fi
 
-    if ((lvl <= fileloglvl)) && [[ -w $logfile ]] && [[ -f $logfile ]]; then
-        echo "$lmsg" >> "$logfile"
+    if (( $lvl <= $fileloglvl )) && [[ -w "$logfile" ]] && [[ -f "$logfile" ]]; then
+        echo "$lmsg" >>"$logfile"
     fi
 
-    ((lvl <= kmsgloglvl)) \
-        && echo "<$(_dlvl2syslvl "$lvl")>dracut[$$] $msg" > /dev/kmsg
+    (( $lvl <= $kmsgloglvl )) && \
+        echo "<$(_dlvl2syslvl $lvl)>dracut[$$] $msg" >/dev/kmsg
 }
 
 ## @brief Internal helper function for _do_dlog()
@@ -359,12 +362,12 @@ _do_dlog() {
 # echo "This is a warning" | dwarn
 dlog() {
     [ -z "$maxloglvl" ] && return 0
-    (($1 <= maxloglvl)) || return 0
+    (( $1 <= $maxloglvl )) || return 0
 
-    if (($# > 1)); then
+    if (( $# > 1 )); then
         _do_dlog "$@"
     else
-        while read -r line || [ -n "$line" ]; do
+        while read line; do
             _do_dlog "$1" "$line"
         done
     fi
@@ -377,9 +380,7 @@ dlog() {
 dtrace() {
     set +x
     dlog 6 "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at DEBUG level (5)
@@ -389,9 +390,7 @@ dtrace() {
 ddebug() {
     set +x
     dlog 5 "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at INFO level (4)
@@ -401,9 +400,7 @@ ddebug() {
 dinfo() {
     set +x
     dlog 4 "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at WARN level (3)
@@ -413,9 +410,7 @@ dinfo() {
 dwarn() {
     set +x
     dlog 3 "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief It's an alias to dwarn() function.
@@ -425,9 +420,7 @@ dwarn() {
 dwarning() {
     set +x
     dwarn "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at ERROR level (2)
@@ -437,9 +430,7 @@ dwarning() {
 derror() {
     set +x
     dlog 2 "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at FATAL level (1)
@@ -449,7 +440,5 @@ derror() {
 dfatal() {
     set +x
     dlog 1 "$@"
-    if [ -n "$debug" ]; then
-        set -x
-    fi
+    [ -n "$debug" ] && set -x || :
 }

dracut.8.asc

@@ -3,11 +3,10 @@ DRACUT(8)
 :doctype: manpage
 :man source:   dracut
 :man manual:   dracut
-:man version:  {version}
 
 NAME
 ----
-dracut - low-level tool for generating an initramfs/initrd image
+dracut - low-level tool for generating an initramfs image
 
 SYNOPSIS
 --------
@@ -29,12 +28,10 @@ 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.
 
-Initramfs images are also called "initrd".
-
 For a complete list of kernel command line options see *dracut.cmdline*(7).
 
 If you are dropped to an emergency shell, while booting your initramfs,
-the file _/run/initramfs/rdsosreport.txt_ is created, which can be saved to a
+the file _/run/initramfs/rdsosreport.txt_ is created, which can be safed to a
 (to be mounted by hand) partition (usually /boot) or a USB stick.
 Additional debugging info can be produced by adding **rd.debug** to the kernel
 command line. _/run/initramfs/rdsosreport.txt_ contains all logs and the output
@@ -57,6 +54,33 @@ OPTIONS
 **-f, --force**::
     overwrite existing initramfs file.
 
+**-m, --modules** _<list of dracut 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** _<list of dracut modules>_::
+    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** _<list of dracut modules>_::
     add a space-separated list of dracut modules to the default set of modules.
     This parameter can be specified multiple times.
@@ -84,35 +108,6 @@ example:
 ----
 ===============================
 
-**-o, --omit** _<list of dracut modules>_::
-    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"  ...
-----
-===============================
-
-**-m, --modules** _<list of dracut 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.
-    This option forces dracut to only include the specified dracut modules.
-    In most cases the "--add" option is what you want to use.
-+
-[NOTE]
-===============================
-If [LIST] has multiple arguments, then you have to put these in quotes. For
-example:
-----
-# dracut --modules "module1 module2"  ...
-----
-===============================
-
 **-d, --drivers** _<list of kernel modules>_::
     specify a space-separated list of kernel modules to exclusively include
     in the initramfs. The kernel modules have to be specified without the ".ko"
@@ -141,19 +136,6 @@ example:
 ----
 ===============================
 
-**--force-drivers** _<list of kernel modules>_::
-    See add-drivers above. But in this case it is ensured that the drivers
-    are tried to be loaded early via modprobe.
-+
-[NOTE]
-===============================
-If [LIST] has multiple arguments, then you have to put these in quotes. For
-example:
-----
-# dracut --force-drivers "kmodule1 kmodule2"  ...
-----
-===============================
-
 **--omit-drivers** _<list of kernel modules>_::
     specify a space-separated list of kernel modules not to add to the
     initramfs.
@@ -244,6 +226,12 @@ example:
 **--nostrip**::
     do not strip binaries in the initramfs
 
+**--prelink**::
+    prelink binaries in the initramfs (default)
+
+**--noprelink**::
+    do not prelink binaries in the initramfs
+
 **--hardlink**::
     hardlink files in the initramfs (default)
 
@@ -265,9 +253,6 @@ example:
 **-v, --verbose**::
     increase verbosity level (default is info(4))
 
-**--version**::
-    display version and exit
-
 **-q, --quiet**:: decrease verbosity level (default is info(4))
 
 **-c, --conf** _<dracut configuration file>_::
@@ -288,15 +273,6 @@ Default:
 Default:
    _/var/tmp_
 
-**-r, --sysroot** _<sysroot directory>_::
-    specify the sysroot directory to collect files from.
-    This is useful to create the initramfs image from
-    a cross-compiled sysroot directory. For the extra helper
-    variables, see *ENVIRONMENT* below.
-+
-Default:
-    _empty_
-
 **--sshkey** _<sshkey file>_:: ssh key file used with ssh-client module.
 
 **--logfile** _<logfile>_:: logfile to use; overrides any setting from
@@ -330,16 +306,6 @@ provide a valid _/etc/fstab_.
 **--no-hostonly-cmdline**:
     Do not store kernel command line arguments needed in the initramfs
 
-**--no-hostonly-default-device**:
-    Do not generate implicit host devices like root, swap, fstab, etc.
-    Use "--mount" or "--add-device" to explicitly add devices as needed.
-
-**--hostonly-i18n**:
-    Install only needed keyboard and font files according to the host configuration (default).
-
-**--no-hostonly-i18n**:
-    Install all keyboard and font files available.
-
 **--persistent-policy** _<policy>_::
     Use _<policy>_ to address disks and partitions.
     _<policy>_ can be any directory name found in /dev/disk.
@@ -359,10 +325,6 @@ provide a valid _/etc/fstab_.
     The default _<dump frequency>_ is "0".
     the default _<fsck order>_ is "2".
 
-**--mount** "_<mountpoint>_"::
-    Like above, but _<device>_, _<filesystem type>_ and _<filesystem options>_
-    are determined by looking at the current mounts.
-
 **--add-device** _<device>_ ::
     Bring up _<device>_ in initramfs, _<device>_ should be the device name.
     This can be useful in hostonly mode for resume support when your swap is on
@@ -387,9 +349,6 @@ example:
 ----
 ===============================
 
-**--install-optional** _<file list>_::
-    install the space separated list of files into the initramfs, if they exist.
-
 **--gzip**::
     Compress the generated initramfs using gzip. This will be done by default,
     unless another compression option or --no-compress is passed. Equivalent to
@@ -439,32 +398,17 @@ Make sure your kernel has lz4 decompression support compiled in, otherwise you
 will not be able to boot.
 ====
 
-**--zstd**::
-    Compress the generated initramfs using Zstandard.
-[WARNING]
-====
-Make sure your kernel has zstd decompression support compiled in, otherwise you
-will not be able to boot.
-====
-
 **--compress** _<compressor>_::
     Compress the generated initramfs using the passed compression program. If
     you pass it just the name of a compression program, it will call that
     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.
-    The default value can also be set via the _INITRD_COMPRESS_ environment variable.
 
 **--no-compress**::
     Do not compress the generated initramfs. This will override any other
     compression options.
 
-**--reproducible**::
-    Create reproducible images.
-
-**--no-reproducible**::
-    Do not create reproducible images.
-
 **--list-modules**::
     List all available dracut modules.
 
@@ -499,134 +443,6 @@ will not be able to boot.
     Regenerate all initramfs images at the default location with the kernel
     versions found on the system. Additional parameters are passed through.
 
-**--loginstall _<DIR>_**::
-    Log all files installed from the host to _<DIR>_.
-
-**--uefi**::
-    Instead of creating an initramfs image, dracut will create an UEFI executable,
-    which can be executed by an UEFI BIOS. The default output filename is
-    _<EFI>/EFI/Linux/linux-$kernel$-<MACHINE_ID>-<BUILD_ID>.efi_. <EFI> might be
-    _/efi_, _/boot_ or _/boot/efi_ depending on where the ESP partition is mounted.
-    The <BUILD_ID> is taken from BUILD_ID in _/usr/lib/os-release_ or if it exists
-    _/etc/os-release_ and is left out, if BUILD_ID is non-existant or empty.
-
-**--no-uefi**::
-    Disables UEFI mode.
-
-**--no-machineid**::
-    affects the default output filename of **--uefi** and will discard the <MACHINE_ID>
-    part.
-
-**--uefi-stub _<FILE>_**::
-    Specifies the UEFI stub loader, which will load the attached kernel, initramfs and
-    kernel command line and boots the kernel. The default is
-    _$prefix/lib/systemd/boot/efi/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
-
-**--uefi-splash-image _<FILE>_**::
-    Specifies the UEFI stub loader's splash image. Requires bitmap (**.bmp**) image
-    format.
-
-**--kernel-image _<FILE>_**::
-    Specifies the kernel image, which to include in the UEFI executable. The default is
-    _/lib/modules/<KERNEL-VERSION>/vmlinuz_ or _/boot/vmlinuz-<KERNEL-VERSION>_
-
-ENVIRONMENT
------------
-
-_INITRD_COMPRESS_::
-    sets the default compression program. See **--compress**.
-
-_DRACUT_LDCONFIG_::
-    sets the _ldconfig_ program path and options. Optional.
-    Used for **--sysroot**.
-+
-Default:
-    _ldconfig_
-
-_DRACUT_LDD_::
-    sets the _ldd_ program path and options. Optional.
-    Used for **--sysroot**.
-+
-Default:
-    _ldd_
-
-_DRACUT_TESTBIN_::
-    sets the initially tested binary for detecting library paths.
-    Optional. Used for **--sysroot**. In the cross-compiled sysroot,
-    the default value (_/bin/sh_) is unusable, as it is an absolute
-    symlink and points outside the sysroot directory.
-+
-Default:
-    _/bin/sh_
-
-_DRACUT_INSTALL_::
-    overrides path and options for executing _dracut-install_ internally.
-    Optional. Can be used to debug _dracut-install_ while running the
-    main dracut script.
-+
-Default:
-    _dracut-install_
-+
-Example:
-    DRACUT_INSTALL="valgrind dracut-install"
-
-_DRACUT_COMPRESS_BZIP2_::
-_DRACUT_COMPRESS_BZIP2_::
-_DRACUT_COMPRESS_LBZIP2_::
-_DRACUT_COMPRESS_LZMA_::
-_DRACUT_COMPRESS_XZ_::
-_DRACUT_COMPRESS_GZIP_::
-_DRACUT_COMPRESS_PIGZ_::
-_DRACUT_COMPRESS_LZOP_::
-_DRACUT_COMPRESS_ZSTD_::
-_DRACUT_COMPRESS_LZ4_::
-_DRACUT_COMPRESS_CAT_::
-    overrides for compression utilities to support using them from
-    non-standard paths.
-+
-Default values are the default compression utility names to be found in **PATH**.
-
-_DRACUT_ARCH_::
-    overrides the value of **uname -m**. Used for **--sysroot**.
-+
-Default:
-    _empty_ (the value of **uname -m** on the host system)
-
-_SYSTEMD_VERSION_::
-    overrides systemd version. Used for **--sysroot**.
-
-_SYSTEMCTL_::
-    overrides the systemctl binary. Used for **--sysroot**.
-
-_NM_VERSION_::
-    overrides the NetworkManager version. Used for **--sysroot**.
-
-_DRACUT_INSTALL_PATH_::
-    overrides **PATH** environment for **dracut-install** to look for
-    binaries relative to **--sysroot**. In a cross-compiled environment
-    (e.g. Yocto), PATH points to natively built binaries that are not
-    in the host's /bin, /usr/bin, etc. **dracut-install** still needs plain
-    /bin and /usr/bin that are relative to the cross-compiled sysroot.
-+
-Default:
-    _PATH_
-
-_DRACUT_INSTALL_LOG_TARGET_::
-    overrides **DRACUT_LOG_TARGET** for **dracut-install**. It allows
-    running **dracut-install* to run with different log target that
-    **dracut** runs with.
-+
-Default:
-    _DRACUT_LOG_TARGET_
-
-_DRACUT_INSTALL_LOG_LEVEL_::
-    overrides **DRACUT_LOG_LEVEL** for **dracut-install**. It allows
-    running **dracut-install* to run with different log level that
-    **dracut** runs with.
-+
-Default:
-    _DRACUT_LOG_LEVEL_
-
 FILES
 -----
 _/var/log/dracut.log_::
@@ -670,18 +486,18 @@ Harald Hoyer
 
 Victor Lowther
 
-Amadeusz Żołnowski
-
-Hannes Reinecke
-
-Daniel Molkentin
-
-Will Woods
-
 Philippe Seewer
 
 Warren Togami
 
+Amadeusz Żołnowski
+
+Jeremy Katz
+
+David Dillow
+
+Will Woods
+
 SEE ALSO
 --------
-*dracut.cmdline*(7) *dracut.conf*(5) *lsinitrd*(1)
+*dracut.cmdline*(7) *dracut.conf*(5)

dracut.asc

@@ -1,8 +1,8 @@
-dracut {mainversion}
-====================
-:author: Harald Hoyer
-:email: harald@redhat.com
-:revnumber: {version}
+dracut
+======
+Harald Hoyer <harald@redhat.com>
+v3.0, October 2013
+
 :language: bash
 
 = Introduction
@@ -61,7 +61,7 @@ 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 initramfs image which contains only whatever is
+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).
 
@@ -132,7 +132,7 @@ The following steps are executed during a shutdown:
 
 * systemd switches to the shutdown.target
 * systemd starts
-  $prefix/lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
+  /lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
 * dracut-shutdown.service executes /usr/lib/dracut/dracut-initramfs-restore
   which unpacks the initramfs to /run/initramfs
 * systemd finishes shutdown.target
@@ -142,7 +142,7 @@ The following steps are executed during a shutdown:
 * if yes, it does a pivot_root to /run/initramfs and executes ./shutdown.
   The old root is then mounted on /oldroot.
   /usr/lib/dracut/modules.d/99shutdown/shutdown.sh is the shutdown executable.
-* shutdown will try to unmount every /oldroot mount and calls the various
+* shutdown will try to umount every /oldroot mount and calls the various
   shutdown hooks from the dracut modules
 
 This ensures, that all devices are disassembled and unmounted cleanly.
@@ -162,6 +162,9 @@ include::dracut.cmdline.7.asc[]
 [[lsinitrd1]]
 include::lsinitrd.1.asc[]
 
+[[mkinitrd8]]
+include::mkinitrd.8.asc[]
+
 = Developer Manual
 
 :leveloffset: 1

dracut.bootup.7.asc

@@ -3,7 +3,6 @@ DRACUT.BOOTUP(7)
 :doctype: manpage
 :man source:   dracut
 :man manual:   dracut
-:man version:  {version}
 
 NAME
 ----

dracut.cmdline.7.asc

@@ -3,7 +3,6 @@ DRACUT.CMDLINE(7)
 :doctype: manpage
 :man source:   dracut
 :man manual:   dracut
-:man version:  {version}
 
 NAME
 ----
@@ -33,7 +32,7 @@ line is the value, which is honored.
 Standard
 ~~~~~~~~
 **init=**__<path to real init>__::
-    specify the path to the init program to be started after the initramfs has
+    specify the path to the init programm to be started after the initramfs has
     finished
 
 **root=**__<path to blockdevice>__::
@@ -82,10 +81,6 @@ rootfstype=ext3
     enable autoassembly of special devices like cryptoLUKS, dmraid, mdraid or
     lvm. Default is off as of dracut version >= 024.
 
-**rd.hostonly=0**::
-    removes all compiled in configuration of the host system the initramfs image
-    was built on. This helps booting, if any disk layout changed, especially in
-    combination with rd.auto or other parameters specifying the layout.
 
 **rd.cmdline=ask**::
     prompts the user for additional kernel command line parameters
@@ -110,33 +105,9 @@ resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7
     the init system performs fsck before remount, you might want to use this
     option to avoid duplication.
 
-iso-scan/filename
-~~~~~~~~~~~~~~~~~
-
-Mount all mountable devices and search for ISO pointed by the argument. When
-the ISO is found set it up as a loop device. Device containing this ISO
-image will stay mounted at /run/initramfs/isoscandev.
-Using iso-scan/filename with a Fedora/Red Hat/CentOS Live iso should just work
-by copying the original kernel cmdline parameters.
-
-[listing]
-.Example
---
-menuentry 'Live Fedora 20' --class fedora --class gnu-linux --class gnu --class os {
-    set isolabel=Fedora-Live-LXDE-x86_64-20-1
-    set isofile="/boot/iso/Fedora-Live-LXDE-x86_64-20-1.iso"
-    loopback loop $isofile
-    linux (loop)/isolinux/vmlinuz0 boot=isolinux iso-scan/filename=$isofile root=live:LABEL=$isolabel ro rd.live.image quiet rhgb
-    initrd (loop)/isolinux/initrd0.img
-}
---
 
 Misc
 ~~~~
-**rd.emergency=**__[reboot|poweroff|halt]__::
-    specify, what action to execute in case of a critical failure. rd.shell=0 also
-    be specified.
-
 **rd.driver.blacklist=**__<drivername>__[,__<drivername>__,...]::
     do not load kernel module <drivername>. This parameter can be specified
     multiple times.
@@ -150,16 +121,11 @@ Misc
     have been loaded. This parameter can be specified multiple times.
 
 **rd.retry=**__<seconds>__::
-    specify how long dracut should retry the initqueue to configure devices.
+    specify how long dracut should wait for devices to appear.
     The default is 30 seconds. After 2/3 of the time, degraded raids are force
     started. If you have hardware, which takes a very long time to announce its
     drives, you might want to extend this value.
 
-**rd.timeout=**__<seconds>__::
-    specify how long dracut should wait for devices to appear. The
-    default is '0', which means 'forever'. Note that this timeout
-    should be longer than rd.retry to allow for proper configuration.
-
 **rd.noverifyssl**::
     accept self-signed certificates for ssl downloads.
 
@@ -167,17 +133,11 @@ Misc
    specify the controlling terminal for the console.
    This is useful, if you have multiple "console=" arguments.
 
-**rd.shutdown.timeout.umount=**__<seconds>__::
-    specify how long dracut should wait for an individual umount to finish
-    during shutdown. This avoids the system from blocking when unmounting a file
-    system cannot complete and waits indefinitely. Value '0' means to wait
-    'forever'. The default is 90 seconds.
-
 [[dracutkerneldebug]]
 Debug
 ~~~~~
-If you are dropped to an emergency shell, the file
-_/run/initramfs/rdsosreport.txt_ is created, which can be saved to a (to be
+If you are dropped to an emergency shell, the file 
+_/run/initramfs/rdsosreport.txt_ is created, which can be safed to a (to be
 mounted by hand) partition (usually /boot) or a USB stick. Additional debugging
 info can be produced by adding **rd.debug** to the kernel command line.
 _/run/initramfs/rdsosreport.txt_ contains all logs and the output of some tools.
@@ -197,9 +157,9 @@ It should be attached to any report about dracut problems.
     _/run/initramfs/init.log_.
     If "quiet" is set, it also logs to the console.
 
-**rd.memdebug=[0-5]**::
-    Print memory usage info at various points, set the verbose level from 0 to 5.
-+
+**rd.memdebug=[0-3]**::
+    Print memory usage info at various points, set the verbose level from 0 to 3.
++    
     Higher level means more debugging output:
 +
 ----
@@ -207,14 +167,6 @@ It should be attached to any report about dracut problems.
     1 - partial /proc/meminfo
     2 - /proc/meminfo
     3 - /proc/meminfo + /proc/slabinfo
-    4 - /proc/meminfo + /proc/slabinfo + memstrack summary
-        NOTE: memstrack is a memory tracing tool that tracks the total memory
-              consumption, and peak memory consumption of each kernel modules
-              and userspace progress during the whole initramfs runtime, report
-              is genereted and the end of initramsfs run.
-    5 - /proc/meminfo + /proc/slabinfo + memstrack (with top memory stacktrace)
-        NOTE: memstrack (with top memory stacktrace) will print top memory
-              allocation stack traces during the whole initramfs runtime.
 ----
 
 **rd.break**::
@@ -256,7 +208,7 @@ rd.vconsole.keymap=de-latin1-nodeadkeys
 [listing]
 .Example
 --
-rd.vconsole.font=eurlatgr
+rd.vconsole.font=LatArCyrHeb-16
 --
 
 **rd.vconsole.font.map=**__<console map base file name>__::
@@ -290,12 +242,12 @@ LVM
     disable LVM detection
 
 **rd.lvm.vg=**__<volume group name>__::
-    only activate all logical volumes in the the volume groups with the given name.
-    rd.lvm.vg can be specified multiple times on the kernel command line.
+    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=**__<volume group name>/<logical volume name>__::
-    only activate the logical volumes with the given name.
-    rd.lvm.lv can be specified multiple times on the kernel command line.
+**rd.lvm.lv=**__<logical volume name>__::
+    only activate the logical volumes with the given name. rd.lvm.lv can be
+    specified multiple times on the kernel command line.
 
 **rd.lvm.conf=0**::
     remove any _/etc/lvm/lvm.conf_, which may exist in the initramfs
@@ -311,8 +263,6 @@ crypto LUKS
     The comparisons also matches, if _<luks uuid>_ is only the beginning of the
     LUKS UUID, so you don't have to specify the full UUID.
     This parameter can be specified multiple times.
-    _<luks uuid>_ may be prefixed by the keyword `keysource:`, see
-    _rd.luks.key_ below.
 
 **rd.luks.allow-discards=**__<luks uuid>__::
     Allow  using  of discards (TRIM) requests for LUKS partitions with the given
@@ -327,44 +277,24 @@ crypto LUKS
 **rd.luks.crypttab=0**::
     do not check, if LUKS partition is in _/etc/crypttab_
 
-**rd.luks.timeout=**__<seconds>__::
-    specify how long dracut should wait when waiting for the user to enter the
-    password. This avoid blocking the boot if no password is entered. It does
-    not apply to luks key. The default is '0', which means 'forever'.
-
 crypto LUKS - key on removable device support
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NB: If systemd is included in the dracut initrd, dracut's built in
-removable device keying support won't work. systemd will prompt for
-a password from the console even if you've supplied **rd.luks.key**.
-You may be able to use standard systemd *fstab*(5) syntax to
-get the same effect. If you do need **rd.luks.key** to work,
-you will have to exclude the "systemd" dracut module and any modules
-that depend on it. See *dracut.conf*(5) and
-https://bugzilla.redhat.com/show_bug.cgi?id=905683 for more
-information.
-
-**rd.luks.key=**_<keypath>[:<keydev>[:<luksdev>]]_::
-    _<keypath>_ is the pathname of a key file, relative to the root
-    of the filesystem on some device. It's REQUIRED. When
-    _<keypath>_ ends with '.gpg' it's considered to be key encrypted
-    symmetrically with GPG.  You will be prompted for the GPG password on
-    boot. GPG support comes with the 'crypt-gpg' module, which needs to be
-    added explicitly.
+**rd.luks.key=**__<keypath>__:__<keydev>__:__<luksdev>__::
+    _keypath_ is a path to key file to look for. It's REQUIRED. When _keypath_
+    ends with '.gpg' it's considered to be key encrypted symmetrically with GPG.
+    You will be prompted for password on boot. GPG support comes with
+    'crypt-gpg' module which needs to be added explicitly.
 +
-_<keydev>_ identifies the device on which the key file resides. It may
-be the kernel name of the device (should start with "/dev/"), a UUID
-(prefixed with "UUID=") or a label (prefix with "LABEL="). You don't
-have to specify a 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 it's not present, all block devices will
-be probed, which may significantly increase boot time.
+_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 used for
-the specified 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:
+If _luksdev_ is given, the specified key will only be applied for that LUKS
+device. Possible values are the same as for _keydev_. Unless you have several
+LUKS devices, you don't have to specify this parameter. The simplest usage is:
 +
 [listing]
 .Example
@@ -373,84 +303,28 @@ rd.luks.key=/foo/bar.key
 --
 +
 As you see, you can skip colons in such a case.
-
++
 [NOTE]
 ===============================
-Your LUKS partition must match your key file.
+dracut pipes key to cryptsetup with _-d -_ argument, therefore you need to pipe
+to crypsetup luksFormat with _-d -_, too!
 
-dracut provides keys to cryptsetup with _-d_ (an older alias for
-_--key-file_). This uses the entire binary
-content of the key file as part of the secret.  If
-you pipe a password into cryptsetup *without* _-d_ or _--key-file_,
-it will be treated as text user input, and only characters before
-the first newline will be used. Therefore, when you're creating
-an encrypted partition for dracut to mount, and you pipe a key into
-_cryptsetup luksFormat_,you must use _-d -_.
-
-Here is an example for a key encrypted with GPG (warning:
-_--batch-mode_ will overwrite the device without asking for
-confirmation):
+Here follows example for key encrypted with GPG:
 
 [listing]
 --
 gpg --quiet --decrypt rootkey.gpg | \
-cryptsetup --batch-mode --key-file - \
-           luksFormat /dev/sda47
+cryptsetup -d - -v --cipher serpent-cbc-essiv:sha256 \
+--key-size 256 luksFormat /dev/sda3
 --
 
-If you use unencrypted key files, just use the key file pathname
-instead of the standard input. For a random key with 256 bits of
-entropy, you might use:
+If you use plain keys, just add path to _-d_ option:
 
 [listing]
 --
-head -32c /dev/urandom > rootkey.key
-cryptsetup --batch-mode --key-file rootkey.key \
-           luksFormat /dev/sda47
+cryptsetup -d rootkey.key -v --cipher serpent-cbc-essiv:sha256 \
+ --key-size 256 luksFormat /dev/sda3
 --
-
-You can also use regular key files on an encrypted _keydev_.
-
-Compared to using GPG encrypted keyfiles on an unencrypted
-device this provides the following advantages:
-
-- you can unlock your disk(s) using multiple passphrases
-- better security by not loosing the key stretching mechanism
-
-To use an encrypted _keydev_ you *must* ensure that it becomes
-available by using the keyword `keysource`, e.g.
-`rd.luks.uuid=keysource:aaaa`
-_aaaa_ being the uuid of the encrypted _keydev_.
-
-Example:
-
-Lets assume you have three disks _A_, _B_ and _C_ with the uuids
-_aaaa_, _bbbb_ and _cccc_. +
-You want to unlock _A_ and _B_ using keyfile _keyfile_. +
-The unlocked volumes be _A'_, _B'_ and _C'_ with the uuids
-_AAAA_, _BBBB_ and _CCCC_. +
-_keyfile_ is saved on _C'_ as _/keyfile_.
-
-One luks keyslot of each _A_, _B_ and _C_ is setup with a
-passphrase. +
-Another luks keyslot of each _A_ and _B_ is setup with _keyfile_.
-
-To boot this configuration you could use:
-[listing]
---
-rd.luks.uuid=aaaa
-rd.luks.uuid=bbbb
-rd.luks.uuid=keysource:cccc
-rd.luks.key=/keyfile:UUID=CCCC
---
-Dracut asks for the passphrase for _C_ and uses the
-keyfile to unlock _A_ and _B_. +
-If getting the passphrase for _C_ fails it falls back to
-asking for the passphrases for _A_ and _B_.
-
-If you want _C'_ to stay unlocked, specify a luks name for
-it, e.g. `rd.luks.name=cccc=mykeys`, otherwise it gets closed
-when not needed anymore.
 ===============================
 
 MD RAID
@@ -484,14 +358,6 @@ DM RAID
    only activate the raid sets with the given UUID. This parameter can be
    specified multiple times.
 
-MULTIPATH
-~~~~~~~~~
-**rd.multipath=0**::
-   disable multipath detection
-
-**rd.multipath=default**::
-   use default multipath settings
-
 FIPS
 ~~~~
 **rd.fips**::
@@ -575,38 +441,27 @@ USB Android phone::
 * enp0s29u1u2
 =====================
 
-**ip=**__{dhcp|on|any|dhcp6|auto6|either6|link6|single-dhcp}__::
-    dhcp|on|any::: get ip from dhcp server from all interfaces. If netroot=dhcp,
+**ip=**__{dhcp|on|any|dhcp6|auto6}__::
+    dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp,
     loop sequentially through all interfaces (eth0, eth1, ...) and use the first
     with a valid DHCP root-path.
 
-    single-dhcp::: Send DHCP on all available interfaces in parallel, as
-    opposed to one after another. After the first DHCP response is received,
-    stop DHCP on all other interfaces. This gives the fastest boot time by
-    using the IP on interface for which DHCP succeeded first during early boot.
-    Caveat: Does not apply to Network Manager and to SUSE using wicked.
-
     auto6::: IPv6 autoconfiguration
 
     dhcp6::: IPv6 DHCP
 
-    either6::: if auto6 fails, then dhcp6
-
-    link6::: bring up interface for IPv6 link-local addressing
-
-**ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6|link6}__[:[__<mtu>__][:__<macaddr>__]]::
+**ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6}__[:[__<mtu>__][:__<macaddr>__]]::
     This parameter can be specified multiple times.
 +
 =====================
 dhcp|on|any|dhcp6::: get ip from dhcp server on a specific interface
 auto6::: do IPv6 autoconfiguration
-link6::: bring up interface for IPv6 link local address
 <macaddr>::: optionally **set** <macaddr> on the <interface>. This
 cannot be used in conjunction with the **ifname** argument for the
 same <interface>.
 =====================
 
-**ip=**__<client-IP>__:[__<peer>__]:__<gateway-IP>__:__<netmask>__:__<client_hostname>__:__<interface>__:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__[:[__<mtu>__][:__<macaddr>__]]::
+**ip=**__<client-IP>__:[__<peer>__]:__<gateway-IP>__:__<netmask>__:__<client_hostname>__:__<interface>__:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__:[:[__<mtu>__][:__<macaddr>__]]::
     explicit network configuration. If you want do define a IPv6 address, put it
     in brackets (e.g. [2001:DB8::1]). This parameter can be specified multiple
     times. __<peer>__ is optional and is the address of the remote endpoint
@@ -627,7 +482,7 @@ same <interface>.
     number, encoding the network prefix length.
 
 **ifname=**__<interface>__:__<MAC>__::
-    Assign network device name <interface> (i.e. "bootnet") to the NIC with
+    Assign network device name <interface> (ie "bootnet") to the NIC with
     MAC <MAC>.
 +
 WARNING: Do **not** use the default kernel naming scheme for the interface name,
@@ -660,9 +515,6 @@ interface name. Better name it "bootnet" or "bluesocket".
 **nameserver=**__<IP>__ [**nameserver=**__<IP>__ ...]::
     specify nameserver(s) to use
 
-**rd.peerdns=0**::
-    Disable DNS setting of DHCP parameters.
-
 **biosdevname=0**::
     boolean, turn off biosdevname network interface renaming
 
@@ -670,28 +522,23 @@ interface name. Better name it "bootnet" or "bluesocket".
     boolean, bring up network even without netroot set
 
 **vlan=**__<vlanname>__:__<phydevice>__::
-    Setup vlan device named <vlanname> on <phydevice>.
+    Setup vlan device named <vlanname> on <phydeivce>.
     We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005),
     VLAN_PLUS_VID_NO_PAD (vlan5), DEV_PLUS_VID (eth0.0005),
     DEV_PLUS_VID_NO_PAD (eth0.5)
 
-**bond=**__<bondname>__[:__<bondslaves>__:[:__<options>__[:<mtu>]]]::
+**bond=**__<bondname>__[:__<bondslaves>__:[:__<options>__]]::
     Setup bonding device <bondname> on top of <bondslaves>.
     <bondslaves> is a comma-separated list of physical (ethernet) interfaces.
     <options> is a comma-separated list on bonding options (modinfo bonding for
     details) in format compatible with initscripts. If <options> includes
     multi-valued arp_ip_target option, then its values should be separated by
-    semicolon. if the mtu is specified, it will be set on the bond master.
-    Bond without parameters assumes
+    semicolon. Bond without parameters assumes
     bond=bond0:eth0,eth1:mode=balance-rr
 
-**team=**__<teammaster>__:__<teamslaves>__[:__<teamrunner>__]::
+**team=**__<teammaster>__:__<teamslaves>__::
     Setup team device <teammaster> on top of <teamslaves>.
     <teamslaves> is a comma-separated list of physical (ethernet) interfaces.
-    <teamrunner> is the runner type to be used (see *teamd.conf*(5)); defaults to
-    activebackup.
-    Team without parameters assumes
-    team=team0:eth0,eth1:activebackup
 
 **bridge=**__<bridgename>__:__<ethnames>__::
     Setup bridge <bridgename> with <ethnames>. <ethnames> is a comma-separated
@@ -704,10 +551,10 @@ NFS
     mount nfs share from <server-ip>:/<root-dir>, if no server-ip is given, use
     dhcp next_server. If server-ip is an IPv6 address it has to be put in
     brackets, e.g. [2001:DB8::1]. NFS options can be appended with the prefix
-    ":" or "," and are separated by ",".
+    ":" or "," and are seperated by ",".
 
 **root=**nfs:\[_<server-ip>_:]__<root-dir>__[:__<nfs-options>__], **root=**nfs4:\[_<server-ip>_:]__<root-dir>__[:__<nfs-options>__], **root=**__{dhcp|dhcp6}__::
-    netroot=dhcp alone directs initrd to look at the DHCP root-path where NFS
+    root=dhcp alone directs initrd to look at the DHCP root-path where NFS
     options can be specified.
 +
 [listing]
@@ -723,32 +570,7 @@ NFS
     method. This is supported by dracut, but not recommended.
 
 **rd.nfs.domain=**__<NFSv4 domain name>__::
-    Set the NFSv4 domain name. Will override the settings in _/etc/idmap.conf_.
-
-**rd.net.dhcp.retry=**__<cnt>__::
-    If this option is set, dracut will try to connect via dhcp <cnt> times before failing.
-    Default is 1.
-
-**rd.net.timeout.dhcp=**__<arg>__::
-    If this option is set, dhclient is called with "-timeout <arg>".
-
-**rd.net.timeout.iflink=**__<seconds>__::
-    Wait <seconds> until link shows up. Default is 60 seconds.
-
-**rd.net.timeout.ifup=**__<seconds>__::
-    Wait <seconds> until link has state "UP". Default is 20 seconds.
-
-**rd.net.timeout.route=**__<seconds>__::
-    Wait <seconds> until route shows up. Default is 20 seconds.
-
-**rd.net.timeout.ipv6dad=**__<seconds>__::
-    Wait <seconds> until IPv6 DAD is finished. Default is 50 seconds.
-
-**rd.net.timeout.ipv6auto=**__<seconds>__::
-    Wait <seconds> until IPv6 automatic addresses are assigned. Default is 40 seconds.
-
-**rd.net.timeout.carrier=**__<seconds>__::
-    Wait <seconds> until carrier is recognized. Default is 10 seconds.
+    Set the NFSv4 domain name. Will overwrite the settings in _/etc/idmap.conf_.
 
 CIFS
 ~~~
@@ -837,9 +659,6 @@ You may want to use rd.iscsi.firmware.
 **root=**_???_ **netroot=**iscsi **rd.iscsi.firmware=1**::
  will read the iscsi parameter from the BIOS firmware
 
-**rd.iscsi.login_retry_max=**__<num>__::
-    maximum number of login retries
-
 **rd.iscsi.param=**__<param>__::
     <param> will be passed as "--param <param>" to iscsistart.
     This parameter can be specified multiple times.
@@ -860,63 +679,24 @@ iscsistart -b --param node.session.timeo.replacement_timeout=30
 **rd.iscsi.ibft** **rd.iscsi.ibft=1**:
     Turn on iBFT autoconfiguration for the interfaces
 
-**rd.iscsi.mp** **rd.iscsi.mp=1**:
-    Configure all iBFT interfaces, not only used for booting (multipath)
-
-**rd.iscsi.waitnet=0**:
-    Turn off waiting for all interfaces to be up before trying to login to the iSCSI targets.
-
-**rd.iscsi.testroute=0**:
-    Turn off checking, if the route to the iSCSI target IP is possible before trying to login.
-
 FCoE
 ~~~~
-**rd.fcoe=0**::
-    disable FCoE and lldpad
-
-**fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__:__{fabric|vn2vn}__::
+**fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__::
     Try to connect to a FCoE SAN through the NIC specified by _<interface>_ or
-    _<MAC>_ or EDD settings. The second argument specifies if DCB
-    should be used. The optional third argument specifies whether
-    fabric or VN2VN mode should be used.
-    This parameter can be specified multiple times.
+    _<MAC>_ or EDD settings. For the second argument, currently only nodcb is
+    supported. This parameter can be specified multiple times.
 +
 NOTE: letters in the MAC-address must be lowercase!
 
-NVMf
-~~~~
-**rd.nvmf.hostnqn=**__<hostNQN>__::
-    NVMe host NQN to use
-
-**rd.nvmf.hostid=**__<hostID>__::
-    NVMe host id to use
-
-**rd.nvmf.discover=**__{rdma|fc|tcp}__,__<traddr>__,[__<host_traddr>__],[__<trsvcid>__]::
-    Discover and connect to a NVMe-over-Fabric controller specified by
-    _<traddr>_ and the optionally _<host_traddr>_ or _<trsvcid>_.
-    The first argument specifies the transport to use; currently only
-    'rdma', 'fc', or 'tcp' are supported.
-    The _<traddr>_ parameter can be set to 'auto' to select
-    autodiscovery; in that case all other parameters are ignored.
-    This parameter can be specified multiple times.
-
 NBD
 ~~~
-**root=**??? **netroot=**nbd:__<server>__:__<port/exportname>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]::
-    mount nbd share from <server>.
-+
-NOTE:
-    If "exportname" instead of "port" is given the standard port is used.
-    Newer versions of nbd are only supported with "exportname".
+**root=**??? **netroot=**nbd:__<server>__:__<port>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]::
+    mount nbd share from <server>
 
-**root=/dev/root netroot=dhcp** with **dhcp** **root-path=**nbd:__<server>__:__<port/exportname>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]::
-    netroot=dhcp alone directs initrd to look at the DHCP root-path where NBD
+**root=dhcp** with **dhcp** **root-path=**nbd:__<server>__:__<port>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]::
+    root=dhcp alone directs initrd to look at the DHCP root-path where NBD
     options can be specified. This syntax is only usable in cases where you are
     directly mounting the volume as the rootfs.
-+
-NOTE:
-    If "exportname" instead of "port" is given the standard port is used.
-    Newer versions of nbd are only supported with "exportname".
 
 DASD
 ~~~~
@@ -926,19 +706,12 @@ DASD
 ZFCP
 ~~~~
 **rd.zfcp=**__<zfcp adaptor device bus ID>__,__<WWPN>__,__<FCPLUN>__::
-    rd.zfcp can be specified multiple times on the kernel command
-    line.
-
-**rd.zfcp=**__<zfcp adaptor device bus ID>__::
-    If NPIV is enabled and the 'allow_lun_scan' parameter to the zfcp
-    module is set to 'Y' then the zfcp adaptor will be initiating a
-    scan internally and the <WWPN> and <FCPLUN> parameters can be omitted.
+    rd.zfcp can be specified multiple times on the kernel command line.
 +
 [listing]
 .Example
 --
 rd.zfcp=0.0.4000,0x5005076300C213e9,0x5022000000000000
-rd.zfcp=0.0.4000
 --
 
 **rd.zfcp.conf=0**::
@@ -947,15 +720,7 @@ rd.zfcp=0.0.4000
 ZNET
 ~~~~
 **rd.znet=**__<nettype>__,__<subchannels>__,__<options>__::
-    The whole parameter is appended to /etc/ccw.conf, which is used on
-    RHEL/Fedora with ccw_init, which is called from udev for certain
-    devices on z-series.
     rd.znet can be specified multiple times on the kernel command line.
-
-**rd.znet_ifname=**__<ifname>__:__<subchannels>__::
-    Assign network device name <interface> (i.e. "bootnet") to the NIC
-    corresponds to the subchannels. This is useful when dracut's default
-    "ifname=" doesn't work due to device having a changing MAC address.
 +
 [listing]
 .Example
@@ -964,253 +729,10 @@ rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo
 rd.znet=ctc,0.0.0600,0.0.0601,protocol=bar
 --
 
-Booting live images
-~~~~~~~~~~~~~~~~~~~
-Dracut offers multiple options for live booted images:
-
-=====================
-SquashFS with read-only filesystem image::: The system will boot with a
-read-only filesystem from the SquashFS and apply a writable Device-mapper
-snapshot or an OverlayFS overlay mount for the read-only base filesystem.  This
-method ensures a relatively fast boot and lower RAM usage. Users **must be
-careful** to avoid writing too many blocks to a snapshot volume.  Once the
-blocks of the snapshot overlay are exhausted, the root filesystem becomes
-read-only and may cause application failures.  The snapshot overlay file is
-marked 'Overflow', and a difficult recovery is required to repair and enlarge
-the overlay offline.  Non-persistent overlays are sparse files in RAM that only
-consume content space as required blocks are allocated.  They default to an
-apparent size of 32 GiB in RAM.  The size can be adjusted with the
-**rd.live.overlay.size=** kernel command line option.
-+
-The filesystem structure is traditionally expected to be:
-+
-[listing]
---
-squashfs.img          |  SquashFS from LiveCD .iso
-   !(mount)
-   /LiveOS
-       |- rootfs.img  |  Filesystem image to mount read-only
-            !(mount)
-            /bin      |  Live filesystem
-            /boot     |
-            /dev      |
-            ...       |
---
-+
-For OverlayFS mount overlays, the filesystem structure may also be a direct
-compression of the root filesystem:
-+
-[listing]
---
-squashfs.img          |  SquashFS from LiveCD .iso
-   !(mount)
-   /bin               |  Live filesystem
-   /boot              |
-   /dev               |
-   ...                |
---
-+
-Dracut uses one of the overlay methods of live booting by default.  No
-additional command line options are required other than **root=live:<URL>** to
-specify the location of your squashed filesystem.
-+
-- The compressed SquashFS image can be copied during boot to RAM at
-`/run/initramfs/squashed.img` by using the **rd.live.ram=1** option.
-- A device with a persistent overlay can be booted read-only by using the
-**rd.live.overlay.readonly** option on the kernel command line.  This will
-either cause a temporary, writable overlay to be stacked over a read-only
-snapshot of the root filesystem or the OverlayFS mount will use an additional
-lower layer with the root filesystem.
-+
-Uncompressed live filesystem image:::
-When the live system was installed with the '--skipcompress' option of the
-__livecd-iso-to-disk__ installation script for Live USB devices, the root
-filesystem image, __rootfs.img__, is expanded on installation and no SquashFS
-is involved during boot.
-+
-- If **rd.live.ram=1** is used in this situation, the full, uncompressed
-root filesystem is copied during boot to `/run/initramfs/rootfs.img` in the
-`/run` tmpfs.
-+
-- If **rd.live.overlay=none** is provided as a kernel command line option,
-a writable, linear Device-mapper target is created on boot with no overlay.
-
-Writable filesystem image:::
-The system will retrieve a compressed filesystem image, extract it to
-`/run/initramfs/fsimg/rootfs.img`, connect it to a loop device, create a
-writable, linear Device-mapper target at `/dev/mapper/live-rw`, and mount that
-as a writable volume at `/`.  More RAM is required during boot but the live
-filesystem is easier to manage if it becomes full.  Users can make a filesystem
-image of any size and that size will be maintained when the system boots. There
-is no persistence of root filesystem changes between boots with this option.
-+
-The filesystem structure is expected to be:
-+
-[listing]
---
-rootfs.tgz            |  Compressed tarball containing filesystem image
-   !(unpack)
-   /rootfs.img        |  Filesystem image at /run/initramfs/fsimg/
-      !(mount)
-      /bin            |  Live filesystem
-      /boot           |
-      /dev            |
-      ...             |
---
-+
-To use this boot option, ensure that **rd.writable.fsimg=1** is in your kernel
-command line and add the **root=live:<URL>** to specify the location
-of your compressed filesystem image tarball or SquashFS image.
-=====================
-
-**rd.writable.fsimg=**1::
-Enables writable filesystem support.  The system will boot with a fully
-writable (but non-persistent) filesystem without snapshots __(see notes above
-about available live boot options)__.  You can use the **rootflags** option to
-set mount options for the live filesystem as well __(see documentation about
-rootflags in the **Standard** section above)__.
-This implies that the whole image is copied to RAM before the boot continues.
-+
-NOTE: There must be enough free RAM available to hold the complete image.
-+
-This method is very suitable for diskless boots.
-
-**root=**live:__<url>__::
-Boots a live image retrieved from __<url>__.  Requires the dracut 'livenet'
-module.  Valid handlers: __http, https, ftp, torrent, tftp__.
-+
-[listing]
-.Examples
---
-root=live:http://example.com/liveboot.img
-root=live:ftp://ftp.example.com/liveboot.img
-root=live:torrent://example.com/liveboot.img.torrent
---
-
-**rd.live.debug=**1::
-Enables debug output from the live boot process.
-
-**rd.live.dir=**__<path>__::
-Specifies the directory within the boot device where the squashfs.img or
-rootfs.img can be found.  By default, this is `/LiveOS`.
-
-**rd.live.squashimg=**__<filename of SquashFS image>__::
-Specifies the filename for a SquashFS image of the root filesystem.
-By default, this is __squashfs.img__.
-
-**rd.live.ram=**1::
-Copy the complete image to RAM and use this for booting. This is useful
-when the image resides on, e.g., a DVD which needs to be ejected later on.
-
-**rd.live.overlay={**__<devspec>__[:__{<pathspec>|auto}__]|__none__}::
-Manage the usage of a permanent overlay.
-+
---
-* _<devspec>_ specifies the path to a device with a mountable filesystem.
-* _<pathspec>_ is the path to a file within that filesystem, which shall be
-used to persist the changes made to the device specified by the
-**root=live:__<url>__** option.
-+
-The default _pathspec_, when _auto_ or no _:<pathspec>_ is given, is
-`/<rd.live.dir>/overlay-<label>-<uuid>`, where _<label>_ is the
-device LABEL, and _<uuid>_ is the device UUID.
-* _none_ (the word itself) specifies that no overlay will be used, such as when
-an uncompressed, writable live root filesystem is available.
-+
-If a persistent overlay __is detected__ at the standard LiveOS path, the
-overlay & overlay type detected, whether Device-mapper or OverlayFS, will be
-used.
---
-+
-[listing]
-.Examples
---
-rd.live.overlay=/dev/sdb1:persistent-overlay.img
-rd.live.overlay=UUID=99440c1f-8daa-41bf-b965-b7240a8996f4
---
-
-**rd.live.overlay.size=**__<size_MiB>__::
-Specifies a non-persistent Device-mapper overlay size in MiB.  The default is
-_32768_.
-
-**rd.live.overlay.readonly=**1::
-This is used to boot with a normally read-write persistent overlay in a
-read-only mode.  With this option, either an additional, non-persistent,
-writable snapshot overlay will be stacked over a read-only snapshot,
-`/dev/mapper/live‑ro`, of the base filesystem with the persistent overlay, or a
-read-only loop device, in the case of a writable __rootfs.img__, or an OverlayFS
-mount will use the persistent overlay directory linked at `/run/overlayfs‑r` as
-an additional lower layer along with the base root filesystem and apply a
-transient, writable upper directory overlay, in order to complete the booted
-root filesystem.
-
-**rd.live.overlay.reset=**1::
-Specifies that a persistent overlay should be reset on boot.  All previous root
-filesystem changes are vacated by this action.
-
-**rd.live.overlay.thin=**1::
-Enables the usage of thin snapshots instead of classic dm snapshots.
-The advantage of thin snapshots is that they support discards, and will free
-blocks that are not claimed by the filesystem. In this use case, this means
-that memory is given back to the kernel when the filesystem does not claim it
-anymore.
-
-**rd.live.overlay.overlayfs=**1::
-Enables the use of the *OverlayFS* kernel module, if available, to provide a
-copy-on-write union directory for the root filesystem.  OverlayFS overlays are
-directories of the files that have changed on the read-only base (lower)
-filesystem.  The root filesystem is provided through a special overlay type
-mount that merges the lower and upper directories.  If an OverlayFS upper
-directory is not present on the boot device, a tmpfs directory will be created
-at `/run/overlayfs` to provide temporary storage.  Persistent storage can be
-provided on vfat or msdos formatted devices by supplying the OverlayFS upper
-directory within an embedded filesystem that supports the creation of trusted.*
-extended attributes and provides a valid d_type in readdir responses, such as
-with ext4 and xfs.  On non-vfat-formatted devices, a persistent OverlayFS
-overlay can extend the available root filesystem storage up to the capacity of
-the LiveOS disk device.
-+
-If a persistent overlay is detected at the standard LiveOS path, the overlay &
-overlay type detected, whether OverlayFS or Device-mapper, will be used.
-+
-The **rd.live.overlay.readonly** option, which allows a persistent overlayfs to
-be mounted read-only through a higher level transient overlay directory, has
-been implemented through the multiple lower layers feature of OverlayFS.
-
-
-ZIPL
-~~~~
-**rd.zipl=**__<path to blockdevice>__::
-    Update the dracut commandline with the values found in the
-    _dracut-cmdline.conf_ file on the given device.
-    The values are merged into the existing commandline values
-    and the udev events are regenerated.
-+
-[listing]
-.Example
---
-rd.zipl=UUID=0fb28157-99e3-4395-adef-da3f7d44835a
---
-
-CIO_IGNORE
-~~~~~~~~~~
-**rd.cio_accept=**__<device-ids>__::
-    Remove the devices listed in <device-ids> from the default
-    cio_ignore kernel command-line settings.
-    <device-ids> is a list of comma-separated CCW device ids.
-    The default for this value is taken from the
-    _/boot/zipl/active_devices.txt_ file.
-+
-[listing]
-.Example
---
-rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802
---
-
 Plymouth Boot Splash
 ~~~~~~~~~~~~~~~~~~~~
 **plymouth.enable=0**::
-    disable the plymouth bootsplash completely.
+    disable the plymouth bootsplash completly.
 
 **rd.plymouth=0**::
     disable the plymouth bootsplash only for the initramfs.
@@ -1260,8 +782,7 @@ their new replacement.
 
 rdbreak:: rd.break
 
-rd.ccw:: rd.znet
-rd_CCW:: rd.znet
+rd_CCW:: rd.ccw
 
 rd_DASD_MOD:: rd.dasd
 
@@ -1329,8 +850,6 @@ rd_NO_MD:: rd.md=0
 
 rd_MD_UUID:: rd.md.uuid
 
-rd_NO_MULTIPATH: rd.multipath=0
-
 rd_NFS_DOMAIN:: rd.nfs.domain
 
 iscsi_initiator:: rd.iscsi.initiator

dracut.conf

@@ -1,3 +1,51 @@
-# PUT YOUR CONFIG IN separate files
-# in /etc/dracut.conf.d named "<name>.conf"
-# SEE man dracut.conf(5) for options
+# PUT YOUR CONFIG HERE OR IN separate files named *.conf
+# in /etc/dracut.conf.d
+# SEE man dracut.conf(5)
+
+# Sample dracut config file
+
+#logfile=/var/log/dracut.log
+#fileloglvl=6
+
+# Exact list of dracut modules to use.  Modules not listed here are not going
+# to be included.  If you only want to add some optional modules use
+# add_dracutmodules option instead.
+#dracutmodules+=""
+
+# dracut modules to omit
+#omit_dracutmodules+=""
+
+# dracut modules to add to the default
+#add_dracutmodules+=""
+
+# additional kernel modules to the default
+#add_drivers+=""
+
+# list of kernel filesystem modules to be included in the generic initramfs
+#filesystems+=""
+
+# build initrd only to boot current hardware
+#hostonly="yes"
+#
+
+# install local /etc/mdadm.conf
+#mdadmconf="no"
+
+# install local /etc/lvm/lvm.conf
+#lvmconf="no"
+
+# A list of fsck tools to install. If it's not specified, module's hardcoded
+# default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
+# xfs_repair e2fsck jfs_fsck reiserfsck btrfsck". The installation is
+# opportunistic, so non-existing tools are just ignored.
+#fscks=""
+
+# inhibit installation of any fsck tools
+#nofscks="yes"
+
+# mount / and /usr read-only by default
+#ro_mnt="no"
+
+# set the directory for temporary files
+# default: /var/tmp
+#tmpdir=/tmp

dracut.conf.5.asc

@@ -3,7 +3,6 @@ DRACUT.CONF(5)
 :doctype: manpage
 :man source:   dracut
 :man manual:   dracut
-:man version:  {version}
 
 NAME
 ----
@@ -11,40 +10,35 @@ dracut.conf - configuration file(s) for dracut
 
 SYNOPSIS
 --------
-_/etc/dracut.conf_
-_/etc/dracut.conf.d/\*.conf_
+_/etc/dracut.conf_ _/etc/dracut.conf.d/*.conf_
 _/usr/lib/dracut/dracut.conf.d/*.conf_
 
 Description
 -----------
 _dracut.conf_ is loaded during the initialisation phase of dracut. Command line
-parameter will override any values set here.
+parameter will overwrite any values set here.
 
 _*.conf_ files are read from /usr/lib/dracut/dracut.conf.d and
 /etc/dracut.conf.d. Files with the same name in /etc/dracut.conf.d will replace
 files in /usr/lib/dracut/dracut.conf.d.
-The files are then read in alphanumerical order and will override parameters
+The files are then read in alphanumerical order and will overwrite parameters
 set in _/etc/dracut.conf_. Each line specifies an attribute and a value. A '#'
 indicates the beginning of a comment; following characters, up to the end of the
 line are not interpreted.
 
-dracut command line options will override any values set here.
+dracut command line options will overwrite any values set here.
 
 Configuration files must have the extension .conf; other extensions are ignored.
 
-*add_dracutmodules+=*" __<dracut modules>__ "::
-    Add a space-separated list of dracut modules to call when building the
-    initramfs. Modules are located in _/usr/lib/dracut/modules.d_.
-
 *dracutmodules+=*" __<dracut 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 option forces dracut to only include the specified dracut modules.
-    In most cases the "add_dracutmodules" option is what you want to use.
 
 *omit_dracutmodules+=*" __<dracut modules>__ "::
-    Omit a space-separated list of dracut modules to call when building the
-    initramfs. Modules are located in _/usr/lib/dracut/modules.d_.
+    Omit a space-separated list of dracut modules.
+
+*add_dracutmodules+=*" __<dracut modules>__ "::
+    Add a space-separated list of dracut modules.
 
 *drivers+=*" __<kernel modules>__ "::
     Specify a space-separated list of kernel modules to exclusively include in
@@ -55,10 +49,6 @@ Configuration files must have the extension .conf; other extensions are ignored.
     Specify a space-separated list of kernel modules to add to the initramfs.
     The kernel modules have to be specified without the ".ko" suffix.
 
-*force_drivers+=*" __<list of kernel modules>__ "::
-    See add_drivers above. But in this case it is ensured that the drivers
-    are tried to be loaded early via modprobe.
-
 *omit_drivers+=*" __<kernel modules>__ "::
     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.
@@ -76,27 +66,18 @@ Configuration files must have the extension .conf; other extensions are ignored.
 *install_items+=*" __<file>__[ __<file>__ ...] "::
     Specify additional files to include in the initramfs, separated by spaces.
 
-*install_optional_items+=*" __<file>__[ __<file>__ ...] "::
-    Specify additional files to include in the initramfs, separated by spaces,
-    if they exist.
-
-*compress=*"__{cat|bzip2|lzma|xz|gzip|lzo|lz4|zstd|<compressor [args ...]>}__"::
-    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 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.
-    To disable compression, use "cat".
-
 *do_strip=*"__{yes|no}__"::
     Strip binaries in the initramfs (default=yes)
 
+*do_prelink=*"__{yes|no}__"::
+    Prelink binaries in the initramfs (default=yes)
+
 *hostonly=*"__{yes|no}__"::
     Host-Only mode: Install only what is needed for booting the local host
     instead of a generic host and generate host-specific configuration.
 
-*hostonly_cmdline=*"__{yes|no}__"::
-    If set to "yes", store the kernel command line arguments needed in the initramfs
+*hostonly_cmdline*"__{yes|no}__"::
+    If set, store the kernel command line arguments needed in the initramfs
 
 *persistent_policy=*"__<policy>__"::
     Use _<policy>_ to address disks and partitions.
@@ -159,14 +140,14 @@ provide a valid _/etc/fstab_.
     archive. This cpio archive gets glued (concatenated, uncompressed one
     must be the first one) to the compressed cpio archive. The first,
     uncompressed cpio archive is for data which the kernel must be able
-    to access very early (and cannot make use of uncompress algorithms yet)
+    to access very early (and cannot make use of uncompress alogrithms yet)
     like microcode or ACPI tables (default=no).
 
 *acpi_table_dir=*"__<dir>__"::
     Directory to search for ACPI tables if acpi_override= is set to yes.
 
 *early_microcode=*"{yes|no}"::
-    Combine early microcode with ramdisk (default=yes)
+    Combine early microcode with ramdisk (default=no)
 
 *stdloglvl*="__\{0-6\}__"::
     Set logging to standard error level.
@@ -183,39 +164,17 @@ provide a valid _/etc/fstab_.
 *show_modules=*"__{yes|no}__"::
     Print the name of the included modules to standard output during build.
 
-*i18n_vars=*"__<variable mapping>__"::
+*i18n_vars="__<variable mapping>__"::
     Distribution specific variable mapping.
     See dracut/modules.d/10i18n/README for a detailed description.
 
 *i18n_default_font=*"__<fontname>__"::
     The font <fontname> to install, if not specified otherwise.
-    Default is "eurlatgr".
+    Default is "LatArCyrHeb-16".
 
 *i18n_install_all=*"__{yes|no}__"::
     Install everything regardless of generic or hostonly mode.
 
-*reproducible=*"__{yes|no}__"::
-    Create reproducible images.
-
-*loginstall=*"__<DIR>__"::
-    Log all files installed from the host to _<DIR>_.
-
-*uefi_stub=*"_<FILE>_"::
-    Specifies the UEFI stub loader, which will load the attached kernel, initramfs and
-    kernel command line and boots the kernel. The default is
-    _/lib/systemd/boot/efi/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
-
-*uefi_splash_image=*"_<FILE>_"::
-    Specifies the UEFI stub loader's splash image. Requires bitmap (**.bmp**) image format.
-
-*uefi_secureboot_cert=*"_<FILE>_", *uefi_secureboot_key=*"_<FILE>_"::
-    Specifies a certificate and corresponding key, which are used to sign the created UEFI executable.
-    Requires both certificate and key need to be specified and _sbsign_ to be installed.
-
-*kernel_image=*"_<FILE>_"::
-    Specifies the kernel image, which to include in the UEFI executable. The default is
-    _/lib/modules/<KERNEL-VERSION>/vmlinuz_ or _/boot/vmlinuz-<KERNEL-VERSION>_
-
 Files
 -----
 _/etc/dracut.conf_::
@@ -223,7 +182,7 @@ _/etc/dracut.conf_::
     _/etc/dracut.conf.d/_.
 
 _/etc/dracut.conf.d/_::
-    Any _/etc/dracut.conf.d/*.conf_ file can override the values in
+    Any _/etc/dracut.conf.d/*.conf_ file can overwrite the values in
     _/etc/dracut.conf_. The configuration files are read in alphanumerical
     order.
 

dracut.conf.d/fedora.conf.example

@@ -2,45 +2,16 @@
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-i18n_default_font="eurlatgr"
+i18n_default_font="latarcyrheb-sun16"
 i18n_install_all="yes"
-
-
 stdloglvl=3
 sysloglvl=5
-install_optional_items+=" vi /etc/virc ps grep cat rm "
+install_items+=" vi /etc/virc ps grep cat rm "
 prefix="/"
-environment=/usr/lib/environment.d
-environmentconfdir=/etc/environment.d
-dbus=/usr/share/dbus-1
-dbusinterfaces=/usr/share/dbus-1/interfaces
-dbusservices=/usr/share/dbus-1/services
-dbussession=/usr/share/dbus-1/session.d
-dbussystem=/usr/share/dbus-1/system.d
-dbussystemservices=/usr/share/dbus-1/system-services
-dbusconfdir=/etc/dbus-1
-dbusinterfacesconfdir=/etc/dbus-1/interfaces
-dbusservicesconfdir=/etc/dbus-1/services
-dbussessionconfdir=/etc/dbus-1/session.d
-dbussystem=confdir/etc/dbus-1/system.d
-dbussystemservicesconfdir=/etc/dbus-1/system-services
-sysctld=/usr/lib/sysctl.d
-sysctlconfdir=/etc/sysctl.d
 systemdutildir=/usr/lib/systemd
-systemdutilconfdir=/etc/systemd
-systemdcatalog=/usr/lib/systemd/catalog
-systemdntpunits=/usr/lib/systemd/ntp-units.d
-systemdntpunitsconfdir=/etc/systemd/ntp-units.d
-systemdportable=/usr/lib/systemd/portable
-systemdportableconfdir=/etc/systemd/portable
 systemdsystemunitdir=/usr/lib/systemd/system
 systemdsystemconfdir=/etc/systemd/system
-systemduser=/usr/lib/systemd/user
-systemduserconfdir=/etc/systemd/user
-sysusers=/usr/lib/sysusers.d
-sysusersconfdir=/etc/sysusers.d
 udevdir=/usr/lib/udev
 hostonly="yes"
 hostonly_cmdline="no"
 early_microcode="yes"
-reproducible="yes"

dracut.conf.d/gentoo.conf.example

@@ -12,4 +12,4 @@ ro_mnt=yes
 i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
 i18n_default_font="LatArCyrHeb-16"
 
-omit_drivers+=" i2o_scsi "
+omit_drivers+=" i2o_scsi"

dracut.conf.d/suse.conf.example

@@ -1,24 +1,3 @@
-# SUSE specific dracut settings
-#
-# SUSE by default always builds as small as possible initrd for performance
-# and resource reasons.
-# If you like to build a generic initrd which works on other platforms than
-# on the one dracut/mkinitrd got called comment out below setting(s).
-hostonly="yes"
-hostonly_cmdline="yes"
-
-compress="xz -0 --check=crc32 --memlimit-compress=50%"
-
 i18n_vars="/etc/sysconfig/language:RC_LANG-LANG,RC_LC_ALL-LC_ALL /etc/sysconfig/console:CONSOLE_UNICODEMAP-FONT_UNIMAP,CONSOLE_FONT-FONT,CONSOLE_SCREENMAP-FONT_MAP /etc/sysconfig/keyboard:KEYTABLE-KEYMAP"
-omit_drivers+=" i2o_scsi "
+omit_drivers+=" i2o_scsi"
 
-# Below adds additional tools to the initrd which are not urgently necessary to
-# bring up the system, but help to debug problems.
-# See /usr/lib/dracut/modules.d/95debug/module-setup.sh which additional tools
-# are installed and add more if you need them. This specifically helps if you
-# use:
-# rd.break=[cmdline|pre-udev|pre-trigger|initqueue|pre-mount|
-# mount|pre-pivot|cleanup]
-# boot parameter or if you are forced to enter the dracut emergency shell.
-
-# add_dracutmodules+=debug

dracut.logrotate

@@ -0,0 +1,6 @@
+/var/log/dracut.log {
+    missingok
+    notifempty
+    size 30k
+    create 0600 root root
+}

dracut.modules.7.asc

@@ -3,7 +3,6 @@ DRACUT.MODULES(7)
 :doctype: manpage
 :man source:   dracut
 :man manual:   dracut
-:man version:  {version}
 
 NAME
 ----
@@ -20,7 +19,7 @@ you can replace init with your own version of _99base_, this is not encouraged.
 Instead you should use, if possible, the hooks of dracut. All hooks, and the
 point of time in which they are executed, are described in <<stages>>.
 
-The main script, which creates the initramfs is dracut itself. It parses all
+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
@@ -93,23 +92,18 @@ udev state.
 
 ==== Initqueue settled
 
-This hook (initqueue/settled) gets executed every time udev has settled.
+This hooks (initqueue/settled) gets executed every time udev has settled.
 
 ==== Initqueue timeout
 
-This hook (initqueue/timeout) gets executed, when the main loop counter becomes
+This hooks (initqueue/timeout) gets executed, when the main loop counter becomes
 half of the rd.retry counter.
 
-==== Initqueue online
-
-This hook (initqueue/online) gets executed whenever a network interface comes online
-(that is, once it is up and configured by the configured network module).
-
 ==== Initqueue finished
 
 This hook (initqueue/finished) is called after udev has settled and
 if all scripts herein return 0 the main loop will be ended.
-Arbitrary scripts can be added here, to loop in the
+Abritary scripts can be added here, to loop in the
 initqueue until something happens, which a dracut module wants to wait for.
 
 === Hook: pre-mount
@@ -151,8 +145,8 @@ FIXME
 
 == Writing a Module
 
-A simple example module is _90kernel-modules_, which modprobes a kernel module
-after udev has settled and the basic device drivers have been loaded.
+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.
 
@@ -164,7 +158,7 @@ check():
 return 0
 ----
 
-Then we create the install() function, which installs a cmdline hook with
+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_.
 
@@ -174,7 +168,7 @@ inst_hook cmdline 20 "$moddir/parse-insmodpost.sh"
 inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
 ----
 
-The _parse-instmodpost.sh_ parses the kernel command line for a argument
+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_.
 
@@ -218,7 +212,7 @@ check() should return with:
 
 0:: Include the dracut module in the initramfs.
 
-1:: Do not include the dracut module. The requirements are not fulfilled
+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
@@ -261,9 +255,7 @@ not lead to an error.
 ==== inst <src> [<dst>]
 
 installs _one_ file <src> either to the same place in the initramfs or to an
-optional <dst>. inst with more than two arguments is treated the same as
-inst_multiple, all arguments are treated as files to install and none as
-install destinations.
+optional <dst>.
 
 ==== inst_hook <hookdir> <prio> <src>
 
@@ -272,7 +264,7 @@ installs an executable/script <src> in the dracut hook <hookdir> with priority
 
 ==== inst_rules <udevrule> [ <udevrule> ...]
 
-installs one or more udev rules. Non-existant udev rules are reported, but do
+installs one ore more udev rules. Non-existant udev rules are reported, but do
 not let dracut fail.
 
 ==== instmods <kernelmodule> [ <kernelmodule> ... ]

dracut.spec

@@ -1,15 +1,16 @@
 %define dracutlibdir %{_prefix}/lib/dracut
-%bcond_without doc
 
-# We ship a .pc file but don't want to have a dep on pkg-config. We
-# strip the automatically generated dep here and instead co-own the
-# directory.
-%global __requires_exclude pkg-config
-%define dist_free_release xxx
+# Variables must be defined
+%define with_nbd                1
+
+# nbd in Fedora only
+%if 0%{?rhel} >= 6
+%define with_nbd 0
+%endif
 
 Name: dracut
 Version: xxx
-Release: %{dist_free_release}%{?dist}
+Release: xxx
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -21,45 +22,63 @@ Group: System/Base
 
 # The entire source code is GPLv2+
 # except install/* which is LGPLv2+
-# except util/* which is GPLv2
-License: GPLv2+ and LGPLv2+ and GPLv2
+License: GPLv2+ and LGPLv2+
 
 URL: https://dracut.wiki.kernel.org/
 
 # Source can be generated by
-# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%%{version};sf=tgz
-Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
-Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
+# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
+Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
 
-BuildRequires: bash
-BuildRequires: git-core
-BuildRequires: pkgconfig(libkmod) >= 23
-BuildRequires: gcc
+BuildRequires: bash git
 
 %if 0%{?fedora} || 0%{?rhel}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
-BuildRequires: systemd
 %endif
 %if 0%{?fedora}
 BuildRequires: bash-completion
+BuildRequires: pkgconfig
+%endif
+
+%if 0%{?suse_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 %endif
 
-%if %{with doc}
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: docbook-style-xsl docbook-dtds libxslt
 %endif
 
 %if 0%{?suse_version}
-BuildRequires: docbook-xsl-stylesheets libxslt
+-BuildRequires: docbook-xsl-stylesheets libxslt
 %endif
 
 BuildRequires: asciidoc
+
+%if 0%{?fedora} > 12 || 0%{?rhel}
+# no "provides", because dracut does not offer
+# all functionality of the obsoleted packages
+Obsoletes: mkinitrd <= 6.0.93
+Obsoletes: mkinitrd-devel <= 6.0.93
+Obsoletes: nash <= 6.0.93
+Obsoletes: libbdevid-python <= 6.0.93
 %endif
 
-Obsoletes: dracut-fips <= 047
-Provides:  dracut-fips = %{version}-%{release}
-Obsoletes: dracut-fips-aesni <= 047
-Provides:  dracut-fips-aesni = %{version}-%{release}
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+BuildRequires: systemd-units
+%endif
+
+%if 0%{?suse_version} > 9999
+Obsoletes: mkinitrd < 2.6.1
+Provides: mkinitrd = 2.6.1
+%endif
+
+Obsoletes: dracut-kernel < 005
+Provides:  dracut-kernel = %{version}-%{release}
+
+Obsoletes: dracut <= 029
+Obsoletes: dracut-norescue
+Provides:  dracut-norescue
 
 Requires: bash >= 4
 Requires: coreutils
@@ -67,55 +86,42 @@ Requires: cpio
 Requires: filesystem >= 2.1.0
 Requires: findutils
 Requires: grep
+Requires: hardlink
+Requires: gzip xz
 Requires: kmod
 Requires: sed
-Requires: xz
-Requires: gzip
-
-%if 0%{?fedora} || 0%{?rhel}
-Recommends: memstrack
-Recommends: hardlink
-Recommends: pigz
-Recommends: kpartx
-Requires: util-linux >= 2.21
-Requires: systemd >= 219
-Requires: systemd-udev >= 219
-Requires: procps-ng
-%else
-Requires: hardlink
-Requires: gzip
 Requires: kpartx
+
+%if 0%{?fedora} || 0%{?rhel} > 6
+Requires: util-linux >= 2.21
+Requires: systemd >= 199
+Requires: procps-ng
+Conflicts: grubby < 8.23
+%else
 Requires: udev > 166
 Requires: util-linux-ng >= 2.21
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-Requires: libkcapi-hmaccalc
+%if 0%{?fedora} || 0%{?rhel} > 6
+Conflicts: initscripts < 8.63-1
+Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
 %endif
 
+Conflicts: mdadm < 3.2.6-14
+
 %description
-dracut contains tools to create bootable initramfses for the Linux
-kernel. Unlike other implementations, dracut hard-codes as little
-as possible into the initramfs. dracut contains various modules which
-are driven by the event-based udev. Having root on MD, DM, LVM2, LUKS
-is supported as well as NFS, iSCSI, NBD, FCoE with the dracut-network
-package.
+dracut contains tools to create a bootable initramfs for 2.6 Linux kernels.
+Unlike existing implementations, dracut does hard-code as little as possible
+into the initramfs. dracut contains various modules which are driven by the
+event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as
+NFS, iSCSI, NBD, FCoE with the dracut-network package.
 
 %package network
 Summary: dracut modules to build a dracut initramfs with network support
-%if 0%{?_module_build}
-# In the module-build-service, we have pieces of dracut provided by different
-# modules ("base-runtime" provides most functionality, but we need
-# dracut-network in "installer". Since these two modules build with separate
-# dist-tags, we need to reduce this strict requirement to ignore the dist-tag.
-Requires: %{name} >= %{version}-%{dist_free_release}
-%else
 Requires: %{name} = %{version}-%{release}
-%endif
 Requires: iputils
 Requires: iproute
-Requires: (NetworkManager >= 1.20 or dhclient)
-Suggests: NetworkManager
+Requires: dhclient
 Obsoletes: dracut-generic < 008
 Provides:  dracut-generic = %{version}-%{release}
 
@@ -123,6 +129,32 @@ Provides:  dracut-generic = %{version}-%{release}
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.
 
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%package fips
+Summary: dracut modules to build a dracut initramfs with an integrity check
+Requires: %{name} = %{version}-%{release}
+Requires: hmaccalc
+%if 0%{?rhel} > 5
+# For Alpha 3, we want nss instead of nss-softokn
+Requires: nss
+%else
+Requires: nss-softokn
+%endif
+Requires: nss-softokn-freebl
+
+%description fips
+This package requires everything which is needed to build an
+initramfs with dracut, which does an integrity check.
+%endif
+
+%package fips-aesni
+Summary: dracut modules to build a dracut initramfs with an integrity check with aesni-intel
+Requires: %{name}-fips = %{version}-%{release}
+
+%description fips-aesni
+This package requires everything which is needed to build an
+initramfs with dracut, which does an integrity check and adds the aesni-intel kernel module.
+
 %package caps
 Summary: dracut modules to build a dracut initramfs which drops capabilities
 Requires: %{name} = %{version}-%{release}
@@ -132,29 +164,11 @@ Requires: libcap
 This package requires everything which is needed to build an
 initramfs with dracut, which drops capabilities.
 
-%package live
-Summary: dracut modules to build a dracut initramfs with live image capabilities
-%if 0%{?_module_build}
-# See the network subpackage comment.
-Requires: %{name} >= %{version}-%{dist_free_release}
-%else
-Requires: %{name} = %{version}-%{release}
-%endif
-Requires: %{name}-network = %{version}-%{release}
-Requires: tar gzip coreutils bash device-mapper curl
-%if 0%{?fedora}
-Requires: fuse ntfs-3g
-%endif
-
-%description live
-This package requires everything which is needed to build an
-initramfs with dracut, with live image capabilities, like Live CDs.
-
 %package config-generic
 Summary: dracut configuration to turn off hostonly image generation
 Requires: %{name} = %{version}-%{release}
-Obsoletes: dracut-nohostonly < 030
-Provides:  dracut-nohostonly = %{version}-%{release}
+Obsoletes: dracut-nohostonly
+Provides:  dracut-nohostonly
 
 %description config-generic
 This package provides the configuration to turn off the host specific initramfs
@@ -163,7 +177,7 @@ generation with dracut and generates a generic image by default.
 %package config-rescue
 Summary: dracut configuration to turn on rescue image generation
 Requires: %{name} = %{version}-%{release}
-Obsoletes: dracut < 030
+Obsoletes: dracut <= 029
 
 %description config-rescue
 This package provides the configuration to turn on the rescue initramfs
@@ -176,47 +190,48 @@ Requires: %{name} = %{version}-%{release}
 %description tools
 This package contains tools to assemble the local initrd and host configuration.
 
-%package squash
-Summary: dracut module to build an initramfs with most files in a squashfs image
-Requires: %{name} = %{version}-%{release}
-Requires: squashfs-tools
-
-%description squash
-This package provides a dracut module to build an initramfs, but store most files
-in a squashfs image, result in a smaller initramfs size and reduce runtime memory
-usage.
-
 %prep
-%autosetup -n %{name}-%{version} -S git_am
-cp %{SOURCE1} .
+%setup -q -n %{name}-%{version}
+
+%if %{defined PATCH1}
+git init
+git config user.email "dracut-maint@redhat.com"
+git config user.name "Fedora dracut team"
+git add .
+git commit -a -q -m "%{version} baseline."
+
+# Apply all the patches.
+git am -p1 %{patches}
+%endif
 
 %build
-%configure  --systemdsystemunitdir=%{_unitdir} \
-            --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) \
-            --libdir=%{_prefix}/lib \
-%if %{without doc}
-            --disable-documentation \
-%endif
-            ${NULL}
+%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib
 
-%make_build
+make %{?_smp_mflags}
 
 %install
-%make_install %{?_smp_mflags} \
+%if 0%{?fedora} || 0%{?rhel}
+rm -rf -- $RPM_BUILD_ROOT
+%endif
+make %{?_smp_mflags} install \
+     DESTDIR=$RPM_BUILD_ROOT \
      libdir=%{_prefix}/lib
 
 echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
 
 %if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
+%endif
+
+%if %{defined _unitdir}
+# for systemd, better use systemd-bootchart
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
 %endif
 
 # we do not support dash in the initramfs
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 
-# we do not support mksh in the initramfs
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00mksh
-
 # remove gentoo specific modules
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
 
@@ -227,68 +242,66 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
 %endif
 
-%ifnarch s390 s390x
-# remove architecture specific modules
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/80cms
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/81cio_ignore
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/91zipl
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_mod
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_rules
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dcssblk
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95qeth_rules
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp_rules
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95znet
-%else
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00warpclock
-%endif
-
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
 touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
 
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
 install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
-%endif
-%if 0%{?suse_version}
-install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
-%else
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse*
+install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf
 %endif
 
-%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999
-rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
-rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
+%if 0%{?suse_version}
+install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
 %endif
 
+%if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} > 6
+# FIXME: remove after F19
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
+install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+
 echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
 echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+> $RPM_BUILD_ROOT/etc/system-fips
+%endif
+
+# create compat symlink
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sr $RPM_BUILD_ROOT%{_bindir}/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut
+
+%clean
+rm -rf -- $RPM_BUILD_ROOT
 
 %files
-%if %{with doc}
-%doc README.md docs/HACKING.md AUTHORS NEWS.md dracut.html docs/dracut.png docs/dracut.svg
-%endif
-%{!?_licensedir:%global license %%doc}
-%license COPYING lgpl-2.1.txt
+%defattr(-,root,root,0755)
+%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
 %{_bindir}/dracut
+# compat symlink
+%{_sbindir}/dracut
 %{_datadir}/bash-completion/completions/dracut
 %{_datadir}/bash-completion/completions/lsinitrd
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999
+%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
+%{_bindir}/mkinitrd
 %{_bindir}/lsinitrd
 %endif
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
 %{dracutlibdir}/dracut-functions.sh
-%{dracutlibdir}/dracut-init.sh
 %{dracutlibdir}/dracut-functions
 %{dracutlibdir}/dracut-version.sh
 %{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
 %{dracutlibdir}/dracut-install
-%{dracutlibdir}/dracut-util
 %{dracutlibdir}/skipcpio
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
@@ -296,13 +309,10 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %endif
 %dir %{_sysconfdir}/dracut.conf.d
 %dir %{dracutlibdir}/dracut.conf.d
-%dir %{_datadir}/pkgconfig
-%{_datadir}/pkgconfig/dracut.pc
-
-%if %{with doc}
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/*service.8*
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999
+%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
+%{_mandir}/man8/mkinitrd.8*
 %{_mandir}/man1/lsinitrd.1*
 %endif
 %{_mandir}/man7/dracut.kernel.7*
@@ -310,111 +320,66 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{_mandir}/man7/dracut.modules.7*
 %{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man5/dracut.conf.5*
-%endif
-
-%if %{undefined _unitdir}
+%if %{defined _unitdir}
+%{dracutlibdir}/modules.d/00systemd-bootchart
+%else
+%{dracutlibdir}/modules.d/00bootchart
 %endif
 %{dracutlibdir}/modules.d/00bash
-%{dracutlibdir}/modules.d/00systemd
-%{dracutlibdir}/modules.d/00systemd-network-management
-%ifnarch s390 s390x
-%{dracutlibdir}/modules.d/00warpclock
-%endif
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-%{dracutlibdir}/modules.d/01fips
-%endif
-%{dracutlibdir}/modules.d/01systemd-ac-power
-%{dracutlibdir}/modules.d/01systemd-ask-password
-%{dracutlibdir}/modules.d/01systemd-coredump
-%{dracutlibdir}/modules.d/01systemd-hostnamed
-%{dracutlibdir}/modules.d/01systemd-initrd
-%{dracutlibdir}/modules.d/01systemd-journald
-%{dracutlibdir}/modules.d/01systemd-ldconfig
-%{dracutlibdir}/modules.d/01systemd-modules-load
-%{dracutlibdir}/modules.d/01systemd-repart
-%{dracutlibdir}/modules.d/01systemd-resolved
-%{dracutlibdir}/modules.d/01systemd-rfkill
-%{dracutlibdir}/modules.d/01systemd-sysext
-%{dracutlibdir}/modules.d/01systemd-sysctl
-%{dracutlibdir}/modules.d/01systemd-sysusers
-%{dracutlibdir}/modules.d/01systemd-timedated
-%{dracutlibdir}/modules.d/01systemd-timesyncd
-%{dracutlibdir}/modules.d/01systemd-tmpfiles
-%{dracutlibdir}/modules.d/01systemd-udevd
-%{dracutlibdir}/modules.d/01systemd-veritysetup
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
-%{dracutlibdir}/modules.d/04watchdog-modules
 %{dracutlibdir}/modules.d/05busybox
-%{dracutlibdir}/modules.d/06dbus-broker
-%{dracutlibdir}/modules.d/06dbus-daemon
-%{dracutlibdir}/modules.d/06rngd
-%{dracutlibdir}/modules.d/09dbus
 %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/50drm
 %{dracutlibdir}/modules.d/50plymouth
-%{dracutlibdir}/modules.d/62bluetooth
-%{dracutlibdir}/modules.d/80lvmmerge
+%{dracutlibdir}/modules.d/80cms
+%{dracutlibdir}/modules.d/90bcache
 %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90crypt
 %{dracutlibdir}/modules.d/90dm
 %{dracutlibdir}/modules.d/90dmraid
+%{dracutlibdir}/modules.d/90dmsquash-live
 %{dracutlibdir}/modules.d/90kernel-modules
-%{dracutlibdir}/modules.d/90kernel-modules-extra
 %{dracutlibdir}/modules.d/90lvm
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90multipath
-%{dracutlibdir}/modules.d/90nvdimm
-%{dracutlibdir}/modules.d/90ppcmac
 %{dracutlibdir}/modules.d/90qemu
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
-%{dracutlibdir}/modules.d/91tpm2-tss
 %{dracutlibdir}/modules.d/95debug
-%{dracutlibdir}/modules.d/95fstab-sys
-%{dracutlibdir}/modules.d/95lunmask
-%{dracutlibdir}/modules.d/95nvmf
 %{dracutlibdir}/modules.d/95resume
 %{dracutlibdir}/modules.d/95rootfs-block
+%{dracutlibdir}/modules.d/95dasd
+%{dracutlibdir}/modules.d/95dasd_mod
+%{dracutlibdir}/modules.d/95fstab-sys
+%{dracutlibdir}/modules.d/95zfcp
 %{dracutlibdir}/modules.d/95terminfo
 %{dracutlibdir}/modules.d/95udev-rules
 %{dracutlibdir}/modules.d/95virtfs
-%ifarch s390 s390x
-%{dracutlibdir}/modules.d/80cms
-%{dracutlibdir}/modules.d/81cio_ignore
-%{dracutlibdir}/modules.d/91zipl
-%{dracutlibdir}/modules.d/95dasd
-%{dracutlibdir}/modules.d/95dasd_mod
-%{dracutlibdir}/modules.d/95dasd_rules
-%{dracutlibdir}/modules.d/95dcssblk
-%{dracutlibdir}/modules.d/95qeth_rules
-%{dracutlibdir}/modules.d/95zfcp
-%{dracutlibdir}/modules.d/95zfcp_rules
-%endif
 %if %{undefined _unitdir}
 %{dracutlibdir}/modules.d/96securityfs
 %{dracutlibdir}/modules.d/97masterkey
 %{dracutlibdir}/modules.d/98integrity
 %endif
 %{dracutlibdir}/modules.d/97biosdevname
-%{dracutlibdir}/modules.d/98dracut-systemd
 %{dracutlibdir}/modules.d/98ecryptfs
 %{dracutlibdir}/modules.d/98pollcdrom
 %{dracutlibdir}/modules.d/98selinux
 %{dracutlibdir}/modules.d/98syslog
+%{dracutlibdir}/modules.d/98systemd
 %{dracutlibdir}/modules.d/98usrmount
 %{dracutlibdir}/modules.d/99base
-%{dracutlibdir}/modules.d/99memstrack
 %{dracutlibdir}/modules.d/99fs-lib
+%{dracutlibdir}/modules.d/99img-lib
 %{dracutlibdir}/modules.d/99shutdown
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 %dir %{_sharedstatedir}/initramfs
 %if %{defined _unitdir}
 %{_unitdir}/dracut-shutdown.service
-%{_unitdir}/sysinit.target.wants/dracut-shutdown.service
+%{_unitdir}/shutdown.target.wants/dracut-shutdown.service
 %{_unitdir}/dracut-cmdline.service
 %{_unitdir}/dracut-initqueue.service
 %{_unitdir}/dracut-mount.service
@@ -429,57 +394,63 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{_unitdir}/initrd.target.wants/dracut-pre-pivot.service
 %{_unitdir}/initrd.target.wants/dracut-pre-trigger.service
 %{_unitdir}/initrd.target.wants/dracut-pre-udev.service
+
 %endif
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_prefix}/lib/kernel/install.d/50-dracut.install
+%endif
 
 %files network
-%{dracutlibdir}/modules.d/01systemd-networkd
-%{dracutlibdir}/modules.d/35network-manager
-%{dracutlibdir}/modules.d/35network-legacy
-%{dracutlibdir}/modules.d/35network-wicked
+%defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/40network
-%{dracutlibdir}/modules.d/45ifcfg
-%{dracutlibdir}/modules.d/90kernel-network-modules
+%{dracutlibdir}/modules.d/95fcoe
+%{dracutlibdir}/modules.d/95iscsi
+%{dracutlibdir}/modules.d/90livenet
 %{dracutlibdir}/modules.d/90qemu-net
 %{dracutlibdir}/modules.d/95cifs
-%{dracutlibdir}/modules.d/95fcoe
-%{dracutlibdir}/modules.d/95fcoe-uefi
-%{dracutlibdir}/modules.d/95iscsi
 %{dracutlibdir}/modules.d/95nbd
 %{dracutlibdir}/modules.d/95nfs
 %{dracutlibdir}/modules.d/95ssh-client
-%ifarch s390 s390x
+%{dracutlibdir}/modules.d/45ifcfg
 %{dracutlibdir}/modules.d/95znet
-%endif
+%{dracutlibdir}/modules.d/95fcoe-uefi
 %{dracutlibdir}/modules.d/99uefi-lib
 
-%files caps
-%{dracutlibdir}/modules.d/02caps
-
-%files live
-%{dracutlibdir}/modules.d/99img-lib
-%{dracutlibdir}/modules.d/90dmsquash-live
-%{dracutlibdir}/modules.d/90dmsquash-live-ntfs
-%{dracutlibdir}/modules.d/90livenet
-
-%files tools
-%if %{with doc}
-%doc %{_mandir}/man8/dracut-catimages.8*
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+%files fips
+%defattr(-,root,root,0755)
+%{dracutlibdir}/modules.d/01fips
+%{dracutlibdir}/dracut.conf.d/40-fips.conf
+%config(missingok) /etc/system-fips
 %endif
 
+%files fips-aesni
+%defattr(-,root,root,0755)
+%doc COPYING
+%{dracutlibdir}/modules.d/02fips-aesni
+
+%files caps
+%defattr(-,root,root,0755)
+%{dracutlibdir}/modules.d/02caps
+
+%files tools
+%defattr(-,root,root,0755)
+%{_mandir}/man8/dracut-catimages.8*
 %{_bindir}/dracut-catimages
 %dir /boot/dracut
 %dir /var/lib/dracut
 %dir /var/lib/dracut/overlay
 
-%files squash
-%{dracutlibdir}/modules.d/99squash
-
 %files config-generic
+%defattr(-,root,root,0755)
 %{dracutlibdir}/dracut.conf.d/02-generic-image.conf
 
 %files config-rescue
+%defattr(-,root,root,0755)
 %{dracutlibdir}/dracut.conf.d/02-rescue.conf
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
+%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+%endif
 
 %changelog

dracut.usage.asc

@@ -62,7 +62,7 @@ _/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See *dracut.conf*(5).
 You can also add dracut modules on the command line
 by using the -a or --add option:
 ----
-# dracut --add module initramfs-module.img
+# dracut --add bootchart initramfs-bootchart.img
 ----
 
 To see a list of available dracut modules, use the --list-modules option:
@@ -83,7 +83,7 @@ on the command line:
 === 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 variable in  the _/etc/dracut.conf_
+on the command line or  the drivers vaiable in  the _/etc/dracut.conf_
 or _/etc/dracut.conf.d/myconf.conf_ configuration file (see *dracut.conf*(5)):
 ----
 # dracut --add-drivers mymod initramfs-with-mymod.img
@@ -94,11 +94,15 @@ An initramfs generated without the "hostonly" mode, does not contain any system
 configuration files (except for some special exceptions), so the configuration
 has to be done on the kernel command line. With this flexibility, you can easily
 boot from a changed root partition, without the need to recompile the initramfs
-image. So, you could completely change your root partition (move it inside a md
+image. So, you could completly change your root partition (move it inside a md
 raid with encryption and LVM on top), as long as you specify the correct
 filesystem LABEL or UUID on the kernel command line for your root device, dracut
 will find it and boot from it.
 
+The kernel command line usually can be configured in _/boot/grub/grub.conf_, if
+grub is your bootloader and it also can be edited in the real boot process in
+the grub menu.
+
 The kernel command line can also be provided by the dhcp server with the
 root-path option. See <<NetworkBoot>>.
 
@@ -151,9 +155,9 @@ If your root partition is on the network see <<NetworkBoot>>.
 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 line would contain:
+A typical german kernel command would contain:
 ----
-rd.vconsole.font=eurlatgr rd.vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8
+rd.vconsole.font=latarcyrheb-sun16 rd.vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8
 ----
 
 Setting these options can override the setting stored on your system, if you use
@@ -185,7 +189,7 @@ 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 possibility to turn it on on demand.
+process, but then you would lose the posibility to turn it on on demand.
 
 
 [[Injecting]]
@@ -242,8 +246,23 @@ specified multiple times.
 If your root partition is on a network drive, you have to have the network
 dracut modules installed to create a network aware initramfs image.
 
+On a Red Hat Enterprise Linux or Fedora system, this means, you have to install
+the _dracut-network_ rpm package:
+
+
+----
+# yum install dracut-network
+----
+
+The resulting initramfs image can be served by a boot manager residing on your
+local hard drive or it can be served by a PXE/TFTP server.
+
+How to setup your PXE/TFTP server can be found in the
+http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red
+Hat Enterprise Linux Storage Administration Guide].
+
 If you specify ip=dhcp on the kernel command line, then dracut asks a dhcp
-server about the ip address for the machine. The dhcp server can also serve an
+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
@@ -252,7 +271,7 @@ method described in <<Injecting>>.
 
 ==== Reducing the Image Size
 
-To reduce the size of the initramfs, you should create it with by omitting all
+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
@@ -262,7 +281,7 @@ For example for a NFS image, you would do:
 
 
 ----
-# dracut -m "nfs network base" initramfs-nfs-only.img
+# dracut -m "nfs network  base" initramfs-nfs-only.img
 ----
 
 Then you would boot from this image with your target machine and reduce the size
@@ -281,7 +300,7 @@ This will reduce the size of the initramfs image significantly.
 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:
-https://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html
+http://fedoraproject.org/wiki/How_to_debug_Dracut_problems
 
 
 [[identifying-your-problem-area]]
@@ -306,7 +325,7 @@ stick and mount that. Then you can store the output for later inspection.
 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. _/boot/grub2/grub.cfg_) or from _/proc/cmdline_.
+configuration file (e.g. _/etc/grub.conf_) or from _/proc/cmdline_.
 * A copy of your disk partition information from _/etc/fstab_, which might be
 obtained booting an old working initramfs or a rescue medium.
 * Turn on dracut debugging (see _the 'debugging dracut' section_), and attach
@@ -341,7 +360,7 @@ 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 _/boot/grub2/grub.cfg_ for editing. Below the line ''timeout=5'', add
+. Open the file _/etc/grub.conf_ for editing. Below the line ''timeout=5'', add
 the following:
 +
 ----
@@ -349,14 +368,14 @@ serial --unit=0 --speed=9600
 terminal --timeout=5 serial console
 ----
 +
-. Also in _/boot/grub2/grub.cfg_, add the following boot arguments to the ''kernel''
+. Also in _/etc/grub.conf_, add the following boot arguemnts to the ''kernel''
 line:
 +
 ----
 console=tty0 console=ttyS0,9600
 ----
 +
-. When finished, the _/boot/grub2/grub.cfg_ file should look similar to the example
+. When finished, the _/etc/grub.conf_ file should look similar to the example
 below.
 +
 ----
@@ -391,10 +410,10 @@ dracut offers a shell for interactive debugging in the event dracut fails to
 locate your root filesystem. To enable the shell:
 
 . Add the boot parameter ''rd.shell'' to your bootloader configuration file
-(e.g. _/boot/grub2/grub.cfg_)
+(e.g. _/etc/grub.conf_)
 . Remove the boot arguments ''rhgb'' and ''quiet''
 +
-A sample _/boot/grub2/grub.cfg_ bootloader configuration file is listed below.
+A sample _/etc/grub.conf_ bootloader configuration file is listed below.
 +
 ----
 default=0
@@ -509,7 +528,7 @@ on _pre-shutdown_ or _shutdown_.
 To do this from an already booted system:
 ----
 # mkdir -p /run/initramfs/etc/cmdline.d
-# echo "rd.debug rd.break=pre-shutdown rd.break=shutdown" > /run/initramfs/etc/cmdline.d/debug.conf
+# echo "rd.break=pre-shutdown" > /run/initramfs/etc/cmdline.d/debug.conf
 # touch /run/initramfs/.need_shutdown
 ----
 

git2spec.pl

@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+
+sub create_patches {
+    my $tag=shift;
+    my $pdir=shift;
+    my $num=0;
+    open( GIT, 'git format-patch -M -N --no-signature -o "'.$pdir.'" '.$tag.' |');
+    @lines=<GIT>;
+    close GIT;         # be done
+    return @lines;
+};
+
+use POSIX qw(strftime);
+my $datestr = strftime "%Y%m%d", gmtime;
+
+my $tag=shift;
+my $pdir=shift;
+$tag=`git describe --abbrev=0 --tags` if not defined $tag;
+chomp($tag);
+my @patches=&create_patches($tag, $pdir);
+my $num=$#patches + 2;
+$tag=~s/[^0-9]+?([0-9]+)/$1/;
+my $release="$num";
+
+while(<>) {
+    if (/^Version:/) {
+	print "Version: $tag\n";
+    }
+    elsif (/^Release:/) {
+	print "Release: $release%{?dist}\n";
+    }
+    elsif ((/^Source0:/) || (/^Source:/)) {
+	print $_;
+	$num=1;
+	for(@patches) {
+	    s/.*\///g;
+	    print "Patch$num: $_";
+	    $num++;
+	}
+	print "\n";
+    }
+    else {
+	print $_;
+    }
+}

install.d/50-dracut.install

@@ -1,65 +0,0 @@
-#!/bin/bash
-
-COMMAND="$1"
-KERNEL_VERSION="$2"
-BOOT_DIR_ABS="$3"
-KERNEL_IMAGE="$4"
-
-# If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
-# So, let's skip to create initrd.
-if ! [[ ${KERNEL_INSTALL_MACHINE_ID-x} ]]; then
-    exit 0
-fi
-
-if [[ -d "$BOOT_DIR_ABS" ]]; then
-    INITRD="initrd"
-else
-    BOOT_DIR_ABS="/boot"
-    INITRD="initramfs-${KERNEL_VERSION}.img"
-fi
-
-ret=0
-case "$COMMAND" in
-    add)
-        INITRD_IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/initrd
-        if [[ -f ${INITRD_IMAGE_PREGENERATED} ]]; then
-            # we found an initrd at the same place as the kernel
-            # use this and don't generate a new one
-            cp --reflink=auto "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$INITRD" \
-                && chown root:root "$BOOT_DIR_ABS/$INITRD" \
-                && chmod 0600 "$BOOT_DIR_ABS/$INITRD" \
-                && exit 0
-        fi
-
-        if [[ -f /etc/kernel/cmdline ]]; then
-            read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
-        elif [[ -f /usr/lib/kernel/cmdline ]]; then
-            read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
-        else
-            declare -a BOOT_OPTIONS
-
-            read -r -d '' -a line < /proc/cmdline
-            for i in "${line[@]}"; do
-                [[ "${i#initrd=*}" != "$i" ]] && continue
-                BOOT_OPTIONS+=("$i")
-            done
-        fi
-
-        unset noimageifnotneeded
-
-        for ((i=0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
-            # shellcheck disable=SC1001
-            if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
-                noimageifnotneeded="yes"
-                break
-            fi
-        done
-	dracut -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
-        ret=$?
-	;;
-    remove)
-        rm -f -- "$BOOT_DIR_ABS/$INITRD"
-        ret=$?
-	;;
-esac
-exit $ret

install.d/51-dracut-rescue.install

@@ -1,133 +0,0 @@
-#!/bin/bash
-
-export LANG=C
-
-COMMAND="$1"
-KERNEL_VERSION="$2"
-BOOT_DIR_ABS="${3%/*}/0-rescue"
-KERNEL_IMAGE="$4"
-
-
-dropindirs_sort()
-{
-    suffix=$1; shift
-    args=("$@")
-    files=$(
-        while (( $# > 0 )); do
-            for i in "${1}"/*"${suffix}"; do
-                [[ -f $i ]] && echo "${i##*/}"
-            done
-            shift
-        done | sort -Vu
-    )
-
-    for f in $files; do
-        for d in "${args[@]}"; do
-            if [[ -f "$d/$f" ]]; then
-                echo "$d/$f"
-                continue 2
-            fi
-        done
-    done
-}
-
-[[ -f /etc/os-release ]] && . /etc/os-release
-
-if [[ ${KERNEL_INSTALL_MACHINE_ID+x} ]]; then
-    MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
-elif [[ -f /etc/machine-id ]] ; then
-    read -r MACHINE_ID < /etc/machine-id
-fi
-
-if ! [[ $MACHINE_ID ]]; then
-    exit 0
-fi
-
-if [[ -f /etc/kernel/cmdline ]]; then
-    read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
-elif [[ -f /usr/lib/kernel/cmdline ]]; then
-    read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
-else
-    declare -a BOOT_OPTIONS
-
-    read -r -d '' -a line < /proc/cmdline
-    for i in "${line[@]}"; do
-        [[ "${i#initrd=*}" != "$i" ]] && continue
-        BOOT_OPTIONS+=("$i")
-    done
-fi
-
-if [[ -d "${BOOT_DIR_ABS%/*}" ]]; then
-    BOOT_DIR="/${MACHINE_ID}/0-rescue"
-    BOOT_ROOT=${BOOT_DIR_ABS%$BOOT_DIR}
-    LOADER_ENTRY="$BOOT_ROOT/loader/entries/${MACHINE_ID}-0-rescue.conf"
-    KERNEL="linux"
-    INITRD="initrd"
-else
-    BLS_DIR="/boot/loader/entries"
-    BOOT_DIR_ABS="/boot"
-    LOADER_ENTRY="$BLS_DIR/${MACHINE_ID}-0-rescue.conf"
-    KERNEL="vmlinuz-0-rescue-${MACHINE_ID}"
-    INITRD="initramfs-0-rescue-${MACHINE_ID}.img"
-fi
-
-ret=0
-
-case "$COMMAND" in
-    add)
-        [[ -f "$LOADER_ENTRY" ]] && [[ -f "$BOOT_DIR_ABS/$KERNEL" ]] \
-            && [[ -f "$BOOT_DIR_ABS/$INITRD" ]] && exit 0
-
-        # source our config dir
-        for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
-            if [[ -e $f ]]; then
-                # shellcheck disable=SC1090
-                . "$f"
-            fi
-        done
-
-        # shellcheck disable=SC2154
-        [[ $dracut_rescue_image != "yes" ]] && exit 0
-
-        [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
-
-        if ! cp --reflink=auto "$KERNEL_IMAGE" "$BOOT_DIR_ABS/$KERNEL"; then
-            echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/$KERNEL'!" >&2
-        fi
-
-        if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
-            dracut -f --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
-            ((ret+=$?))
-        fi
-
-        if [[ "${BOOT_DIR_ABS}" != "/boot" ]]; then
-            {
-                echo "title      $PRETTY_NAME - Rescue Image"
-                echo "version    $KERNEL_VERSION"
-                echo "machine-id $MACHINE_ID"
-                echo "options    ${BOOT_OPTIONS[*]} rd.auto=1"
-                echo "linux      $BOOT_DIR/linux"
-                echo "initrd     $BOOT_DIR/initrd"
-            } > "$LOADER_ENTRY"
-        else
-            if [[ -e "${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf" ]]; then
-                cp -aT "${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf" "$LOADER_ENTRY"
-            else
-                cp -aT "${KERNEL_IMAGE%/*}/bls.conf" "$LOADER_ENTRY"
-            fi
-            sed -i "s/${KERNEL_VERSION}/0-rescue-${MACHINE_ID}/" "$LOADER_ENTRY"
-        fi
-
-        ((ret+=$?))
-        ;;
-
-    remove)
-        exit 0
-        ;;
-
-    *)
-        usage
-        ret=1;;
-esac
-
-exit $ret

install/hashmap.c

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 /***
   This file is part of systemd.
 
@@ -41,49 +43,131 @@ struct Hashmap {
 
         struct hashmap_entry *iterate_list_head, *iterate_list_tail;
         unsigned n_entries;
+
+        bool from_pool;
 };
 
 #define BY_HASH(h) ((struct hashmap_entry**) ((uint8_t*) (h) + ALIGN(sizeof(Hashmap))))
 
-unsigned string_hash_func(const void *p)
-{
+struct pool {
+        struct pool *next;
+        unsigned n_tiles;
+        unsigned n_used;
+};
+
+static struct pool *first_hashmap_pool = NULL;
+static void *first_hashmap_tile = NULL;
+
+static struct pool *first_entry_pool = NULL;
+static void *first_entry_tile = NULL;
+
+static void* allocate_tile(struct pool **first_pool, void **first_tile, size_t tile_size) {
+        unsigned i;
+
+        if (*first_tile) {
+                void *r;
+
+                r = *first_tile;
+                *first_tile = * (void**) (*first_tile);
+                return r;
+        }
+
+        if (_unlikely_(!*first_pool) || _unlikely_((*first_pool)->n_used >= (*first_pool)->n_tiles)) {
+                unsigned n;
+                size_t size;
+                struct pool *p;
+
+                n = *first_pool ? (*first_pool)->n_tiles : 0;
+                n = MAX(512U, n * 2);
+                size = PAGE_ALIGN(ALIGN(sizeof(struct pool)) + n*tile_size);
+                n = (size - ALIGN(sizeof(struct pool))) / tile_size;
+
+                p = malloc(size);
+                if (!p)
+                        return NULL;
+
+                p->next = *first_pool;
+                p->n_tiles = n;
+                p->n_used = 0;
+
+                *first_pool = p;
+        }
+
+        i = (*first_pool)->n_used++;
+
+        return ((uint8_t*) (*first_pool)) + ALIGN(sizeof(struct pool)) + i*tile_size;
+}
+
+static void deallocate_tile(void **first_tile, void *p) {
+        * (void**) p = *first_tile;
+        *first_tile = p;
+}
+
+#ifndef __OPTIMIZE__
+
+static void drop_pool(struct pool *p) {
+        while (p) {
+                struct pool *n;
+                n = p->next;
+                free(p);
+                p = n;
+        }
+}
+
+__attribute__((destructor)) static void cleanup_pool(void) {
+        /* Be nice to valgrind */
+
+        drop_pool(first_hashmap_pool);
+        drop_pool(first_entry_pool);
+}
+
+#endif
+
+unsigned string_hash_func(const void *p) {
         unsigned hash = 5381;
         const signed char *c;
 
         /* DJB's hash function */
 
         for (c = p; *c; c++)
-                hash = (hash << 5) + hash + (unsigned)*c;
+                hash = (hash << 5) + hash + (unsigned) *c;
 
         return hash;
 }
 
-int string_compare_func(const void *a, const void *b)
-{
+int string_compare_func(const void *a, const void *b) {
         return strcmp(a, b);
 }
 
-unsigned trivial_hash_func(const void *p)
-{
+unsigned trivial_hash_func(const void *p) {
         return PTR_TO_UINT(p);
 }
 
-int trivial_compare_func(const void *a, const void *b)
-{
+int trivial_compare_func(const void *a, const void *b) {
         return a < b ? -1 : (a > b ? 1 : 0);
 }
 
-Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func)
-{
+Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func) {
+        bool b;
         Hashmap *h;
         size_t size;
 
-        size = ALIGN(sizeof(Hashmap)) + NBUCKETS * sizeof(struct hashmap_entry *);
+        b = is_main_thread();
 
-        h = malloc0(size);
+        size = ALIGN(sizeof(Hashmap)) + NBUCKETS * sizeof(struct hashmap_entry*);
 
-        if (!h)
-                return NULL;
+        if (b) {
+                h = allocate_tile(&first_hashmap_pool, &first_hashmap_tile, size);
+                if (!h)
+                        return NULL;
+
+                memset(h, 0, size);
+        } else {
+                h = malloc0(size);
+
+                if (!h)
+                        return NULL;
+        }
 
         h->hash_func = hash_func ? hash_func : trivial_hash_func;
         h->compare_func = compare_func ? compare_func : trivial_compare_func;
@@ -91,11 +175,12 @@ Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func)
         h->n_entries = 0;
         h->iterate_list_head = h->iterate_list_tail = NULL;
 
+        h->from_pool = b;
+
         return h;
 }
 
-int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func)
-{
+int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func) {
         assert(h);
 
         if (*h)
@@ -107,8 +192,7 @@ int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t
         return 0;
 }
 
-static void link_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash)
-{
+static void link_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash) {
         assert(h);
         assert(e);
 
@@ -135,8 +219,7 @@ static void link_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash)
         assert(h->n_entries >= 1);
 }
 
-static void unlink_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash)
-{
+static void unlink_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash) {
         assert(h);
         assert(e);
 
@@ -164,9 +247,7 @@ static void unlink_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash)
         h->n_entries--;
 }
 
-static void remove_entry(Hashmap *h, struct hashmap_entry **ep)
-{
-        struct hashmap_entry *e = *ep;
+static void remove_entry(Hashmap *h, struct hashmap_entry *e) {
         unsigned hash;
 
         assert(h);
@@ -176,23 +257,26 @@ static void remove_entry(Hashmap *h, struct hashmap_entry **ep)
 
         unlink_entry(h, e, hash);
 
-        free(e);
-        *ep = NULL;
+        if (h->from_pool)
+                deallocate_tile(&first_entry_tile, e);
+        else
+                free(e);
 }
 
-void hashmap_free(Hashmap *h)
-{
+void hashmap_free(Hashmap*h) {
 
         if (!h)
                 return;
 
         hashmap_clear(h);
 
-        free(h);
+        if (h->from_pool)
+                deallocate_tile(&first_hashmap_tile, h);
+        else
+                free(h);
 }
 
-void hashmap_free_free(Hashmap *h)
-{
+void hashmap_free_free(Hashmap *h) {
         void *p;
 
         while ((p = hashmap_steal_first(h)))
@@ -201,19 +285,15 @@ void hashmap_free_free(Hashmap *h)
         hashmap_free(h);
 }
 
-void hashmap_clear(Hashmap *h)
-{
+void hashmap_clear(Hashmap *h) {
         if (!h)
                 return;
 
-        while (h->iterate_list_head) {
-                struct hashmap_entry *e = h->iterate_list_head;
-                remove_entry(h, &e);
-        }
+        while (h->iterate_list_head)
+                remove_entry(h, h->iterate_list_head);
 }
 
-static struct hashmap_entry *hash_scan(Hashmap *h, unsigned hash, const void *key)
-{
+static struct hashmap_entry *hash_scan(Hashmap *h, unsigned hash, const void *key) {
         struct hashmap_entry *e;
         assert(h);
         assert(hash < NBUCKETS);
@@ -225,8 +305,7 @@ static struct hashmap_entry *hash_scan(Hashmap *h, unsigned hash, const void *ke
         return NULL;
 }
 
-int hashmap_put(Hashmap *h, const void *key, void *value)
-{
+int hashmap_put(Hashmap *h, const void *key, void *value) {
         struct hashmap_entry *e;
         unsigned hash;
 
@@ -242,7 +321,10 @@ int hashmap_put(Hashmap *h, const void *key, void *value)
                 return -EEXIST;
         }
 
-        e = new(struct hashmap_entry, 1);
+        if (h->from_pool)
+                e = allocate_tile(&first_entry_pool, &first_entry_tile, sizeof(struct hashmap_entry));
+        else
+                e = new(struct hashmap_entry, 1);
 
         if (!e)
                 return -ENOMEM;
@@ -255,8 +337,7 @@ int hashmap_put(Hashmap *h, const void *key, void *value)
         return 1;
 }
 
-int hashmap_replace(Hashmap *h, const void *key, void *value)
-{
+int hashmap_replace(Hashmap *h, const void *key, void *value) {
         struct hashmap_entry *e;
         unsigned hash;
 
@@ -273,8 +354,7 @@ int hashmap_replace(Hashmap *h, const void *key, void *value)
         return hashmap_put(h, key, value);
 }
 
-void *hashmap_get(Hashmap *h, const void *key)
-{
+void* hashmap_get(Hashmap *h, const void *key) {
         unsigned hash;
         struct hashmap_entry *e;
 
@@ -289,8 +369,7 @@ void *hashmap_get(Hashmap *h, const void *key)
         return e->value;
 }
 
-void *hashmap_remove(Hashmap *h, const void *key)
-{
+void* hashmap_remove(Hashmap *h, const void *key) {
         struct hashmap_entry *e;
         unsigned hash;
         void *data;
@@ -304,13 +383,12 @@ void *hashmap_remove(Hashmap *h, const void *key)
                 return NULL;
 
         data = e->value;
-        remove_entry(h, &e);
+        remove_entry(h, e);
 
         return data;
 }
 
-int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value)
-{
+int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value) {
         struct hashmap_entry *e;
         unsigned old_hash, new_hash;
 
@@ -335,8 +413,7 @@ int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key,
         return 0;
 }
 
-int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value)
-{
+int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value) {
         struct hashmap_entry *e, *k;
         unsigned old_hash, new_hash;
 
@@ -351,7 +428,7 @@ int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_
 
         if ((k = hash_scan(h, new_hash, new_key)))
                 if (e != k)
-                        remove_entry(h, &k);
+                        remove_entry(h, k);
 
         unlink_entry(h, e, old_hash);
 
@@ -363,8 +440,7 @@ int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_
         return 0;
 }
 
-void *hashmap_remove_value(Hashmap *h, const void *key, void *value)
-{
+void* hashmap_remove_value(Hashmap *h, const void *key, void *value) {
         struct hashmap_entry *e;
         unsigned hash;
 
@@ -379,13 +455,12 @@ void *hashmap_remove_value(Hashmap *h, const void *key, void *value)
         if (e->value != value)
                 return NULL;
 
-        remove_entry(h, &e);
+        remove_entry(h, e);
 
         return value;
 }
 
-void *hashmap_iterate(Hashmap *h, Iterator *i, const void **key)
-{
+void *hashmap_iterate(Hashmap *h, Iterator *i, const void **key) {
         struct hashmap_entry *e;
 
         assert(i);
@@ -399,7 +474,7 @@ void *hashmap_iterate(Hashmap *h, Iterator *i, const void **key)
         if (*i == ITERATOR_FIRST && !h->iterate_list_head)
                 goto at_end;
 
-        e = *i == ITERATOR_FIRST ? h->iterate_list_head : (struct hashmap_entry *)*i;
+        e = *i == ITERATOR_FIRST ? h->iterate_list_head : (struct hashmap_entry*) *i;
 
         if (e->iterate_next)
                 *i = (Iterator) e->iterate_next;
@@ -420,8 +495,7 @@ at_end:
         return NULL;
 }
 
-void *hashmap_iterate_backwards(Hashmap *h, Iterator *i, const void **key)
-{
+void *hashmap_iterate_backwards(Hashmap *h, Iterator *i, const void **key) {
         struct hashmap_entry *e;
 
         assert(i);
@@ -435,7 +509,7 @@ void *hashmap_iterate_backwards(Hashmap *h, Iterator *i, const void **key)
         if (*i == ITERATOR_LAST && !h->iterate_list_tail)
                 goto at_beginning;
 
-        e = *i == ITERATOR_LAST ? h->iterate_list_tail : (struct hashmap_entry *)*i;
+        e = *i == ITERATOR_LAST ? h->iterate_list_tail : (struct hashmap_entry*) *i;
 
         if (e->iterate_previous)
                 *i = (Iterator) e->iterate_previous;
@@ -456,8 +530,7 @@ at_beginning:
         return NULL;
 }
 
-void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i)
-{
+void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i) {
         unsigned hash;
         struct hashmap_entry *e;
 
@@ -474,8 +547,7 @@ void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i)
         return e->value;
 }
 
-void *hashmap_first(Hashmap *h)
-{
+void* hashmap_first(Hashmap *h) {
 
         if (!h)
                 return NULL;
@@ -486,8 +558,7 @@ void *hashmap_first(Hashmap *h)
         return h->iterate_list_head->value;
 }
 
-void *hashmap_first_key(Hashmap *h)
-{
+void* hashmap_first_key(Hashmap *h) {
 
         if (!h)
                 return NULL;
@@ -495,11 +566,10 @@ void *hashmap_first_key(Hashmap *h)
         if (!h->iterate_list_head)
                 return NULL;
 
-        return (void *)h->iterate_list_head->key;
+        return (void*) h->iterate_list_head->key;
 }
 
-void *hashmap_last(Hashmap *h)
-{
+void* hashmap_last(Hashmap *h) {
 
         if (!h)
                 return NULL;
@@ -510,9 +580,7 @@ void *hashmap_last(Hashmap *h)
         return h->iterate_list_tail->value;
 }
 
-void *hashmap_steal_first(Hashmap *h)
-{
-        struct hashmap_entry *e;
+void* hashmap_steal_first(Hashmap *h) {
         void *data;
 
         if (!h)
@@ -521,16 +589,13 @@ void *hashmap_steal_first(Hashmap *h)
         if (!h->iterate_list_head)
                 return NULL;
 
-        e = h->iterate_list_head;
-        data = e->value;
-        remove_entry(h, &e);
+        data = h->iterate_list_head->value;
+        remove_entry(h, h->iterate_list_head);
 
         return data;
 }
 
-void *hashmap_steal_first_key(Hashmap *h)
-{
-        struct hashmap_entry *e;
+void* hashmap_steal_first_key(Hashmap *h) {
         void *key;
 
         if (!h)
@@ -539,15 +604,13 @@ void *hashmap_steal_first_key(Hashmap *h)
         if (!h->iterate_list_head)
                 return NULL;
 
-        e = h->iterate_list_head;
-        key = (void *)e->key;
-        remove_entry(h, &e);
+        key = (void*) h->iterate_list_head->key;
+        remove_entry(h, h->iterate_list_head);
 
         return key;
 }
 
-unsigned hashmap_size(Hashmap *h)
-{
+unsigned hashmap_size(Hashmap *h) {
 
         if (!h)
                 return 0;
@@ -555,8 +618,7 @@ unsigned hashmap_size(Hashmap *h)
         return h->n_entries;
 }
 
-bool hashmap_isempty(Hashmap *h)
-{
+bool hashmap_isempty(Hashmap *h) {
 
         if (!h)
                 return true;
@@ -564,8 +626,7 @@ bool hashmap_isempty(Hashmap *h)
         return h->n_entries == 0;
 }
 
-int hashmap_merge(Hashmap *h, Hashmap *other)
-{
+int hashmap_merge(Hashmap *h, Hashmap *other) {
         struct hashmap_entry *e;
 
         assert(h);
@@ -584,8 +645,7 @@ int hashmap_merge(Hashmap *h, Hashmap *other)
         return 0;
 }
 
-void hashmap_move(Hashmap *h, Hashmap *other)
-{
+void hashmap_move(Hashmap *h, Hashmap *other) {
         struct hashmap_entry *e, *n;
 
         assert(h);
@@ -613,8 +673,7 @@ void hashmap_move(Hashmap *h, Hashmap *other)
         }
 }
 
-int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key)
-{
+int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key) {
         unsigned h_hash, other_hash;
         struct hashmap_entry *e;
 
@@ -637,21 +696,35 @@ int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key)
         return 0;
 }
 
-char **hashmap_get_strv(Hashmap *h)
-{
+Hashmap *hashmap_copy(Hashmap *h) {
+        Hashmap *copy;
+
+        assert(h);
+
+        if (!(copy = hashmap_new(h->hash_func, h->compare_func)))
+                return NULL;
+
+        if (hashmap_merge(copy, h) < 0) {
+                hashmap_free(copy);
+                return NULL;
+        }
+
+        return copy;
+}
+
+char **hashmap_get_strv(Hashmap *h) {
         char **sv;
         Iterator it;
         char *item;
         int n;
 
-        sv = new(char *, h->n_entries + 1);
+        sv = new(char*, h->n_entries+1);
         if (!sv)
                 return NULL;
 
         n = 0;
-        HASHMAP_FOREACH(item, h, it) {
+        HASHMAP_FOREACH(item, h, it)
                 sv[n++] = item;
-        }
         sv[n] = NULL;
 
         return sv;

install/hashmap.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #ifndef foohashmaphfoo
 #define foohashmaphfoo
 
@@ -29,7 +31,7 @@
 
 typedef struct Hashmap Hashmap;
 typedef struct _IteratorStruct _IteratorStruct;
-typedef _IteratorStruct *Iterator;
+typedef _IteratorStruct* Iterator;
 
 #define ITERATOR_FIRST ((Iterator) 0)
 #define ITERATOR_LAST ((Iterator) -1)
@@ -46,13 +48,14 @@ int trivial_compare_func(const void *a, const void *b);
 Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func);
 void hashmap_free(Hashmap *h);
 void hashmap_free_free(Hashmap *h);
+Hashmap *hashmap_copy(Hashmap *h);
 int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func);
 
 int hashmap_put(Hashmap *h, const void *key, void *value);
 int hashmap_replace(Hashmap *h, const void *key, void *value);
-void *hashmap_get(Hashmap *h, const void *key);
-void *hashmap_remove(Hashmap *h, const void *key);
-void *hashmap_remove_value(Hashmap *h, const void *key, void *value);
+void* hashmap_get(Hashmap *h, const void *key);
+void* hashmap_remove(Hashmap *h, const void *key);
+void* hashmap_remove_value(Hashmap *h, const void *key, void *value);
 int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value);
 int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value);
 
@@ -70,9 +73,9 @@ void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i);
 void hashmap_clear(Hashmap *h);
 void *hashmap_steal_first(Hashmap *h);
 void *hashmap_steal_first_key(Hashmap *h);
-void *hashmap_first(Hashmap *h);
-void *hashmap_first_key(Hashmap *h);
-void *hashmap_last(Hashmap *h);
+void* hashmap_first(Hashmap *h);
+void* hashmap_first_key(Hashmap *h);
+void* hashmap_last(Hashmap *h);
 
 char **hashmap_get_strv(Hashmap *h);
 

install/log.c

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 /***
   This file is part of systemd.
 
@@ -44,8 +46,7 @@ static bool show_location = false;
  * use here. */
 static char *log_abort_msg = NULL;
 
-void log_close_console(void)
-{
+void log_close_console(void) {
 
         if (console_fd < 0)
                 return;
@@ -58,15 +59,14 @@ void log_close_console(void)
         }
 }
 
-static int log_open_console(void)
-{
+static int log_open_console(void) {
 
         if (console_fd >= 0)
                 return 0;
 
         if (getpid() == 1) {
 
-                console_fd = open_terminal("/dev/console", O_WRONLY | O_NOCTTY | O_CLOEXEC);
+                console_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
                 if (console_fd < 0) {
                         log_error("Failed to open /dev/console for logging: %s", strerror(-console_fd));
                         return console_fd;
@@ -79,31 +79,35 @@ static int log_open_console(void)
         return 0;
 }
 
-int log_open(void)
-{
+
+int log_open(void) {
         return log_open_console();
 }
 
-void log_close(void)
-{
+
+void log_close(void) {
         log_close_console();
 }
 
-void log_set_max_level(int level)
-{
+
+void log_set_max_level(int level) {
         assert((level & LOG_PRIMASK) == level);
 
         log_max_level = level;
 }
 
-void log_set_facility(int facility)
-{
+void log_set_facility(int facility) {
         log_facility = facility;
 }
 
-static int write_to_console(int level, const char *file, unsigned int line, const char *func, const char *buffer)
-{
+static int write_to_console(
+                int level,
+                const char*file,
+                int line,
+                const char *func,
+                const char *buffer) {
 
+        char location[64];
         struct iovec iovec[5];
         unsigned n = 0;
 
@@ -115,9 +119,7 @@ static int write_to_console(int level, const char *file, unsigned int line, cons
         IOVEC_SET_STRING(iovec[n++], "dracut-install: ");
 
         if (show_location) {
-                char location[64];
-                if (snprintf(location, sizeof(location), "(%s:%u) ", file, line) <= 0)
-                        return -errno;
+                snprintf(location, sizeof(location), "(%s:%u) ", file, line);
                 IOVEC_SET_STRING(iovec[n++], location);
         }
 
@@ -130,8 +132,12 @@ static int write_to_console(int level, const char *file, unsigned int line, cons
         return 1;
 }
 
-static int log_dispatch(int level, const char *file, int line, const char *func, char *buffer)
-{
+static int log_dispatch(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        char *buffer) {
 
         int r = 0;
 
@@ -163,8 +169,13 @@ static int log_dispatch(int level, const char *file, int line, const char *func,
         return r;
 }
 
-int log_metav(int level, const char *file, int line, const char *func, const char *format, va_list ap)
-{
+int log_metav(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format,
+        va_list ap) {
 
         char buffer[LINE_MAX];
         int saved_errno, r;
@@ -182,8 +193,12 @@ int log_metav(int level, const char *file, int line, const char *func, const cha
         return r;
 }
 
-int log_meta(int level, const char *file, int line, const char *func, const char *format, ...)
-{
+int log_meta(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) {
 
         int r;
         va_list ap;
@@ -197,8 +212,7 @@ int log_meta(int level, const char *file, int line, const char *func, const char
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
-_noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format)
-{
+_noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format) {
         static char buffer[LINE_MAX];
 
         snprintf(buffer, sizeof(buffer), format, text, file, line, func);
@@ -209,29 +223,24 @@ _noreturn_ static void log_assert(const char *text, const char *file, int line,
         log_dispatch(LOG_CRIT, file, line, func, buffer);
         abort();
 }
-
 #pragma GCC diagnostic pop
 
-_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func)
-{
+_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func) {
         log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
 }
 
-_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func)
-{
+_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func) {
         log_assert(text, file, line, func, "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
 }
 
-void log_set_target(LogTarget target)
-{
+void log_set_target(LogTarget target) {
         assert(target >= 0);
         assert(target < _LOG_TARGET_MAX);
 
         log_target = target;
 }
 
-int log_set_target_from_string(const char *e)
-{
+int log_set_target_from_string(const char *e) {
         LogTarget t;
 
         t = log_target_from_string(e);
@@ -242,8 +251,7 @@ int log_set_target_from_string(const char *e)
         return 0;
 }
 
-int log_set_max_level_from_string(const char *e)
-{
+int log_set_max_level_from_string(const char *e) {
         int t;
 
         t = log_level_from_string(e);
@@ -254,37 +262,28 @@ int log_set_max_level_from_string(const char *e)
         return 0;
 }
 
-void log_parse_environment(void)
-{
+void log_parse_environment(void) {
         const char *e;
 
-        if ((e = getenv("DRACUT_INSTALL_LOG_TARGET"))) {
+        if ((e = getenv("DRACUT_LOG_TARGET")))
                 if (log_set_target_from_string(e) < 0)
                         log_warning("Failed to parse log target %s. Ignoring.", e);
-        } else if ((e = getenv("DRACUT_LOG_TARGET"))) {
-                if (log_set_target_from_string(e) < 0)
-                        log_warning("Failed to parse log target %s. Ignoring.", e);
-        }
 
-        if ((e = getenv("DRACUT_INSTALL_LOG_LEVEL"))) {
+        if ((e = getenv("DRACUT_LOG_LEVEL")))
                 if (log_set_max_level_from_string(e) < 0)
                         log_warning("Failed to parse log level %s. Ignoring.", e);
-        } else if ((e = getenv("DRACUT_LOG_LEVEL"))) {
-                if (log_set_max_level_from_string(e) < 0)
-                        log_warning("Failed to parse log level %s. Ignoring.", e);
-        }
+
 }
 
-LogTarget log_get_target(void)
-{
+LogTarget log_get_target(void) {
         return log_target;
 }
 
-int log_get_max_level(void)
-{
+int log_get_max_level(void) {
         return log_max_level;
 }
 
+
 static const char *const log_target_table[] = {
         [LOG_TARGET_CONSOLE] = "console",
         [LOG_TARGET_AUTO] = "auto",

install/log.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #ifndef foologhfoo
 #define foologhfoo
 
@@ -26,19 +28,19 @@
 
 #include "macro.h"
 
-typedef enum LogTarget {
+typedef enum LogTarget{
         LOG_TARGET_CONSOLE,
         LOG_TARGET_KMSG,
         LOG_TARGET_JOURNAL,
         LOG_TARGET_JOURNAL_OR_KMSG,
         LOG_TARGET_SYSLOG,
         LOG_TARGET_SYSLOG_OR_KMSG,
-        LOG_TARGET_AUTO,        /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
-        LOG_TARGET_SAFE,        /* console if stderr is tty, KMSG otherwise */
+        LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
+        LOG_TARGET_SAFE, /* console if stderr is tty, KMSG otherwise */
         LOG_TARGET_NULL,
         _LOG_TARGET_MAX,
         _LOG_TARGET_INVALID = -1
-} LogTarget;
+}  LogTarget;
 
 void log_set_target(LogTarget target);
 void log_set_max_level(int level);
@@ -67,15 +69,31 @@ void log_close_console(void);
 
 void log_parse_environment(void);
 
-int log_meta(int level, const char *file, int line, const char *func, const char *format, ...) _printf_attr_(5, 6);
+int log_meta(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) _printf_attr_(5,6);
 
-int log_metav(int level, const char *file, int line, const char *func, const char *format, va_list ap);
+int log_metav(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format,
+        va_list ap);
 
 _noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func);
 _noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func);
 
 /* This modifies the buffer passed! */
-int log_dump_internal(int level, const char *file, int line, const char *func, char *buffer);
+int log_dump_internal(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        char *buffer);
 
 #define log_full(level, ...) log_meta(level,   __FILE__, __LINE__, __func__, __VA_ARGS__)
 

install/macro.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #pragma once
 
 /***
@@ -68,8 +70,7 @@
 #define ALIGN4_PTR(p) ((void*) ALIGN4((unsigned long) p))
 #define ALIGN8_PTR(p) ((void*) ALIGN8((unsigned long) p))
 
-static inline size_t ALIGN_TO(size_t l, size_t ali)
-{
+static inline size_t ALIGN_TO(size_t l, size_t ali) {
         return ((l + ali - 1) & ~(ali - 1));
 }
 
@@ -190,8 +191,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali)
                 _i->iov_len = strlen(_s);       \
         } while(false)
 
-static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n)
-{
+static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n) {
         unsigned j;
         size_t r = 0;
 
@@ -201,19 +201,18 @@ static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n)
         return r;
 }
 
-static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k)
-{
+static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
         unsigned j;
 
         for (j = 0; j < n; j++) {
                 size_t sub;
 
-                if (_unlikely_(k == 0))
+                if (_unlikely_(k <= 0))
                         break;
 
                 sub = MIN(i[j].iov_len, k);
                 i[j].iov_len -= sub;
-                i[j].iov_base = (uint8_t *) i[j].iov_base + sub;
+                i[j].iov_base = (uint8_t*) i[j].iov_base + sub;
                 k -= sub;
         }
 
@@ -265,12 +264,13 @@ do {                                                                    \
         }                                                               \
 } while(false)
 
-/* Because statfs.t_type can be int on some architecures, we have to cast
- * the const magic to the type, otherwise the compiler warns about
- * signed/unsigned comparison, because the magic can be 32 bit unsigned.
+ /* Because statfs.t_type can be int on some architecures, we have to cast
+  * the const magic to the type, otherwise the compiler warns about
+  * signed/unsigned comparison, because the magic can be 32 bit unsigned.
  */
 #define F_TYPE_CMP(a, b) (a == (typeof(a)) b)
 
+
 /* Returns the number of chars needed to format variables of the
  * specified type as a decimal string. Adds in extra space for a
  * negative '-' prefix. */

install/util.c

@@ -0,0 +1,279 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
+
+#include "util.h"
+
+static inline pid_t gettid(void) {
+        return (pid_t) syscall(SYS_gettid);
+}
+
+size_t page_size(void) {
+        static __thread size_t pgsz = 0;
+        long r;
+
+        if (_likely_(pgsz > 0))
+                return pgsz;
+
+        assert_se((r = sysconf(_SC_PAGESIZE)) > 0);
+
+        pgsz = (size_t) r;
+
+        return pgsz;
+}
+
+bool endswith(const char *s, const char *postfix) {
+        size_t sl, pl;
+
+        assert(s);
+        assert(postfix);
+
+        sl = strlen(s);
+        pl = strlen(postfix);
+
+        if (pl == 0)
+                return true;
+
+        if (sl < pl)
+                return false;
+
+        return memcmp(s + sl - pl, postfix, pl) == 0;
+}
+int close_nointr(int fd) {
+        assert(fd >= 0);
+
+        for (;;) {
+                int r;
+
+                r = close(fd);
+                if (r >= 0)
+                        return r;
+
+                if (errno != EINTR)
+                        return -errno;
+        }
+}
+
+void close_nointr_nofail(int fd) {
+        int saved_errno = errno;
+
+        /* like close_nointr() but cannot fail, and guarantees errno
+         * is unchanged */
+
+        assert_se(close_nointr(fd) == 0);
+
+        errno = saved_errno;
+}
+
+int open_terminal(const char *name, int mode) {
+        int fd, r;
+        unsigned c = 0;
+
+        /*
+         * If a TTY is in the process of being closed opening it might
+         * cause EIO. This is horribly awful, but unlikely to be
+         * changed in the kernel. Hence we work around this problem by
+         * retrying a couple of times.
+         *
+         * https://bugs.launchpad.net/ubuntu/+source/linux/+bug/554172/comments/245
+         */
+
+        for (;;) {
+                if ((fd = open(name, mode)) >= 0)
+                        break;
+
+                if (errno != EIO)
+                        return -errno;
+
+                if (c >= 20)
+                        return -errno;
+
+                usleep(50 * USEC_PER_MSEC);
+                c++;
+        }
+
+        if (fd < 0)
+                return -errno;
+
+        if ((r = isatty(fd)) < 0) {
+                close_nointr_nofail(fd);
+                return -errno;
+        }
+
+        if (!r) {
+                close_nointr_nofail(fd);
+                return -ENOTTY;
+        }
+
+        return fd;
+}
+
+bool streq_ptr(const char *a, const char *b) {
+
+        /* Like streq(), but tries to make sense of NULL pointers */
+
+        if (a && b)
+                return streq(a, b);
+
+        if (!a && !b)
+                return true;
+
+        return false;
+}
+bool is_main_thread(void) {
+        static __thread int cached = 0;
+
+        if (_unlikely_(cached == 0))
+                cached = getpid() == gettid() ? 1 : -1;
+
+        return cached > 0;
+}
+
+int safe_atou(const char *s, unsigned *ret_u) {
+        char *x = NULL;
+        unsigned long l;
+
+        assert(s);
+        assert(ret_u);
+
+        errno = 0;
+        l = strtoul(s, &x, 0);
+
+        if (!x || *x || errno)
+                return errno ? -errno : -EINVAL;
+
+        if ((unsigned long) (unsigned) l != l)
+                return -ERANGE;
+
+        *ret_u = (unsigned) l;
+        return 0;
+}
+
+static const char *const log_level_table[] = {
+        [LOG_EMERG] = "emerg",
+        [LOG_ALERT] = "alert",
+        [LOG_CRIT] = "crit",
+        [LOG_ERR] = "err",
+        [LOG_WARNING] = "warning",
+        [LOG_NOTICE] = "notice",
+        [LOG_INFO] = "info",
+        [LOG_DEBUG] = "debug"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(log_level, int);
+
+char *strnappend(const char *s, const char *suffix, size_t b) {
+        size_t a;
+        char *r;
+
+        if (!s && !suffix)
+                return strdup("");
+
+        if (!s)
+                return strndup(suffix, b);
+
+        if (!suffix)
+                return strdup(s);
+
+        assert(s);
+        assert(suffix);
+
+        a = strlen(s);
+        if (b > ((size_t) -1) - a)
+                return NULL;
+
+        r = new(char, a+b+1);
+        if (!r)
+                return NULL;
+
+        memcpy(r, s, a);
+        memcpy(r+a, suffix, b);
+        r[a+b] = 0;
+
+        return r;
+}
+
+char *strappend(const char *s, const char *suffix) {
+        return strnappend(s, suffix, suffix ? strlen(suffix) : 0);
+}
+
+char *strjoin(const char *x, ...) {
+        va_list ap;
+        size_t l;
+        char *r, *p;
+
+        va_start(ap, x);
+
+        if (x) {
+                l = strlen(x);
+
+                for (;;) {
+                        const char *t;
+                        size_t n;
+
+                        t = va_arg(ap, const char *);
+                        if (!t)
+                                break;
+
+                        n = strlen(t);
+                        if (n > ((size_t) -1) - l) {
+                                va_end(ap);
+                                return NULL;
+                        }
+
+                        l += n;
+                }
+        } else
+                l = 0;
+
+        va_end(ap);
+
+        r = new(char, l+1);
+        if (!r)
+                return NULL;
+
+        if (x) {
+                p = stpcpy(r, x);
+
+                va_start(ap, x);
+
+                for (;;) {
+                        const char *t;
+
+                        t = va_arg(ap, const char *);
+                        if (!t)
+                                break;
+
+                        p = stpcpy(p, t);
+                }
+
+                va_end(ap);
+        } else
+                r[0] = 0;
+
+        return r;
+}

install/util.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #ifndef fooutilhfoo
 #define fooutilhfoo
 
@@ -20,8 +22,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#define _GNU_SOURCE
-
 #include <inttypes.h>
 #include <time.h>
 #include <sys/time.h>
@@ -29,7 +29,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <signal.h>
 #include <sched.h>
 #include <limits.h>
@@ -86,8 +85,8 @@ typedef struct dual_timestamp {
 
 usec_t now(clockid_t clock);
 
-dual_timestamp *dual_timestamp_get(dual_timestamp *ts);
-dual_timestamp *dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
+dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
+dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
 
 #define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
 
@@ -115,40 +114,28 @@ bool streq_ptr(const char *a, const char *b);
 
 #define malloc0(n) (calloc((n), 1))
 
-static inline const char *yes_no(bool b)
-{
+static inline const char* yes_no(bool b) {
         return b ? "yes" : "no";
 }
 
-static inline const char *strempty(const char *s)
-{
+static inline const char* strempty(const char *s) {
         return s ? s : "";
 }
 
-static inline const char *strnull(const char *s)
-{
+static inline const char* strnull(const char *s) {
         return s ? s : "(null)";
 }
 
-static inline const char *strna(const char *s)
-{
+static inline const char *strna(const char *s) {
         return s ? s : "n/a";
 }
 
-static inline bool isempty(const char *p)
-{
+static inline bool isempty(const char *p) {
         return !p || !p[0];
 }
 
-static inline const char *startswith(const char *s, const char *prefix)
-{
-        if (strncmp(s, prefix, strlen(prefix)) == 0)
-                return s + strlen(prefix);
-        return NULL;
-}
-
 bool endswith(const char *s, const char *postfix);
-
+bool startswith(const char *s, const char *prefix);
 bool startswith_no_case(const char *s, const char *prefix);
 
 bool first_word(const char *s, const char *word);
@@ -161,8 +148,8 @@ int parse_boolean(const char *v);
 int parse_usec(const char *t, usec_t *usec);
 int parse_nsec(const char *t, nsec_t *nsec);
 int parse_bytes(const char *t, off_t *bytes);
-int parse_pid(const char *s, pid_t *ret_pid);
-int parse_uid(const char *s, uid_t *ret_uid);
+int parse_pid(const char *s, pid_t* ret_pid);
+int parse_uid(const char *s, uid_t* ret_uid);
 #define parse_gid(s, ret_uid) parse_uid(s, ret_uid)
 
 int safe_atou(const char *s, unsigned *ret_u);
@@ -171,54 +158,44 @@ int safe_atoi(const char *s, int *ret_i);
 int safe_atollu(const char *s, unsigned long long *ret_u);
 int safe_atolli(const char *s, long long int *ret_i);
 
-#if LONG_MAX == INT_MAX
-static inline int safe_atolu(const char *s, unsigned long *ret_u)
-{
+#if __WORDSIZE == 32
+static inline int safe_atolu(const char *s, unsigned long *ret_u) {
         assert_cc(sizeof(unsigned long) == sizeof(unsigned));
-        return safe_atou(s, (unsigned *)ret_u);
+        return safe_atou(s, (unsigned*) ret_u);
 }
-
-static inline int safe_atoli(const char *s, long int *ret_u)
-{
+static inline int safe_atoli(const char *s, long int *ret_u) {
         assert_cc(sizeof(long int) == sizeof(int));
-        return safe_atoi(s, (int *)ret_u);
+        return safe_atoi(s, (int*) ret_u);
 }
 #else
-static inline int safe_atolu(const char *s, unsigned long *ret_u)
-{
+static inline int safe_atolu(const char *s, unsigned long *ret_u) {
         assert_cc(sizeof(unsigned long) == sizeof(unsigned long long));
-        return safe_atollu(s, (unsigned long long *)ret_u);
+        return safe_atollu(s, (unsigned long long*) ret_u);
 }
-
-static inline int safe_atoli(const char *s, long int *ret_u)
-{
+static inline int safe_atoli(const char *s, long int *ret_u) {
         assert_cc(sizeof(long int) == sizeof(long long int));
-        return safe_atolli(s, (long long int *)ret_u);
+        return safe_atolli(s, (long long int*) ret_u);
 }
 #endif
 
-static inline int safe_atou32(const char *s, uint32_t *ret_u)
-{
+static inline int safe_atou32(const char *s, uint32_t *ret_u) {
         assert_cc(sizeof(uint32_t) == sizeof(unsigned));
-        return safe_atou(s, (unsigned *)ret_u);
+        return safe_atou(s, (unsigned*) ret_u);
 }
 
-static inline int safe_atoi32(const char *s, int32_t *ret_i)
-{
+static inline int safe_atoi32(const char *s, int32_t *ret_i) {
         assert_cc(sizeof(int32_t) == sizeof(int));
-        return safe_atoi(s, (int *)ret_i);
+        return safe_atoi(s, (int*) ret_i);
 }
 
-static inline int safe_atou64(const char *s, uint64_t *ret_u)
-{
+static inline int safe_atou64(const char *s, uint64_t *ret_u) {
         assert_cc(sizeof(uint64_t) == sizeof(unsigned long long));
-        return safe_atollu(s, (unsigned long long *)ret_u);
+        return safe_atollu(s, (unsigned long long*) ret_u);
 }
 
-static inline int safe_atoi64(const char *s, int64_t *ret_i)
-{
+static inline int safe_atoi64(const char *s, int64_t *ret_i) {
         assert_cc(sizeof(int64_t) == sizeof(long long int));
-        return safe_atolli(s, (long long int *)ret_i);
+        return safe_atolli(s, (long long int*) ret_i);
 }
 
 char *split(const char *c, size_t *l, const char *separator, char **state);
@@ -367,9 +344,9 @@ void rename_process(const char name[8]);
 
 void sigset_add_many(sigset_t *ss, ...);
 
-char *gethostname_malloc(void);
+char* gethostname_malloc(void);
 bool hostname_is_set(void);
-char *getlogname_malloc(void);
+char* getlogname_malloc(void);
 
 int getttyname_malloc(int fd, char **r);
 int getttyname_harder(int fd, char **r);
@@ -385,7 +362,7 @@ int rm_rf(const char *path, bool only_dirs, bool delete_root, bool honour_sticky
 
 int pipe_eof(int fd);
 
-cpu_set_t *cpu_set_malloc(unsigned *ncpus);
+cpu_set_t* cpu_set_malloc(unsigned *ncpus);
 
 void status_vprintf(const char *status, bool ellipse, const char *format, va_list ap);
 void status_printf(const char *status, bool ellipse, const char *format, ...);
@@ -432,7 +409,7 @@ void execute_directory(const char *directory, DIR *_d, char *argv[]);
 
 int kill_and_sigcont(pid_t pid, int sig);
 
-bool nulstr_contains(const char *nulstr, const char *needle);
+bool nulstr_contains(const char*nulstr, const char *needle);
 
 bool plymouth_running(void);
 
@@ -441,9 +418,9 @@ void skip_syslog_pid(char **buf);
 void skip_syslog_date(char **buf);
 
 bool hostname_is_valid(const char *s);
-char *hostname_cleanup(char *s);
+char* hostname_cleanup(char *s);
 
-char *strshorten(char *s, size_t l);
+char* strshorten(char *s, size_t l);
 
 int terminal_vhangup_fd(int fd);
 int terminal_vhangup(const char *name);
@@ -475,7 +452,7 @@ char *join(const char *x, ...) _sentinel_;
 
 bool is_main_thread(void);
 
-bool in_charset(const char *s, const char *charset);
+bool in_charset(const char *s, const char* charset);
 
 int block_get_whole_disk(dev_t d, dev_t *ret);
 
@@ -526,41 +503,35 @@ char *format_bytes(char *buf, size_t l, off_t t);
 
 int fd_wait_for_event(int fd, int event, usec_t timeout);
 
-void *memdup(const void *p, size_t l);
+void* memdup(const void *p, size_t l);
 
 int is_kernel_thread(pid_t pid);
 
-static inline void freep(void *p)
-{
-        free(*(void **)p);
+static inline void freep(void *p) {
+        free(*(void**) p);
 }
 
-static inline void fclosep(FILE **f)
-{
+static inline void fclosep(FILE **f) {
         if (*f)
                 fclose(*f);
 }
 
-static inline void pclosep(FILE **f)
-{
+static inline void pclosep(FILE **f) {
         if (*f)
                 pclose(*f);
 }
 
-static inline void closep(int *fd)
-{
+static inline void closep(int *fd) {
         if (*fd >= 0)
                 close_nointr_nofail(*fd);
 }
 
-static inline void closedirp(DIR **d)
-{
+static inline void closedirp(DIR **d) {
         if (*d)
                 closedir(*d);
 }
 
-static inline void umaskp(mode_t *u)
-{
+static inline void umaskp(mode_t *u) {
         umask(*u);
 }
 
@@ -591,16 +562,4 @@ void warn_melody(void);
 
 char *strjoin(const char *x, ...) _sentinel_;
 
-#define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func)                 \
-        static inline void func##p(type *p) {                   \
-                if (*p)                                         \
-                        func(*p);                               \
-        }                                                       \
-        struct __useless_struct_to_allow_trailing_semicolon__
-
-char *split_quoted(const char *c, size_t *l, char **state);
-char *cunescape_length(const char *s, size_t length);
-int unhexchar(char c) _const_;
-int unoctchar(char c) _const_;
-
 #endif

lsinitrd-bash-completion.sh

@@ -0,0 +1,63 @@
+#
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2013 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 <http://www.gnu.org/licenses/>.
+#
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+_lsinitrd() {
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local -A OPTS=(
+                [STANDALONE]='-s --size -h --help'
+
+                       [ARG]='-f --file -k --kver'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --file|-f)
+                                comps=$(compgen -f -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        --kver|-k)
+                                comps=$(cd /lib/modules; echo [0-9]*)
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        fi
+
+        comps=$(compgen -f -- "$cur")
+        compopt -o filenames
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+}
+
+complete -F _lsinitrd lsinitrd

lsinitrd.1.asc

@@ -3,7 +3,6 @@ LSINITRD(1)
 :doctype: manpage
 :man source:   dracut
 :man manual:   dracut
-:man version:  {version}
 
 NAME
 ----
@@ -35,21 +34,6 @@ OPTIONS
 **-k, --kver** _<kernel version>_::
     inspect the initramfs of <kernel version>.
 
-**-m, --mod**::
-    list dracut modules included of the initramfs image.
-
-**--unpack**::
-    unpack the initramfs to the current directory, instead of displaying the contents.
-    If optional filenames are given, will only unpack specified files, else the whole image will be unpacked.
-    Won't unpack anything from early cpio part.
-
-**--unpackearly**::
-    unpack the early microcode initramfs to the current directory, instead of displaying the contents.
-    Same as --unpack, but only unpack files from early cpio part.
-
-**-v, --verbose**::
-    unpack verbosely
-
 AVAILABILITY
 ------------
 The lsinitrd command is part of the dracut package and is available from

lsinitrd.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 #
 # Copyright 2005-2010 Harald Hoyer <harald@redhat.com>
 # Copyright 2005-2010 Red Hat, Inc.  All rights reserved.
@@ -17,7 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-usage() {
+usage()
+{
     {
         echo "Usage: ${0##*/} [options] [<initramfs file> [<filename> [<filename> [...] ]]]"
         echo "Usage: ${0##*/} [options] -k <kernel version>"
@@ -26,39 +29,29 @@ usage() {
         echo "-s, --size                  sort the contents of the initramfs by size."
         echo "-m, --mod                   list modules."
         echo "-f, --file <filename>       print the contents of <filename>."
-        echo "--unpack                    unpack the initramfs, instead of displaying the contents."
-        echo "                            If optional filenames are given, will only unpack specified files,"
-        echo "                            else the whole image will be unpacked. Won't unpack anything from early cpio part."
-        echo "--unpackearly               unpack the early microcode part of the initramfs."
-        echo "                            Same as --unpack, but only unpack files from early cpio part."
-        echo "-v, --verbose               unpack verbosely."
         echo "-k, --kver <kernel version> inspect the initramfs of <kernel version>."
         echo
     } >&2
 }
 
+
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
 
 sorted=0
 modules=0
-unset verbose
 declare -A filenames
 
 unset POSIXLY_CORRECT
 TEMP=$(getopt \
-    -o "vshmf:k:" \
+    -o "shmf:k:" \
     --long kver: \
     --long file: \
     --long mod \
     --long help \
     --long size \
-    --long unpack \
-    --long unpackearly \
-    --long verbose \
     -- "$@")
 
-# shellcheck disable=SC2181
-if (($? != 0)); then
+if (( $? != 0 )); then
     usage
     exit 1
 fi
@@ -67,31 +60,13 @@ eval set -- "$TEMP"
 
 while (($# > 0)); do
     case $1 in
-        -k | --kver)
-            KERNEL_VERSION="$2"
-            shift
-            ;;
-        -f | --file)
-            filenames[${2#/}]=1
-            shift
-            ;;
-        -s | --size) sorted=1 ;;
-        -h | --help)
-            usage
-            exit 0
-            ;;
-        -m | --mod) modules=1 ;;
-        -v | --verbose) verbose="--verbose" ;;
-        --unpack) unpack=1 ;;
-        --unpackearly) unpackearly=1 ;;
-        --)
-            shift
-            break
-            ;;
-        *)
-            usage
-            exit 1
-            ;;
+        -k|--kver)  KERNEL_VERSION="$2"; shift;;
+        -f|--file)  filenames[${2#/}]=1; shift;;
+        -s|--size)  sorted=1;;
+        -h|--help)  usage; exit 0;;
+        -m|--mod)   modules=1;;
+        --)         shift;break;;
+        *)          usage; exit 1;;
     esac
     shift
 done
@@ -100,7 +75,7 @@ done
 
 if [[ $1 ]]; then
     image="$1"
-    if ! [[ -f $image ]]; then
+    if ! [[ -f "$image" ]]; then
         {
             echo "$image does not exist"
             echo
@@ -109,15 +84,11 @@ if [[ $1 ]]; then
         exit 1
     fi
 else
-    [[ -f /etc/machine-id ]] && read -r MACHINE_ID < /etc/machine-id
+    [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
 
-    if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \
+    if [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
         && [[ $MACHINE_ID ]] \
-        && [[ -d /efi/${MACHINE_ID} || -L /efi/${MACHINE_ID} ]]; then
-        image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-    elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
-        && [[ $MACHINE_ID ]] \
-        && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then
+        && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
         image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
     else
         image="/boot/initramfs-${KERNEL_VERSION}.img"
@@ -126,11 +97,11 @@ fi
 
 shift
 while (($# > 0)); do
-    filenames[${1#/}]=1
+    filenames[${1#/}]=1;
     shift
 done
 
-if ! [[ -f $image ]]; then
+if ! [[ -f "$image" ]]; then
     {
         echo "No <initramfs file> specified and the default image '$image' cannot be accessed!"
         echo
@@ -139,140 +110,57 @@ if ! [[ -f $image ]]; then
     exit 1
 fi
 
-TMPDIR="$(mktemp -d -t lsinitrd.XXXXXX)"
-# shellcheck disable=SC2064
-trap "rm -rf '$TMPDIR'" EXIT
-
-dracutlibdirs() {
-    for d in lib64/dracut lib/dracut usr/lib64/dracut usr/lib/dracut; do
-        echo "$d/$1"
-    done
-}
-
-extract_files() {
-    ((${#filenames[@]} == 1)) && nofileinfo=1
-    for f in "${!filenames[@]}"; do
+extract_files()
+{
+    (( ${#filenames[@]} == 1 )) && nofileinfo=1
+    for f in ${!filenames[@]}; do
         [[ $nofileinfo ]] || echo "initramfs:/$f"
         [[ $nofileinfo ]] || echo "========================================================================"
-        $CAT "$image" 2> /dev/null | cpio --extract --verbose --quiet --to-stdout "$f" 2> /dev/null
-        ((ret += $?))
+        $CAT $image | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
+        ((ret+=$?))
         [[ $nofileinfo ]] || echo "========================================================================"
         [[ $nofileinfo ]] || echo
     done
 }
 
-list_modules() {
+list_modules()
+{
     echo "dracut modules:"
-    # shellcheck disable=SC2046
-    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
-        $(dracutlibdirs modules.txt) 2> /dev/null
-    ((ret += $?))
+    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
+    ((ret+=$?))
 }
 
-list_files() {
+list_files()
+{
     echo "========================================================================"
     if [ "$sorted" -eq 1 ]; then
-        $CAT "$image" 2> /dev/null | cpio --extract --verbose --quiet --list | sort -n -k5
+        $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
     else
-        $CAT "$image" 2> /dev/null | cpio --extract --verbose --quiet --list | sort -k9
+        $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
     fi
-    ((ret += $?))
+    ((ret+=$?))
     echo "========================================================================"
 }
 
-list_squash_content() {
-    SQUASH_IMG="squash-root.img"
-    SQUASH_TMPFILE="$TMPDIR/initrd.root.sqsh"
-
-    $CAT "$image" 2> /dev/null | cpio --extract --verbose --quiet --to-stdout -- \
-        $SQUASH_IMG > "$SQUASH_TMPFILE" 2> /dev/null
-    if [[ -s $SQUASH_TMPFILE ]]; then
-        echo "Squashed content ($SQUASH_IMG):"
-        echo "========================================================================"
-        unsquashfs -ll "$SQUASH_TMPFILE" | tail -n +4
-        echo "========================================================================"
-    fi
-}
-
-unpack_files() {
-    if ((${#filenames[@]} > 0)); then
-        for f in "${!filenames[@]}"; do
-            $CAT "$image" 2> /dev/null | cpio -id --quiet $verbose $f
-            ((ret += $?))
-        done
-    else
-        $CAT "$image" 2> /dev/null | cpio -id --quiet $verbose
-        ((ret += $?))
-    fi
-}
-
-read -r -N 2 bin < "$image"
-if [ "$bin" = "MZ" ]; then
-    command -v objcopy > /dev/null || {
-        echo "Need 'objcopy' to unpack an UEFI executable."
-        exit 1
-    }
-    objcopy \
-        --dump-section .linux="$TMPDIR/vmlinuz" \
-        --dump-section .initrd="$TMPDIR/initrd.img" \
-        --dump-section .cmdline="$TMPDIR/cmdline.txt" \
-        --dump-section .osrel="$TMPDIR/osrel.txt" \
-        "$image" /dev/null
-    uefi="$image"
-    image="$TMPDIR/initrd.img"
-    [ -f "$image" ] || exit 1
-fi
-
-if ((${#filenames[@]} <= 0)) && [[ -z $unpack ]] && [[ -z $unpackearly ]]; then
-    if [ -n "$uefi" ]; then
-        echo -n "initrd in UEFI: $uefi: "
-        du -h "$image" | while read -r a _ || [ -n "$a" ]; do echo "$a"; done
-        if [ -f "$TMPDIR/osrel.txt" ]; then
-            name=$(sed -En '/^PRETTY_NAME/ s/^\w+=["'"'"']?([^"'"'"'$]*)["'"'"']?/\1/p' "$TMPDIR/osrel.txt")
-            id=$(sed -En '/^ID/ s/^\w+=["'"'"']?([^"'"'"'$]*)["'"'"']?/\1/p' "$TMPDIR/osrel.txt")
-            build=$(sed -En '/^BUILD_ID/ s/^\w+=["'"'"']?([^"'"'"'$]*)["'"'"']?/\1/p' "$TMPDIR/osrel.txt")
-            echo "OS Release: $name (${id}-${build})"
-        fi
-        if [ -f "$TMPDIR/vmlinuz" ]; then
-            version=$(strings -n 20 "$TMPDIR/vmlinuz" | sed -En '/[0-9]+\.[0-9]+\.[0-9]+/ { p; q 0 }')
-            echo "Kernel Version: $version"
-        fi
-        if [ -f "$TMPDIR/cmdline.txt" ]; then
-            echo "Command line:"
-            sed -En 's/\s+/\n/g; s/\x00/\n/; p' "$TMPDIR/cmdline.txt"
-        fi
-    else
-        echo -n "Image: $image: "
-        du -h "$image" | while read -r a _ || [ -n "$a" ]; do echo "$a"; done
-    fi
 
+if (( ${#filenames[@]} <= 0 )); then
+    echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)"
     echo "========================================================================"
 fi
 
-read -r -N 6 bin < "$image"
+read -N 6 bin < "$image"
 case $bin in
-    $'\x71\xc7'* | 070701)
+    $'\x71\xc7'*|070701)
         CAT="cat --"
-        is_early=$(cpio --extract --verbose --quiet --to-stdout -- 'early_cpio' < "$image" 2> /dev/null)
-        # Debian mkinitramfs does not create the file 'early_cpio', so let's check if firmware files exist
-        [[ "$is_early" ]] || is_early=$(cpio --list --verbose --quiet --to-stdout -- 'kernel/*/microcode/*.bin' < "$image" 2> /dev/null)
+        is_early=$(cpio --extract --verbose --quiet --to-stdout -- 'early_cpio' < "$image" 2>/dev/null)
         if [[ "$is_early" ]]; then
-            if [[ -n $unpack ]]; then
-                # should use --unpackearly for early CPIO
-                :
-            elif [[ -n $unpackearly ]]; then
-                unpack_files
-            elif ((${#filenames[@]} > 0)); then
+            if (( ${#filenames[@]} > 0 )); then
                 extract_files
             else
                 echo "Early CPIO image"
                 list_files
             fi
-            if [[ -d "$dracutbasedir/skipcpio" ]]; then
-                SKIP="$dracutbasedir/skipcpio/skipcpio"
-            else
-                SKIP="$dracutbasedir/skipcpio"
-            fi
+            SKIP="$dracutbasedir/skipcpio"
             if ! [[ -x $SKIP ]]; then
                 echo
                 echo "'$SKIP' not found, cannot display remaining contents!" >&2
@@ -283,40 +171,42 @@ case $bin in
         ;;
 esac
 
-if [[ $SKIP ]]; then
-    bin="$($SKIP "$image" | { read -r -N 6 bin && echo "$bin"; })"
-else
-    read -r -N 6 bin < "$image"
-fi
-case $bin in
-    $'\x1f\x8b'*)
-        CAT="zcat --"
-        ;;
-    BZh*)
-        CAT="bzcat --"
-        ;;
-    $'\x71\xc7'* | 070701)
-        CAT="cat --"
-        ;;
-    $'\x02\x21'*)
-        CAT="lz4 -d -c"
-        ;;
-    $'\x89'LZO$'\0'*)
-        CAT="lzop -d -c"
-        ;;
-    $'\x28\xB5\x2F\xFD'*)
-        CAT="zstd -d -c"
-        ;;
-    *)
-        if echo "test" | xz | xzcat --single-stream > /dev/null 2>&1; then
-            CAT="xzcat --single-stream --"
-        else
-            CAT="xzcat --"
-        fi
-        ;;
-esac
 
-skipcpio() {
+CAT=$({
+        if [[ $SKIP ]]; then
+            $SKIP "$image"
+        else
+            cat "$image"
+        fi } | {
+        read -N 6 bin
+        case $bin in
+            $'\x1f\x8b'*)
+                echo "zcat --"
+                ;;
+            BZh*)
+                echo "bzcat --"
+                ;;
+            $'\x71\xc7'*|070701)
+                echo "cat --"
+                ;;
+            $'\x02\x21'*)
+                echo "lz4 -d -c"
+                ;;
+            $'\x89'LZO$'\0'*)
+                echo "lzop -d -c"
+                ;;
+            *)
+                if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
+                    echo "xzcat --single-stream --"
+                else
+                    echo "xzcat --"
+                fi
+                ;;
+        esac
+    })
+
+skipcpio()
+{
     $SKIP "$@" | $ORIG_CAT
 }
 
@@ -325,26 +215,13 @@ if [[ $SKIP ]]; then
     CAT=skipcpio
 fi
 
-if ((${#filenames[@]} > 1)); then
-    TMPFILE="$TMPDIR/initrd.cpio"
-    $CAT "$image" 2> /dev/null > "$TMPFILE"
-    pre_decompress() {
-        cat "$TMPFILE"
-    }
-    CAT=pre_decompress
-fi
-
 ret=0
 
-if [[ -n $unpack ]]; then
-    unpack_files
-elif ((${#filenames[@]} > 0)); then
+if (( ${#filenames[@]} > 0 )); then
     extract_files
 else
-    # shellcheck disable=SC2046
-    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
-        $(dracutlibdirs 'dracut-*') 2> /dev/null)
-    ((ret += $?))
+    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
+    ((ret+=$?))
     echo "Version: $version"
     echo
     if [ "$modules" -eq 1 ]; then
@@ -352,14 +229,11 @@ else
         echo "========================================================================"
     else
         echo -n "Arguments: "
-        # shellcheck disable=SC2046
-        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
-            $(dracutlibdirs build-parameter.txt) 2> /dev/null
+        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
         echo
         list_modules
         list_files
-        list_squash_content
     fi
 fi
 
-exit "$ret"
+exit $ret

mkinitrd-dracut.sh

@@ -0,0 +1,101 @@
+#!/bin/bash --norc
+kver=$(uname -r)
+
+error() { echo "$@" >&2; }
+
+usage () {
+    [[ $1 = '-n' ]] && cmd=echo || cmd=error
+
+    $cmd "usage: ${0##*/} [--version] [--help] [-v] [-f] [--preload <module>]"
+    $cmd "       [--image-version] [--with=<module>]"
+    $cmd "       [--nocompress]"
+    $cmd "       <initrd-image> <kernel-version>"
+    $cmd ""
+    $cmd "       (ex: ${0##*/} /boot/initramfs-$kver.img $kver)"
+
+    [[ $1 = '-n' ]] && exit 0
+    exit 1
+}
+
+# Little helper function for reading args from the commandline.
+# it automatically handles -a b and -a=b variants, and returns 1 if
+# we need to shift $3.
+read_arg() {
+    # $1 = arg name
+    # $2 = arg value
+    # $3 = arg parameter
+    local rematch='^[^=]*=(.*)$'
+    if [[ $2 =~ $rematch ]]; then
+        read "$1" <<< "${BASH_REMATCH[1]}"
+    elif [[ $3 != -* ]]; then
+        # Only read next arg if it not an arg itself.
+        read "$1" <<< "$3"
+        # There is no way to shift our callers args, so
+        # return 1 to indicate they should do it instead.
+        return 1
+    fi
+}
+
+while (($# > 0)); do
+    case ${1%%=*} in
+        --with-usb) read_arg usbmodule "$@" || shift
+            basicmodules="$basicmodules ${usbmodule:-usb-storage}"
+            unset usbmodule;;
+        --with-avail) read_arg modname "$@" || shift
+            basicmodules="$basicmodules $modname";;
+        --with) read_arg modname "$@" || shift
+            basicmodules="$basicmodules $modname";;
+        --version)
+            echo "mkinitrd: dracut compatibility wrapper"
+            exit 0;;
+        -v|--verbose) dracut_args="${dracut_args} -v";;
+        -f|--force) dracut_args="${dracut_args} -f";;
+        --preload) read_arg modname "$@" || shift
+            basicmodules="$basicmodules $modname";;
+        --image-version) img_vers=yes;;
+        --rootfs) read_arg rootfs "$@" || shift
+            dracut_args="${dracut_args} --filesystems $rootfs";;
+        --nocompress) dracut_args="$dracut_args --no-compress";;
+        --help) usage -n;;
+        --builtin) ;;
+        --without*) ;;
+        --without-usb) ;;
+        --fstab*) ;;
+        --ifneeded) ;;
+        --omit-scsi-modules) ;;
+        --omit-ide-modules) ;;
+        --omit-raid-modules) ;;
+        --omit-lvm-modules) ;;
+        --omit-dmraid) ;;
+        --allow-missing) ;;
+        --net-dev*) ;;
+        --noresume) ;;
+        --rootdev*) ;;
+        --thawdev*) ;;
+        --rootopts*) ;;
+        --root*) ;;
+        --loopdev*) ;;
+        --loopfs*) ;;
+        --loopopts*) ;;
+        --looppath*) ;;
+        --dsdt*) ;;
+        --bootchart) ;;
+        *) if [[ ! $target ]]; then
+            target=$1
+            elif [[ ! $kernel ]]; then
+            kernel=$1
+            else
+            usage
+            fi;;
+    esac
+    shift
+done
+
+[[ $target && $kernel ]] || usage
+[[ $img_vers ]] && target="$target-$kernel"
+
+if [[ $basicmodules ]]; then
+        dracut $dracut_args --add-drivers "$basicmodules" "$target" "$kernel"
+else
+        dracut $dracut_args "$target" "$kernel"
+fi

mkinitrd.8.asc

@@ -0,0 +1,65 @@
+MKINITRD(8)
+=========
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+mkinitrd - is a compat wrapper, which calls dracut to generate an initramfs
+
+SYNOPSIS
+--------
+*mkinitrd* ['OPTION...'] [<initrd-image>]  <kernel-version>
+
+DESCRIPTION
+-----------
+mkinitrd creates an initramfs image <initrd-image> for the kernel with
+version <kernel-version> by calling "dracut".
+
+[IMPORTANT]
+If a more fine grained control over the resulting image is needed,
+"dracut" should be called directly.
+
+OPTIONS
+-------
+**--version**::
+    print info about the version
+
+**-v, --verbose**::
+    increase verbosity level
+
+**-f, --force**::
+    overwrite existing initramfs file.
+
+**--image-version*::
+    append the kernel version to the target image
+    <initrd-image>-<kernel-version>.
+
+**--with=<module>**::
+     add the kernel module <module> to the initramfs.
+
+**--preload=<module>**::
+     preload the kernel module <module> in the initramfs before any other kernel
+     modules are loaded. This can be used to ensure a certain device naming,
+     which should in theory be avoided and the use of symbolic links in /dev is
+     encouraged.
+
+**--nocompress**::
+     do not compress the resulting image.
+
+**--help**::
+    print a help message and exit.
+
+AVAILABILITY
+------------
+The mkinitrd command is part of the dracut package and is available from
+link:$$https://dracut.wiki.kernel.org$$[https://dracut.wiki.kernel.org]
+
+AUTHORS
+-------
+Harald Hoyer
+
+SEE ALSO
+--------
+*dracut*(8)

modules.d/00bash/module-setup.sh

@@ -1,16 +1,15 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# called by dracut
 check() {
-    require_binaries /bin/bash
+    [ -x /bin/bash ]
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     # If another shell is already installed, do not use bash
     [[ -x $initdir/bin/sh ]] && return
@@ -18,3 +17,4 @@ install() {
     # Prefer bash as /bin/sh if it is available.
     inst /bin/bash && ln -sf bash "${initdir}/bin/sh"
 }
+

modules.d/00bootchart/module-setup.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    [[ "$mount_needs" ]] && return 1
+    [ -x /sbin/bootchartd ] || return 1
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_symlink /init /sbin/init
+    inst_dir /lib/bootchart/tmpfs
+
+    inst_multiple bootchartd bash \
+        /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
+        accton \
+        echo \
+        grep \
+        usleep
+
+    inst /usr/bin/pkill /bin/pkill
+    inst /usr/bin/[  /bin/[
+}
+

modules.d/00dash/module-setup.sh

@@ -1,16 +1,15 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# called by dracut
 check() {
-    require_binaries /bin/dash
+    [ -x /bin/dash ]
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     # If another shell is already installed, do not use dash
     [[ -x $initdir/bin/sh ]] && return
@@ -18,3 +17,4 @@ install() {
     # Prefer dash as /bin/sh if it is available.
     inst /bin/dash && ln -sf dash "${initdir}/bin/sh"
 }
+

modules.d/00mksh/module-setup.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
-    require_binaries /bin/mksh
-}
-
-# called by dracut
-depends() {
-    return 0
-}
-
-# called by dracut
-install() {
-    # If another shell is already installed, do not use mksh
-    [[ -x $initdir/bin/sh ]] && return
-
-    # Prefer mksh as /bin/sh if it is available.
-    inst /bin/mksh && ln -sf mksh "${initdir}/bin/sh"
-}

modules.d/00systemd-bootchart/module-setup.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    [[ "$mount_needs" ]] && return 1
+    [ -x $systemdutildir/systemd-bootchart ] || return 1
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_symlink /init /sbin/init
+    inst_multiple $systemdutildir/systemd-bootchart
+}

modules.d/00systemd-network-management/module-setup.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# This file is part of dracut.
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Prerequisite check(s) for module.
-check() {
-
-    # Return 255 to only include the module, if another module requires it.
-    return 255
-
-}
-
-# Module dependency requirements.
-depends() {
-
-    # This module has external dependency on other module(s).
-    echo systemd systemd-hostnamed systemd-networkd systemd-resolved systemd-timedated systemd-timesyncd
-    # Return 0 to include the dependent module(s) in the initramfs.
-    return 0
-
-}

modules.d/00systemd/module-setup.sh

@@ -1,254 +0,0 @@
-#!/bin/bash
-# This file is part of dracut.
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Prerequisite check(s) for module.
-check() {
-    [[ $mount_needs ]] && return 1
-    # If the binary(s) requirements are not fulfilled the module can't be installed
-    require_binaries "$systemdutildir"/systemd || return 1
-    # Return 255 to only include the module, if another module requires it.
-    return 255
-}
-
-# called by dracut
-depends() {
-    return 0
-}
-
-installkernel() {
-    hostonly='' instmods autofs4 ipv6 algif_hash hmac sha256
-    instmods -s efivarfs
-}
-
-# called by dracut
-install() {
-    local _mods
-
-    if [[ $prefix == /run/* ]]; then
-        dfatal 'systemd does not work with a prefix, which contains "/run"!!'
-        exit 1
-    fi
-
-    inst_multiple -o \
-        "$systemdutildir"/systemd \
-        "$systemdutildir"/systemd-coredump \
-        "$systemdutildir"/systemd-cgroups-agent \
-        "$systemdutildir"/systemd-shutdown \
-        "$systemdutildir"/systemd-reply-password \
-        "$systemdutildir"/systemd-fsck \
-        "$systemdutildir"/systemd-udevd \
-        "$systemdutildir"/systemd-journald \
-        "$systemdutildir"/systemd-sysctl \
-        "$systemdutildir"/systemd-modules-load \
-        "$systemdutildir"/systemd-vconsole-setup \
-        "$systemdutildir"/systemd-volatile-root \
-        "$systemdutildir"/system-generators/systemd-debug-generator \
-        "$systemdutildir"/system-generators/systemd-fstab-generator \
-        "$systemdutildir"/system-generators/systemd-gpt-auto-generator \
-        \
-        "$systemdsystemunitdir"/debug-shell.service \
-        "$systemdsystemunitdir"/cryptsetup.target \
-        "$systemdsystemunitdir"/cryptsetup-pre.target \
-        "$systemdsystemunitdir"/remote-cryptsetup.target \
-        "$systemdsystemunitdir"/emergency.target \
-        "$systemdsystemunitdir"/sysinit.target \
-        "$systemdsystemunitdir"/basic.target \
-        "$systemdsystemunitdir"/halt.target \
-        "$systemdsystemunitdir"/kexec.target \
-        "$systemdsystemunitdir"/local-fs.target \
-        "$systemdsystemunitdir"/local-fs-pre.target \
-        "$systemdsystemunitdir"/remote-fs.target \
-        "$systemdsystemunitdir"/remote-fs-pre.target \
-        "$systemdsystemunitdir"/multi-user.target \
-        "$systemdsystemunitdir"/network.target \
-        "$systemdsystemunitdir"/network-pre.target \
-        "$systemdsystemunitdir"/network-online.target \
-        "$systemdsystemunitdir"/nss-lookup.target \
-        "$systemdsystemunitdir"/nss-user-lookup.target \
-        "$systemdsystemunitdir"/poweroff.target \
-        "$systemdsystemunitdir"/reboot.target \
-        "$systemdsystemunitdir"/rescue.target \
-        "$systemdsystemunitdir"/rpcbind.target \
-        "$systemdsystemunitdir"/shutdown.target \
-        "$systemdsystemunitdir"/final.target \
-        "$systemdsystemunitdir"/sigpwr.target \
-        "$systemdsystemunitdir"/sockets.target \
-        "$systemdsystemunitdir"/swap.target \
-        "$systemdsystemunitdir"/timers.target \
-        "$systemdsystemunitdir"/paths.target \
-        "$systemdsystemunitdir"/umount.target \
-        \
-        "$systemdsystemunitdir"/sys-kernel-config.mount \
-        \
-        "$systemdsystemunitdir"/kmod-static-nodes.service \
-        "$systemdsystemunitdir"/systemd-tmpfiles-setup.service \
-        "$systemdsystemunitdir"/systemd-tmpfiles-setup-dev.service \
-        "$systemdsystemunitdir"/systemd-ask-password-console.path \
-        "$systemdsystemunitdir"/systemd-udevd-control.socket \
-        "$systemdsystemunitdir"/systemd-udevd-kernel.socket \
-        "$systemdsystemunitdir"/systemd-ask-password-plymouth.path \
-        "$systemdsystemunitdir"/systemd-journald.socket \
-        "$systemdsystemunitdir"/systemd-journald-audit.socket \
-        "$systemdsystemunitdir"/systemd-ask-password-console.service \
-        "$systemdsystemunitdir"/systemd-modules-load.service \
-        "$systemdsystemunitdir"/systemd-halt.service \
-        "$systemdsystemunitdir"/systemd-poweroff.service \
-        "$systemdsystemunitdir"/systemd-reboot.service \
-        "$systemdsystemunitdir"/systemd-kexec.service \
-        "$systemdsystemunitdir"/systemd-fsck@.service \
-        "$systemdsystemunitdir"/systemd-udevd.service \
-        "$systemdsystemunitdir"/systemd-udev-trigger.service \
-        "$systemdsystemunitdir"/systemd-udev-settle.service \
-        "$systemdsystemunitdir"/systemd-ask-password-plymouth.service \
-        "$systemdsystemunitdir"/systemd-journald.service \
-        "$systemdsystemunitdir"/systemd-vconsole-setup.service \
-        "$systemdsystemunitdir"/systemd-volatile-root.service \
-        "$systemdsystemunitdir"/systemd-random-seed-load.service \
-        "$systemdsystemunitdir"/systemd-random-seed.service \
-        "$systemdsystemunitdir"/systemd-sysctl.service \
-        \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-modules-load.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-ask-password-console.path \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-journald.service \
-        "$systemdsystemunitdir"/sockets.target.wants/systemd-udevd-control.socket \
-        "$systemdsystemunitdir"/sockets.target.wants/systemd-udevd-kernel.socket \
-        "$systemdsystemunitdir"/sockets.target.wants/systemd-journald.socket \
-        "$systemdsystemunitdir"/sockets.target.wants/systemd-journald-audit.socket \
-        "$systemdsystemunitdir"/sockets.target.wants/systemd-journald-dev-log.socket \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-udevd.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-udev-trigger.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/kmod-static-nodes.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-tmpfiles-setup.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-tmpfiles-setup-dev.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-sysctl.service \
-        \
-        "$systemdsystemunitdir"/ctrl-alt-del.target \
-        "$systemdsystemunitdir"/reboot.target \
-        "$systemdsystemunitdir"/systemd-reboot.service \
-        "$systemdsystemunitdir"/syslog.socket \
-        \
-        "$systemdsystemunitdir"/slices.target \
-        "$systemdsystemunitdir"/system.slice \
-        "$systemdsystemunitdir"/-.slice \
-        \
-        "$tmpfilesdir"/systemd.conf \
-        \
-        journalctl systemctl \
-        echo swapoff \
-        kmod insmod rmmod modprobe modinfo depmod lsmod \
-        mount umount reboot poweroff \
-        systemd-run systemd-escape \
-        systemd-cgls systemd-tmpfiles \
-        systemd-ask-password systemd-tty-ask-password-agent \
-        /etc/udev/udev.hwdb
-
-    inst_multiple -o \
-        /usr/lib/modules-load.d/*.conf \
-        /usr/lib/sysctl.d/*.conf
-
-    modules_load_get() {
-        local _line i
-        for i in "$dracutsysrootdir$1"/*.conf; do
-            [[ -f $i ]] || continue
-            while read -r _line || [ -n "$_line" ]; do
-                case $_line in
-                    \#*) ;;
-
-                    \;*) ;;
-
-                    *)
-                        echo "$_line"
-                        ;;
-                esac
-            done < "$i"
-        done
-    }
-
-    mapfile -t _mods < <(modules_load_get /usr/lib/modules-load.d)
-    [[ ${#_mods[@]} -gt 0 ]] && hostonly='' instmods "${_mods[@]}"
-
-    if [[ $hostonly ]]; then
-        inst_multiple -H -o \
-            /etc/systemd/journald.conf \
-            /etc/systemd/journald.conf.d/*.conf \
-            /etc/systemd/system.conf \
-            /etc/systemd/system.conf.d/*.conf \
-            /etc/hosts \
-            /etc/hostname \
-            /etc/nsswitch.conf \
-            /etc/machine-id \
-            /etc/machine-info \
-            /etc/vconsole.conf \
-            /etc/locale.conf \
-            /etc/modules-load.d/*.conf \
-            /etc/sysctl.d/*.conf \
-            /etc/sysctl.conf \
-            /etc/udev/udev.conf
-
-        mapfile -t _mods < <(modules_load_get /etc/modules-load.d)
-        [[ ${#_mods[@]} -gt 0 ]] && hostonly='' instmods "${_mods[@]}"
-    fi
-
-    if ! [[ -e "$initdir/etc/machine-id" ]]; then
-        : > "$initdir/etc/machine-id"
-    fi
-
-    # install adm user/group for journald
-    inst_multiple nologin
-    {
-        grep '^systemd-journal:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
-        grep '^adm:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
-        # we don't use systemd-networkd, but the user is in systemd.conf tmpfiles snippet
-        grep '^systemd-network:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
-    } >> "$initdir/etc/passwd"
-
-    {
-        grep '^systemd-journal:' "$dracutsysrootdir"/etc/group 2> /dev/null
-        grep '^wheel:' "$dracutsysrootdir"/etc/group 2> /dev/null
-        grep '^adm:' "$dracutsysrootdir"/etc/group 2> /dev/null
-        grep '^utmp:' "$dracutsysrootdir"/etc/group 2> /dev/null
-        grep '^root:' "$dracutsysrootdir"/etc/group 2> /dev/null
-        # we don't use systemd-networkd, but the user is in systemd.conf tmpfiles snippet
-        grep '^systemd-network:' "$dracutsysrootdir"/etc/group 2> /dev/null
-    } >> "$initdir/etc/group"
-
-    ln_r "$systemdutildir"/systemd "/init"
-    ln_r "$systemdutildir"/systemd "/sbin/init"
-
-    inst_binary true
-    ln_r "$(find_binary true)" "/usr/bin/loginctl"
-    ln_r "$(find_binary true)" "/bin/loginctl"
-    inst_rules \
-        70-uaccess.rules \
-        71-seat.rules \
-        73-seat-late.rules \
-        90-vconsole.rules \
-        99-systemd.rules
-
-    for i in \
-        emergency.target \
-        rescue.target \
-        systemd-ask-password-console.service \
-        systemd-ask-password-plymouth.service; do
-        [[ -f "$systemdsystemunitdir"/$i ]] || continue
-        $SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
-    done
-
-    mkdir -p "$initdir/etc/systemd"
-    # We must use a volatile journal, and we don't want rate-limiting
-    {
-        echo "[Journal]"
-        echo "Storage=volatile"
-        echo "RateLimitInterval=0"
-        echo "RateLimitBurst=0"
-    } >> "$initdir/etc/systemd/journald.conf"
-
-    $SYSTEMCTL -q --root "$initdir" set-default multi-user.target
-
-    # Install library file(s)
-    _arch=${DRACUT_ARCH:-$(uname -m)}
-    inst_libdir_file \
-        {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
-
-}

modules.d/00warpclock/module-setup.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-# called by dracut
-check() {
-    # hwclock does not exist on S390(x), bail out silently then
-    local _arch=${DRACUT_ARCH:-$(uname -m)}
-    [ "$_arch" = "s390" -o "$_arch" = "s390x" ] && return 1
-
-    [ -e /etc/localtime -a -e /etc/adjtime ] || return 1
-    require_binaries /sbin/hwclock || return 1
-
-    return 255
-}
-
-# called by dracut
-depends() {
-    return 0
-}
-
-# called by dracut
-install() {
-    inst /usr/share/zoneinfo/UTC
-    inst /etc/localtime
-    inst /etc/adjtime
-    inst_hook pre-trigger 00 "$moddir/warpclock.sh"
-    inst /sbin/hwclock
-}

modules.d/00warpclock/warpclock.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if test -e /etc/adjtime; then
-    while read -r line; do
-        if test "$line" = LOCAL; then
-            hwclock --systz
-        fi
-    done < /etc/adjtime
-fi

modules.d/01fips/fips-boot.sh

@@ -1,12 +1,10 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-
-if ! fipsmode=$(getarg fips) || [ "$fipsmode" = "0" ]; then
-    rm -f -- /etc/modprobe.d/fips.conf > /dev/null 2>&1
-elif [ -z "$fipsmode" ]; then
-    die "FIPS mode have to be enabled by 'fips=1' not just 'fips'"
-elif getarg boot= > /dev/null; then
+if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
+elif getarg boot= >/dev/null; then
     . /sbin/fips.sh
     if mount_boot; then
         do_fips || die "FIPS integrity test failed"

modules.d/01fips/fips-load-crypto.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-
-if ! fipsmode=$(getarg fips) || [ "$fipsmode" = "0" ]; then
-    rm -f -- /etc/modprobe.d/fips.conf > /dev/null 2>&1
-elif [ -z "$fipsmode" ]; then
-    die "FIPS mode have to be enabled by 'fips=1' not just 'fips'"
-else
-    . /sbin/fips.sh
-    fips_load_crypto || die "FIPS integrity test failed"
-fi

modules.d/01fips/fips-noboot.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-if ! fipsmode=$(getarg fips) || [ "$fipsmode" = "0" ]; then
-    rm -f -- /etc/modprobe.d/fips.conf > /dev/null 2>&1
-elif [ -z "$fipsmode" ]; then
-    die "FIPS mode have to be enabled by 'fips=1' not just 'fips'"
+if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
 elif ! [ -f /tmp/fipsdone ]; then
     . /sbin/fips.sh
     mount_boot