Don't call udevadm control --exit in systemd mode

This partly reverts commit a43f97c4e3.

(cherry picked from commit 765d8408e9)

https://bugzilla.redhat.com/show_bug.cgi?id=1276983

.dir-locals.el

@@ -1,7 +1,2 @@
-;;; Directory Local Variables
-;;; For more information see (info "(emacs) Directory Variables")
-
-((sh-mode
-  (indent-tabs-mode)
-  (sh-basic-offset . 4)))
-
+(setq sh-basic-offset: 4)
+(setq indent-tabs-mode nil)

.gitignore

@@ -6,8 +6,6 @@
 /dracut-gencmdline.8
 /dracut.html
 /dracut.kernel.7
-/dracut.pc
-/dracut-install
 /modules.d/99base/switch_root
 /test/*/test.log
 test*.img
@@ -17,7 +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

.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,30 +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>

.travis.yml

@@ -1,48 +0,0 @@
-language: generic
-sudo: required
-services:
-- docker
-env:
-  matrix:
-  - IMAGE=latest
-  - IMAGE=latest TESTS=01
-  - IMAGE=latest TESTS=12
-  - IMAGE=latest TESTS=20
-  - IMAGE=latest TESTS=50
-  - IMAGE=latest TESTS=30
-  - IMAGE=latest TESTS=31
-  - IMAGE=latest TESTS=60
-  - IMAGE=latest TESTS=70
-  - IMAGE=latest TESTS=99
-  - IMAGE=latest TESTS=02
-  - IMAGE=latest TESTS=03
-  - IMAGE=latest TESTS=04
-  - IMAGE=latest TESTS=10
-  - IMAGE=latest TESTS=11
-  - IMAGE=29 TESTS=13
-  - IMAGE=29 TESTS=14
-  - IMAGE=latest TESTS=15
-  - IMAGE=latest TESTS=17
-
-before_script:
-  - docker pull fedora:$IMAGE
-  - |
-    sudo modprobe kvm-intel nested=1 || :
-    sudo modprobe kvm-amd nested=1 || :
-    dmesg | tail || :
-  - git fetch --tags --unshallow
-  - |
-    git describe --abbrev=0 --tags || :
-    git describe --tags || :
-
-script:
-- docker run --privileged -it -v $(pwd)/:/dracut fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$ "$TESTS"
-
-notifications:
-  webhooks:
-    urls:
-    - https://webhooks.gitter.im/e/effa917ca3e0ed5fd00e
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-

50-dracut.install

@@ -1,59 +1,32 @@
-#!/bin/bash
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-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
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
 fi
 
-if [[ -d "$BOOT_DIR_ABS" ]]; then
-    INITRD="initrd"
-else
-    BOOT_DIR_ABS="/boot"
-    INITRD="initramfs-${KERNEL_VERSION}.img"
+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 "$COMMAND" in
+case "$1" 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 "$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
-        fi
-
-        if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-            read -r -d '' -a 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
-	dracut -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
+	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$3"/initrd "$2"
         ret=$?
 	;;
     remove)
-        rm -f -- "$BOOT_DIR_ABS/$INITRD"
+        rm -f -- "$3"/initrd
         ret=$?
 	;;
 esac

51-dracut-rescue-postinst.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
 
 export LANG=C
 

51-dracut-rescue.install

@@ -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
 
 export LANG=C
 
@@ -33,56 +35,32 @@ dropindirs_sort()
 
 [[ -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 MACHINE_ID < /etc/machine-id
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
 fi
 
-if ! [[ $MACHINE_ID ]]; then
-    exit 0
-fi
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
 
 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
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
 fi
-
 if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
-    read -r -d '' -a line < /proc/cmdline
-    for i in "${line[@]}"; do
-        [[ "${i#initrd=*}" != "$i" ]] && continue
-        BOOT_OPTIONS+=("$i")
-    done
+    readarray -t BOOT_OPTIONS < /proc/cmdline
 fi
-
-if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-    echo "Could not determine the kernel command line parameters." >&2
-    echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
+if ! [[ $BOOT_OPTIONS ]]; then
     exit 1
 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
+LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"
+BOOT_DIR="/${MACHINE_ID}/0-rescue"
 
 ret=0
 
 case "$COMMAND" in
     add)
-        [[ -f "$LOADER_ENTRY" ]] && [[ -f "$BOOT_DIR_ABS/$KERNEL" ]] \
-            && [[ -f "$BOOT_DIR_ABS/$INITRD" ]] && exit 0
+        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
@@ -93,29 +71,21 @@ case "$COMMAND" in
 
         [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
 
-        if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS/$KERNEL"; then
-            echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/$KERNEL'!" >&2
+        if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then
+            echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&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
-            cp -aT "${KERNEL_IMAGE%/*}/bls.conf" $LOADER_ENTRY
-            sed -i 's/'$KERNEL_VERSION'/0-rescue-'${MACHINE_ID}'/' $LOADER_ENTRY
-        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+=$?))
         ;;
 
@@ -128,4 +98,6 @@ case "$COMMAND" in
         ret=1;;
 esac
 
+((ret+=$?))
+
 exit $ret

AUTHORS

@@ -1,228 +1,105 @@
 Harald Hoyer <harald@redhat.com>
 Victor Lowther <victor.lowther@gmail.com>
 Amadeusz Żołnowski <aidecoe@aidecoe.name>
-Hannes Reinecke <hare@suse.com>
 Will Woods <wwoods@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-Dave Young <dyoung@redhat.com>
 Jeremy Katz <katzj@redhat.com>
+Dave Young <dyoung@redhat.com>
 David Dillow <dave@thedillows.org>
 Michal Soltys <soltys@ziu.info>
-Colin Guthrie <colin@mageia.org>
-Daniel Molkentin <dmolkentin@suse.com>
 Amerigo Wang <amwang@redhat.com>
-Thomas Renninger <trenn@suse.com>
-Lukas Nykryn <lnykryn@redhat.com>
-Alexander Tsoy <alexander@tsoy.me>
-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>
 Peter Jones <pjones@redhat.com>
 Andreas Thienemann <andreas@bawue.net>
-Peter Robinson <pbrobinson@fedoraproject.org>
-Fabian Vogt <fvogt@suse.com>
-Kairui Song <kasong@redhat.com>
+Hans de Goede <hdegoede@redhat.com>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
-Xunlei Pang <xlpang@redhat.com>
-Daniel Drake <drake@endlessm.com>
-Lubomir Rintel <lkundrak@v3.sk>
-Angelo "pallotron" Failla <pallotron@fb.com>
-Brian C. Lane <bcl@redhat.com>
-Ville Skyttä <ville.skytta@iki.fi>
-Cristian Rodríguez <crrodriguez@opensuse.org>
+WANG Chao <chaowang@redhat.com>
+Daniel Drake <dsd@laptop.org>
 Dan Horák <dhorak@redhat.com>
 Baoquan He <bhe@redhat.com>
-Brendan Germain <brendan.germain@nasdaqomx.com>
-Colin Walters <walters@verbum.org>
 Leho Kraav <leho@kraav.com>
-Moritz Maxeiner <moritz@ucworks.org>
-Nicolas Chauvet <kwizart@gmail.com>
-Ondrej Mosnacek <omosnace@redhat.com>
-Fabian Deutsch <fabiand@fedoraproject.org>
-Javier Martinez Canillas <javierm@redhat.com>
+Brian C. Lane <bcl@redhat.com>
 Kamil Rytarowski <n54@gmx.com>
-Lidong Zhong <lidong.zhong@suse.com>
 Marc Grimme <grimme@atix.de>
-NeilBrown <neilb@suse.de>
-Peter Rajnoha <prajnoha@redhat.com>
-Radek Vykydal <rvykydal@redhat.com>
-Thorsten Behrens <tbehrens@suse.com>
 Chao Wang <chaowang@redhat.com>
 Frederic Crozat <fcrozat@suse.com>
-James Lee <jlee@thestaticvoid.com>
 Jesse Keating <jkeating@redhat.com>
-Martin Wilck <mwilck@suse.de>
-Mike Gilbert <floppym@gentoo.org>
 Milan Broz <mbroz@redhat.com>
-Mimi Zohar <zohar@linux.vnet.ibm.com>
+Radek Vykydal <rvykydal@redhat.com>
 Roberto Sassu <roberto.sassu@polito.it>
-Stefan Reimer <it@startux.de>
-Adam Williamson <awilliam@redhat.com>
 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>
-Jan Synacek <jsynacek@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>
 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>
-Vasiliy Tolstov <v.tolstov@selfip.ru>
+Peter Rajnoha <prajnoha@redhat.com>
 Wim Muskee <wimmuskee@gmail.com>
-tpgxyz <tpgxyz@gmail.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Alan Pevec <apevec@redhat.com>
-Alex Harpin <development@landsofshadow.co.uk>
-Ankit Kumar <ankit@linux.vnet.ibm.com>
-Antony Messerli <amesserl@rackspace.com>
-Chao Fan <cfan@redhat.com>
-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>
+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>
-Lukas Wunner <lukas@wunner.de>
 Mike Snitzer <snitzer@redhat.com>
-Minfei Huang <mhuang@redhat.com>
-Nikoli <nikoli@gmx.us>
-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>
-Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-Alexander Kurtz <alexander@kurtz.be>
+Adam Williamson <awilliam@redhat.com>
 Alexander Todorov <atodorov@redhat.com>
-Andreas Stieger <astieger@suse.com>
 Andy Lutomirski <luto@mit.edu>
 Anssi Hannula <anssi@mageia.org>
-Artem Savkov <asavkov@redhat.com>
-B. Wilson <x@wilsonb.com>
 Brandon Philips <brandon@ifup.co>
-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 Michael <david.michael@coreos.com>
+Dave Young <dave@redhat.com>
 Dennis Schridde <devurandom@gmx.net>
-Derek Higgins <derekh@redhat.com>
 Duane Griffin <duaneg@dghda.com>
-Elan Ruusamäe <glen@delfi.ee>
-Enno Boland <g@s01.de>
-Eugene Syromiatnikov <esyr@redhat.com>
-Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
-Florian Gamböck <mail@floga.de>
-François Cami <fcami@fedoraproject.org>
-Gerd von Egidy <gerd.von.egidy@intra2net.com>
 Glen Gray <slaine@slaine.org>
-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>
-Hui Wang <john.wanghui@huawei.com>
-Ignaz Forster <iforster@suse.com>
 James Laska <jlaska@redhat.com>
 Jan Stodola <jstodola@redhat.com>
-Jason Dana <jasondana@quarksecurity.com>
-Jeremy Linton <lintonrjeremy@gmail.com>
 Jiri Pirko <jiri@resnulli.us>
 Joe Lawrence <Joe.Lawrence@stratus.com>
-Johannes Thumshirn <jthumshirn@suse.com>
-Jonas Jonsson <jonas@websystem.se>
 Kevin Yung <Kevin.Yung@myob.com>
+Kyle McMartin <kyle@redhat.com>
 Lars R. Damerow <lars@pixar.com>
 Lennert Buytenhek <buytenh@wantstofly.org>
-Major Hayden <major@mhtx.net>
-Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Marian Csontos <mcsontos@redhat.com>
-Mark Fasheh <mfasheh@suse.de>
-Marko Myllynen <myllynen@redhat.com>
+Lubomir Rintel <lkundrak@v3.sk>
 Matt <smoothsailing72@hotmail.com>
 Matt Smith <shadowfax@gmx.com>
-Matthew Thode <mthode@mthode.org>
-Mei Liu <liumbj@linux.vnet.ibm.com>
-Michael Chapman <mike@very.puzzling.org>
-Michael McCracken <michael.mccracken@gmail.com>
-Michal Koutný <mkoutny@suse.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 Chauvet <kwizart@gmail.com>
+Nikoli <nikoli@lavabit.com>
 Olivier Blin <dev@blino.org>
-P J P <ppandit@redhat.com>
 Paolo Bonzini <pbonzini@redhat.com>
-Pavel Zhukov <pzhukov@redhat.com>
-Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
-Pekka Wallendahl <wyrmiyu@gmail.com>
-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>
-Renaud Métrich <rmetrich@redhat.com>
 Robert Buchholz <rbu@goodpoint.de>
-Ruben Kerkhof <ruben@rubenkerkhof.com>
-Rusty Bird <rustybird@openmailbox.org>
 Sergey Fionov <fionov@gmail.com>
-Shawn W Dunn <sfalken@opensuse.org>
 Srinivasa T N <seenutn@linux.vnet.ibm.com>
-Stijn Hoop <stijn@sandcat.nl>
-Sullivan (CTR), Austin <austin.sullivan.ctr@progeny.net>
 Thilo Bangert <thilo.bangert@gmx.net>
-Thomas Blume <thomas.blume@suse.com>
-Tobias Geerinckx <tobias.geerinckx@gmail.com>
-Tobias Klauser <tklauser@distanz.ch>
-Tom Gundersen <teg@jklm.no>
-Tomasz Paweł Gajc <tpgxyz@gmail.com>
+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>
-Vratislav Podzimek <vpodzime@redhat.com>
+Ville Skyttä <ville.skytta@iki.fi>
 Yanko Kaneti <yaneti@declera.com>
-Zhiguo Deng <bjzgdeng@linux.vnet.ibm.com>
-Ziyue Yang <ziyang@redhat.com>
-honza801 <honza801@gmail.com>
-jloeser <jloeser@suse.de>
-johannes <johannes.brechtmann@gmail.com>
-jonathan-teh <30538043+jonathan-teh@users.noreply.github.com>
 maximilian attems <max@stro.at>
-privb0x23 <privb0x23@users.noreply.github.com>
-tpg <tpgxyz@gmail.com>
-xtraeme <xtraeme@voidlinux.eu>

Makefile

@@ -1,7 +1,7 @@
 -include dracut-version.sh
 
-VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags --always 2>/dev/null || echo $(DRACUT_VERSION))
-GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags --always 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
+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
 
@@ -13,9 +13,8 @@ sysconfdir ?= ${prefix}/etc
 bindir ?= ${prefix}/bin
 mandir ?= ${prefix}/share/man
 CFLAGS ?= -O2 -g -Wall
-CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS)
+CFLAGS += -std=gnu99  -D_FILE_OFFSET_BITS=64
 bashcompletiondir ?= ${datadir}/bash-completion/completions
-pkgconfigdatadir ?= $(datadir)/pkgconfig
 
 man1pages = lsinitrd.1
 
@@ -28,27 +27,25 @@ man7pages = dracut.cmdline.7 \
 man8pages = dracut.8 \
             dracut-catimages.8 \
             mkinitrd.8 \
-            mkinitrd-suse.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
+            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 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 skipcpio/skipcpio
+all: dracut-version.sh dracut-install skipcpio/skipcpio
 
 DRACUT_INSTALL_OBJECTS = \
         install/dracut-install.o \
         install/hashmap.o\
         install/log.o \
-        install/strv.o \
         install/util.o
 
 # deps generated with gcc -MM
@@ -58,13 +55,8 @@ install/hashmap.o: install/hashmap.c install/util.h install/macro.h install/log.
 	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
-install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h
 
 install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
-	$(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS)
-
-logtee: logtee.c
-	$(CC) $(LDFLAGS) -o $@ $<
 
 dracut-install: install/dracut-install
 	ln -fs $< $@
@@ -86,34 +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 -d manpage -b docbook -o "$@" $<
+	asciidoc -d manpage -b docbook -o $@ $<
 
 dracut.8: dracut.usage.asc dracut.8.asc
 
 dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
-	@rm -f -- dracut.xml
 	asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc
-	@rm -f -- dracut.html
 	xsltproc -o dracut.html --xinclude -nonet \
 		--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: $(VERSION)$(GITVERSION)" >> 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)
@@ -142,10 +122,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 \
@@ -156,7 +136,7 @@ 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 \
@@ -173,11 +153,8 @@ endif
 	mkdir -p $(DESTDIR)${bashcompletiondir}
 	install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
 	install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
-	mkdir -p $(DESTDIR)${pkgconfigdatadir}
-	install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
 
 dracut-version.sh:
-	@rm -f dracut-version.sh
 	@echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh
 
 clean:
@@ -186,54 +163,40 @@ 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 install/dracut-install $(DRACUT_INSTALL_OBJECTS)
 	$(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
 	$(RM) $(manpages) dracut.html
 	$(MAKE) -C test clean
 
-dist: dracut-$(VERSION).tar.xz
+dist: dracut-$(VERSION).tar.bz2
 
-dracut-$(VERSION).tar.xz: doc syncheck
+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.xz dracut-$(VERSION)
-	xz -9 dracut-$(VERSION).tar
+	rm -fr -- dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
+	bzip2 -9 dracut-$(VERSION).tar
 	rm -f -- dracut-$(VERSION).tar
 
-rpm: dracut-$(VERSION).tar.xz syncheck
+rpm: dracut-$(VERSION).tar.bz2 syncheck
 	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
-	cp dracut-$(VERSION).tar.xz "$$rpmbuild"; \
+	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
 	LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
-	(cd "$$rpmbuild"; \
-	wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
 	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
-	( mv "$$rpmbuild"/{,$$(arch)/}*.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
-
-srpm: dracut-$(VERSION).tar.xz syncheck
-	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
-	cp dracut-$(VERSION).tar.xz "$$rpmbuild"; \
-	LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < 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 )
+	( 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 mkinitrd-dracut.sh modules.d/*/*.sh \
 	                modules.d/*/module-setup.sh; do \
@@ -245,11 +208,7 @@ check: all syncheck rpm
 	@$(MAKE) -C test check
 
 testimage: all
-	./dracut.sh -N -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
-	@echo wrote  test-$(shell uname -r).img
-
-debugtestimage: all
-	./dracut.sh --debug -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img
 
 testimages: all
@@ -258,24 +217,16 @@ testimages: all
 	./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-$(shell uname -r).img $(shell uname -r)
-	@echo wrote  test-$(shell uname -r).img
-
 hostimage: all
 	./dracut.sh -H -l -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img
 
-efi: all
-	./dracut.sh --uefi -H -l -f linux-$(shell uname -r).efi $(shell uname -r)
-	@echo wrote linux-$(shell uname -r).efi
-
 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
 
-dracut.html.sign: dracut-$(VERSION).tar.xz dracut.html
-	gpg-sign-all dracut-$(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-$(VERSION).tar.xz dracut-$(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

@@ -1,774 +1,3 @@
-dracut-049
-==========
-lsinitrd:
-- record loaded kernel modules when hostonly mode is enabled
-  lsinitrd $image -f */lib/dracut/loaded-kernel-modules.txt
-- allow to only unpack certain files
-
-kernel-modules:
-- add gpio and pinctrl drivers for arm*/aarch64
-- add nfit
-
-kernel-network-modules:
-- add vlan kernel modules
-
-ifcfg/write-ifcfg.sh:
-- aggregate resolv.conf
-
-livenet:
-- Enable OverlayFS overlay in sysroot.mount generator.
-
-dmsquash-live:
-- Support a flattened squashfs.img
-
-dracut-systemd:
-- Start systemd-vconsole-setup before dracut-cmdline-ask
-
-iscsi:
-- do not install all of /etc/iscsi unless hostonly
-- start iscsid even w/o systemd
-
-multipath:
-- fixed shutdown
-
-network:
-- configure NetworkManager to use dhclient
-
-mdraid:
-- fixed uuid handling ":" versus "-"
-
-stratis:
-- Add additional binaries
-
-new modules:
-- 00warpclock
-- 99squash
-  Adds support for building a squashed initramfs
-- 35network-legacy
-  the old 40network
-- 35network-manager
-  alternative to 35network-legacy
-- 90kernel-modules-extra
-  adds out-of-tree kernel modules
-
-testsuite:
-- now runs on travis
-- support new qemu device options
-- even runs without kvm now
-
-dracut-048
-==========
-
-dracut.sh:
-- fixed finding of btrfs devices
-- harden dracut against BASH_ENV environment variable
-- no more prelinking
-- scan and install "external" kernel modules
-- fixed instmods with zero input
-- rdsosreport: best effort to strip out passwords
-- introduce tri-state hostonly mode
-
-   Add a new option --hostonly-mode which accept an <mode> parameter, so we have a tri-state hostonly mode:
-
-        * generic: by passing "--no-hostonly" or not passing anything.
-                   "--hostonly-mode" has no effect in such case.
-        * sloppy: by passing "--hostonly --hostonly-mode sloppy". This
-                  is also the default mode when only "--hostonly" is given.
-        * strict: by passing "--hostonly --hostonly-mode strict".
-
-    Sloppy mode is the original hostonly mode, the new introduced strict
-    mode will allow modules to ignore more drivers or do some extra job to
-    save memory and disk space, while making the image less portable.
-
-    Also introduced a helper function "optional_hostonly" to make it
-    easier for modules to leverage new hostonly mode.
-
-    To force install modules only in sloppy hostonly mode, use the form:
-
-    hostonly="$(optional_hostonly)" instmods <modules>
-
-dracut-install:
-- don't error out, if no modules were installed
-- support modules.softdep
-
-lsinitrd.sh:
-- fixed zstd file signature
-
-kernel:
-- include all pci/host modules
-- add mmc/core for arm
-- Include Intel Volume Management Device support
-
-plymouth:
-- fix detection of plymouth directory
-
-drm:
-- make failing installation of drm modules nonfatal
-- include virtio DRM drivers in hostonly initramfs
-
-stratis:
-- initial Stratis support
-
-crypt:
-- correct s390 arch to include arch-specific crypto modules
-- add cmdline rd.luks.partuuid
-- add timeout option rd.luks.timeout
-
-shutdown:
-- sleep a little, if a process was killed
-
-network:
-- introduce ip=either6 option
-
-iscsi:
-- replace iscsistart with iscsid
-
-qeth_rules:
-- new module to copy qeth rules
-
-multipath-hostonly:
-- merged back into multipath
-
-mdraid:
-- fixed case if rd.md.uuid is in ID_FS_UUID format
-
-dracut-047
-==========
-dracut.sh:
-- sync initramfs to filesystem with fsfreeze
-- introduce "--no-hostonly-default-device"
-- disable lsinitrd logging when quiet
-- add support for Zstandard compression
-- fixed relative paths in --kerneldir
-- if /boot/vmlinuz-$version exists use /boot/ as default output dir
-- make qemu and qemu-net a default module in non-hostonly mode
-- fixed relative symlinks
-- support microcode updates for all AMD CPU families
-- install all modules-load.d regardless of hostonly
-- fixed parsing of "-i" and "--include"
-- bump kmod version to >= 23
-- enable 'early_microcode' by default
-- fixed check_block_and_slaves() for nvme
-
-lsinitrd.sh:
-- dismiss "cat" error messages
-
-systemd-bootchart:
-- removed
-
-i18n:
-- install all keymaps for a given locale
-- add correct fontmaps
-
-dmsquash-live:
-- fixed systemd unit escape
-
-systemd:
-- enable core dumps with systemd from initrd
-- fixed setting of timeouts for device units
-- emergency.service: use Type=idle and fixed task limit
-
-multipath:
-- include files from /etc/multipath/conf.d
-- do not fail startup on missing configuration
-- start daemon after udev settle
-- add shutdown script
-- parse kernel commandline option 'multipath=off'
-- start before local-fs-pre.target
-
-dracut-emergency:
-- optionally print filesystem help
-
-network:
-- fixed MTU for bond master
-- fixed race condition when wait for networks
-
-fcoe:
-- handle CNAs with DCB firmware support
-- allow to specify the FCoE mode via the fcoe= parameter
-- always set AUTO_VLAN for fcoemon
-- add shutdown script
-- fixup fcoe-genrules.sh for VN2VN mode
-- switch back to using fipvlan for bnx2fc
-- add timeout mechanism
-
-crypt:
-- add basic LUKS detached header support
-- escape backslashes for systemd unit names correctly
-- put block_uuid.map into initramfs
-
-dmraid:
-- do not delete partitions
-
-dasd_mod:
-- do not set module parameters if dasd_cio_free is not present
-
-nfs:
-- fix mount if IPv4 address is used in /etc/fstab
-- support host being a DNS ALIAS
-
-fips:
-- fixed creating path to .hmac of kernel based on BOOT_IMAGE
-
-lunmask:
-- add module to handle LUN masking
-
-s390:
-- add rd.cio_accept
-
-dcssblk:
-- add new module for DCSS block devices
-
-zipl:
-- add new module to update s390x configuration
-
-iscsi:
-- no more iscsid, either iscsistart or iscsid
-
-integrity:
-- support loading x509 into the trusted/builtin .evm keyring
-- support X.509-only EVM configuration
-
-plymouth:
-- improve distro compatibility
-
-dracut-046
-==========
-
-dracut.sh:
-- bail out if module directory does not exist
-  if people want to build the initramfs without kernel modules,
-  then --no-kernel should be specified
-- add early microcode support for AMD family 16h
-- collect also all modaliases modules from sysfs for hostonly modules
-- sync initramfs after creation
-
-network:
-- wait for IPv6 RA if using none/static IPv6 assignment
-- ipv6 improvements
-- Handle curl using libnssckbi for TLS
-- fix dhcp classless_static_routes
-- dhclient: send client-identifier matching hardware address
-- don't arping for point-to-point connections
-- only bring up wired network interfaces (no wlan and wwan)
-
-mraid:
-- mdraid: wait for rd.md.uuid specified devices to be assembled
-
-crypt:
-- handle rd.luks.name
-
-crypt-gpg:
-- For GnuPG >= 2.1 support OpenPGP smartcards
-
-kernel-install:
-- Skip to create initrd if /etc/machine-id is missing or empty
-
-nfs:
-- handle rpcbind /run/rpcbind directory
-
-s390:
-- various fixes
-
-dmsquash-live:
-- add NTFS support
-
-multipath:
-- split out multipath-hostonly module
-
-lvmmerge:
-- new module, see README.md in the module directory
-
-dracut-systemd:
-- fixed dependencies
-
-
-dracut-045
-==========
-
-Important: dracut now requires libkmod for the dracut-install binary helper,
-           which nows handles kernel module installing and filtering.
-
-dracut.sh:
-- restorecon final image file
-- fail hard, if we find modules and modules.dep is missing
-- support --tmpdir as a relative path
-- add default path for --uefi
-
-dracut-functions.sh:
-- fix check_vol_slaves() volume group name stripping
-
-dracut-install:
-- catch ldd message "cannot execute binary file"
-- added kernel module handling with libkmod
-  Added parameters:
-    --module,-m
-    --mod-filter-path, -p
-    --mod-filter-nopath, -P
-    --mod-filter-symbol, -s
-    --mod-filter-nosymbol, -S
-    --mod-filter-noname, -N
-    --silent
-    --kerneldir
-    --firmwaredirs
-- fallback to non-hostonly mode if lsmod fails
-
-lsinitrd:
-- new option "--unpack"
-- new option "--unpackearly"
-- and "--verbose"
-
-general initramfs fixes:
-- don't remove 99-cmdline-ask on 'hostonly' cleanup
-- call dracut-cmdline-ask.service, if /etc/cmdline.d/*.conf exists
-- break at switch_root only for bare rd.break
-- add rd.emergency=[reboot|poweroff|halt]
-  specifies what action to execute in case of a critical failure
-- rd.memdebug=4 gives information, about kernel module memory consumption
-  during loading
-
-dmsquash-live:
-- fixed livenet-generator execution flag
-  and include only, if systemd is used
-- fixed dmsquash-live-root.sh for cases where the fstype of the liveimage is squashfs
-- fixed typo for rootfs.img
-- enable the use of the OverlayFS for the LiveOS root filesystem
-  Patch notes:
-    Integrate the option to use an OverlayFS as the root filesystem
-    into the 90dmsquash-live module for testing purposes.
-
-    The rd.live.overlay.overlayfs option allows one to request an
-    OverlayFS overlay.  If a persistent overlay is detected at the
-    standard LiveOS path, the overlay & type detected will be used.
-
-    Tested primarily with transient, in-RAM overlay boots on vfat-
-    formatted Live USB devices, with persistent overlay directories
-    on ext4-formatted Live USB devices, and with embedded, persistent
-    overlay directories on vfat-formatted devices. (Persistent overlay
-    directories on a vfat-formatted device must be in an embedded
-    filesystem that supports the creation of trusted.* extended
-    attributes, and must provide valid d_type in readdir responses.)
-
-    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.
-
-    The default transient DM overlay size has been adjusted up to 32 GiB.
-    This change supports comparison of transient Device-mapper vs.
-    transient OverlayFS overlay performance.  A transient DM overlay
-    is a sparse file in memory, so this setting does not consume more
-    RAM for legacy applications.  It does permit a user to use all of
-    the available root filesystem storage, and fails gently when it is
-    consumed, as the available free root filesystem storage on a typical
-    LiveOS build is only a few GiB.  Thus, when booted on other-
-    than-small RAM systems, the transient DM overlay should not overflow.
-
-    OverlayFS offers the potential to use all of the available free RAM
-    or all of the available free disc storage (on non-vfat-devices)
-    in its overlay, even beyond the root filesystem available space,
-    because the OverlayFS root filesystem is a union of directories on
-    two different partitions.
-
-    This patch also cleans up some message spew at shutdown, shortens
-    the execution path in a couple of places, and uses persistent
-    DM targets where required.
-
-dmraid:
-- added "nowatch" option in udev rule, otherwise udev would reread partitions for raid members
-- allow booting from degraded MD RAID arrays
-
-shutdown:
-- handle readonly /run on shutdown
-
-kernel-modules:
-- add all HID drivers, regardless of hostonly mode
-  people swap keyboards sometimes and should be able to enter their disk password
-- add usb-storage
-  To save the rdsosreport.txt to a USB stick, the usb-storage module is needed.
-- add xennet
-- add nvme
-
-systemd:
-- add /etc/machine-info
-- fixed systemd-escape call for names beginning with "-"
-- install missing drop-in configuration files for
-    /etc/systemd/{journal.conf,system.conf}
-
-filesystems:
-- add support to F2FS filesystem (fsck and modules)
-
-network:
-- fix carrier detection
-- correctly set mac address for ip=...:<mtu>:<mac>
-- fixed vlan, bonding, bridging, team logic
-  call ifup for the slaves and assemble afterwards
-- add mtu to list of variables to store in override
-- for rd.neednet=0 a bootdev is not needed anymore
-- dhclient-script.sh: add classless-static-routes support
-- support for iBFT IPv6
-- support macaddr in brackets [] (commit 740c46c0224a187d6b5a42b4aa56e173238884cc)
-- use arping2, if available
-- support multiple default gateways from DHCP server
-- fixup VLAN handling
-- enhance team support
-- differ between ipv6 local and global tentative
-- ipv6: wait for a router advertised route
-- add 'mtu' parameter for bond options
-- use 'ip' instead of 'brctl'
-
-nbd:
-- add systemd generator
-- use export names instead of port numbers, because port number based
-  exports are deprecated and were removed.
-
-fcoe:
-- no more /dev/shm state copying
-
-multipath:
-- check all /dev/mapper devices if they are multipath devices, not only mpath*
-
-fips:
-- fixed .hmac installation in FIPS mode
-
-plymouth:
-- also trigger the acpi subsystem
-
-syslog:
-- add imjournal.so to read systemd journal
-- move start from udev to initqueue/online
-
-caps:
-- make it a non default module
-
-livenet:
-- support nfs:// urls in livenet-generator
-
-nfs:
-- install all nfs modules non-hostonly
-
-crypt:
-- support keyfiles embedded in the initramfs
-
-testsuite:
-- add TEST-70-BONDBRIDGETEAMVLAN
-- make "-cpu host" the default
-
-dracut-044
-==========
-creation:
-- better udev & systemd dir detection
-- split dracut-functions.sh in dracut-init.sh and dracut-functions.sh
-  dracut-functions.sh can now be sourced by external tools
-- detect all btrfs devices needed
-- added flag file if initqueue is needed
-- don't overwrite anything, if initramfs image file creation failed
-- if no compressor is specified, try to find a suitable one
-- drop scanning kernel config for CONFIG_MICROCODE_*_EARLY
-- remove "_EARLY" from CONFIG_MICROCODE_* checks
-- dracut.sh: add command line option for install_i18_all
-  --no-hostonly-i18n -> install_i18n_all=yes
-  --hostonly-i18n -> install_i18n_all=no
-- --no-reproducible to turn off reproducible mode
-- dracut-function.sh can now be sourced from outside of dracut
-- dracut-init.sh contains all functions, which only can be used from
-  within the dracut infrastructure
-- support --mount with just mountpoint as a parameter
-- removed action_on_fail support
-- removed host_modalias concept
-- do not create microcode, if no firmware is available
-- skip gpg files in microcode generation
-
-initramfs:
-- ensure pre-mount (and resume) run before root fsck
-- add --online option to initqueue
-
-qemu:
-- fixed virtual machine detection
-
-lvm:
-- remove all quirk arguments for lvm >= 2.2.221
-
-dmsquash:
-- fixup for checkisomd5
-- increase timeout for checkisomd5
-- use non-persistent metadata snapshots for transient overlays.
-- overflow support for persistent snapshot.
-- use non-persistent metadata snapshots.
-- avoid an overlay for persistent, uncompressed, read-write live installations.
-
-multipath:
-- multipath.conf included in hostonly mode
-- install all multipath path selector kernel modules
-
-iSCSI:
-- use the iBFT initiator name, if found and set
-- iscsid now present in the initramfs
-- iscsistart is done with systemd-run asynchrone to do things in
-  paralllel. Also restarted for every new interface which shows up.
-- If rd.iscsi.waitnet (default) is set, iscsistart is done only
-  after all interfaces are up.
-- If not all interfaces are up and rd.iscsi.testroute (default) is set,
-  the route to a iscsi target IP is checked and skipped, if there is none.
-- If all things fail, we issue a "dummy" interface iscsiroot to retry
-  everything in the initqueue/timeout.
-
-network:
-- added DHCP RENEW/REBIND
-- IPv4 DHCP lease time now optional (bootp)
-- IPv6 nfs parsing
-- fixed IPv6 route parsing
-- rd.peerdns=0 parameter to disable DHCP nameserver setting
-- detect duplicate IPv4 addresses for static addresses
-- if interfaces are specified with its enx* name, bind the correspondent MAC to the interface name
-- if multiple "ip=" are present on the kernel command line "rd.neednet=1" is assumed
-- add options to tweak timeouts
-     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 5 seconds.
-
-IMA:
-- load signed certificates in the IMA keyring, see modules.d/98integrity/README
-- load EVM public key in the kernel _evm keyring
-
-FCoE:
-    fcoe: start with fcoemon instead of fipvlan
-
-dracut-043
-==========
-- add missing dmsquash-generator
-
-dracut-042
-==========
-- fixed dmsetup shutdown
-- new kernel command line option "rd.live.overlay.thin"
-    This option changes the underlying mechanism for the overlay in the
-    dmsquash module.
-    Instead of a plain dm snapshot a dm thin snapshot is used. The advantage
-    of the thin snapshot is, that the TRIM command is recognized, which
-    means that at runtime, only the occupied blocks will be claimed from
-    memory, and freed blocks will really be freed in ram.
-- dmsquash: Add squashfs support to rd.live.fsimg
-    Previously rd.live.fsimg only supported filesystems residing in
-    (compressed) archives.
-    Now rd.live.fsimg can also be used when a squashfs image is used.
-    This is achieved by extracting the rootfs image from the squashfs and
-    then continue with the default routines for rd.live.fsimg.
-- lvm: add support for LVM system id
-- split up the systemd dracut module
-    Basic systemd functionality is in 00systemd now.
-    Switching root and the initrd.target is in 00systemd-initrd.
-    Dracut additions to the systemd initrd are in 98dracut-systemd.
-- support for creating a UEFI boot executable via argument "--uefi"
-    With an EFI stub, the kernel, the initramfs and a kernel cmdline can be
-    glued together to a single UEFI executable, which can be booted by a
-    UEFI BIOS.
-- network: split out kernel-network-modules, now in 90kernel-network-modules
-- support for ethernet point-to-point connections configured via DHCP
-- kernel-modules: install all HID drivers
-- dracut.pc pkg-config file
-- mount /dev, /dev/shm and /run noexec
-
-dracut-041
-==========
-- fixed the shutdown loop
-- fixed gzip compression for versions, which do not have --rsyncable
-- fixed ifcfg generation for persistent interface names
-- multipath:
-  * new option to turn off multipath "rd.multipath=0" completly
-  * preload scsi dh modules
-  * start multipathd via systemd service
-- do not fail, if user pressed ESC during media check
-- fixed systemd-journal by symlinking /var/log to /run/initramfs/log
-- initrd-release moved to /usr/lib
-- lots of iSCSI fixes
-- new "rd.timeout" to specify the systemd JobTimeoutSec for devices
-- if $initrd/etc/cmdline.d/* has a "root=" and the kernel cmdline does not,
-  generate a mount unit for it
-- increased the initqueue timeout for non systemd initramfs to 180s
-- $initrd/etc/cmdline.d/ hostonly files are now generated for NFS
-- make use of systemd-hibernate-resume, if available
-- fixed ldconfig parsing for hwcap output
-- network: add support for comma separated autoconf options like ip=eth0:auto6,dhcp
-- new parameter "rd.live.overlay.size" to specify the overlay for live images
-- changed the test suite for the new sfdisk syntax
-- added cache tools for dm-cache setups
-
-dracut-040
-==========
-- fixed dracut module dependency checks
-- fixed test suite
-
-dracut-039
-==========
-- DRACUT_PATH can now be used to specify the PATH used by dracut
-  to search for binaries instead of the default
-  /usr/sbin:/sbin:/usr/bin:/bin
-  This should be set in the distribution config file
-  /usr/lib/dracut/dracut.conf.d/01-dist.conf
-- add "--loginstall <DIR>" and loginstall="<DIR>" options
-  to record all files, which are installed from the host fs
-- "rd.writable.fsimg" - support for read/write filesystem images
-- "rd.route" kernel command line parameter added
-- "--install-optional" and install_optional_items added
-- find plymouth pkglibdir on debian
-- torrent support for live images
-  root=live:torrent://example.com/liveboot.img.torrent
-  and generally added as a download handler
-- disable microcode, if the kernel does not support it
-- speed up ldconfig_paths()
-- more ARM modules
-- fixed inst*() functions and "-H" handling
-- fixed bridge setup
-- added --force-drivers parameter and force_drivers=+ config option
-  to enforce driver loading at early boot time
-- documented "iso-scan/filename" usage in grub
-- various bugfixes
-
-dracut-038
-==========
-- "rd.cmdline=ask" will ask the user on the console to enter additional
-  kernel command line parameters
-- "rd.hostonly=0" removes all "hostonly" added custom files,
-  which is useful in combination with "rd.auto" or other specific parameters,
-  if you want to boot on the same hardware, but the compiled in configuration
-  does not match your setup anymore
-- inst* functions and dracut-install now accept the "-H" flag, which logs all
-  installed files to /lib/dracut/hostonly-files. This is used to remove those
-  files, if rd.hostonly is given on the kernel command line
-- strstr now only does literal string match,
-  please use strglob and strglobin for globs
-- fixed unpacking of the microcode image on shutdown
-- added systemd-gpt-auto-generator
-- fcoe: wait for lldpad to be ready
-- network: handle "ip=dhcp6"
-- network: DCHPv6: set valid_lft and preferred_lft
-- dm: support dm-cache
-- fstab: do not mount and fsck from fstab if using systemd
-- break at switch_root only for bare rd.break and not for any rd.break=...
-- nbd: make use of "--systemd-mark", otherwise it gets killed on switch_root
-- fcoe-uefi: fixed cmdline parameter generation
-- iscsi: deprecate "ip=ibft", use "rd.iscsi.ibft[=1]" from now on
-- "lsinitrd -m" now only lists the dracut modules of the image
-- a lot of small bugfixes
-
-dracut-037
-==========
-- dracut: hostonly_cmdline variable and command line switch
-    Toggle hostonly cmdline storing in the initramfs
-    --hostonly-cmdline:
-        Store kernel command line arguments needed in the initramfs
-    --no-hostonly-cmdline:
-        Do not store kernel command line arguments needed in the initramfs
-- dracut: --mount now understands full fstab lines
-- dracut now also includes drivers from the /lib/modules/<version>/updates directory
-- dracut: only set the owner of files to 0:0, if generated as non-root
-- dracut now directly writes to the initramfs file
-- dracut: call lz4 with the legacy flag (linux kernel does not support the new format)
-- systemd: rootfs-generator generates JobTimeout=0 units for the root device
-- systemd: added the systemd-sysctl service
-- systemd: add 80-net-setup-link.rules and .link files for persistent interface renaming
-- systemd: make dracut-shutdown.service failure non-fatal
-- network: various IPv6 fixes
-- network: DCHCP for IPv6
-- network: understand ip=.....:<dns1>:<dns2>
-- network: parse ibft nameserver settings
-- shutdown: if kexec fails, just reboot
-- lvm: handle one LV at a time with lvchange
-- module-setup.sh:
-    New functions require_binaries() and require_any_binary() to be used
-    in the check() section of module-setup.sh.
-- a lot of small bugfixes
-
-Contributions from:
-Harald Hoyer
-Alexander Tsoy
-Till Maas
-Amadeusz Żołnowski
-Brian C. Lane
-Colin Guthrie
-Dave Young
-WANG Chao
-Shawn W Dunn
-
-dracut-036
-==========
-- fixed skipcpio signature checking
-
-dracut-035
-==========
-- changed dracut tarball compression to xz
-- new argument "--rebuild"
-- add lzo, lz4 compression
-- install: install all binaries with <name> found in PATH
-- lsinitrd can now handle initramfs images with an early cpio prepended
-  (microcode, ACPI tables)
-- mkinitrd-suse added as a compat stub for dracut
-- lvm: install thin utils for non-hostonly
-- resume: fix swap detection in hostonly
-- avoid loading unnecessary 32-bit libraries for 64-bit initrds
-- crypt: wait for systemd password agents
-- crypt: skip crypt swaps with password files
-- network: before doing dhcp, dracut now checks, if the link has a carrier
-- network: dhclient-script.sh now sets the lease time
-- network: include usbnet drivers
-- network: include all ethernet drivers
-- network: add rd.bootif=0 to ignore BOOTIF
-- i18n: introduce i18n_install_all, to install everything i18n related
-- support SuSE DASD configurations
-- support SuSE zfcp configurations
-- support SuSE compressed KEYMAP= setting
-- usrmount: always install the module,
-  so always mount /usr from within the initramfs
-- test/TEST-17-LVM-THIN: new test case for lvm thin pools
-- "halt" the machine in systemd mode for die()
-
-dracut-034
-==========
-- do not run dhcp on parts of assembled network interfaces (bond, bridge)
-- add option to turn on/off prelinking
-    --prelink, --noprelink
-    do_prelink=[yes|no]
-- add ACPI table overriding
-- do not log to syslog/kmsg/journal for UID != 0
-- lvm/mdraid: Fix LVM on MD activation
-- bcache module removed (now in bcache-tools upstream)
-- mdadm: also install configs from /etc/mdadm.conf.d
-- fixes for mdadm-3.2.6+
-- mkinitrd: better compat support for SUSE
-- fcoe: add FCoE UEFI boot device support
-- rootfs-block: add support for the rootfallback= kernel cmdline option
-
-Contributions from:
-Thomas Renninger
-Alexander Tsoy
-Peter Rajnoha
-WANG Chao
-Harald Hoyer
-
-
 dracut-033
 ==========
 - improved hostonly device recognition
@@ -787,12 +16,6 @@ dracut-033
 - fixed ifup udev rules
 - ifup with dhcp, if no "ip=" specified for the interface
 
-Contributions from:
-WANG Chao
-Colin Walters
-Harald Hoyer
-
-
 dracut-032
 ==========
 - add parameter --print-cmdline

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

@@ -1,10 +1,9 @@
 dracut
 ------
-dracut is an event driven initramfs infrastructure.
+dracut is a new initramfs infrastructure.
 
-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.
+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
@@ -52,7 +51,7 @@ 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 github.com and kernel.org.
+Currently dracut lives on kernel.org.
 
 The tarballs can be found here:
 	http://www.kernel.org/pub/linux/utils/boot/dracut/
@@ -63,14 +62,21 @@ Git:
 	http://git.kernel.org/pub/scm/boot/dracut/dracut.git
 	https://git.kernel.org/pub/scm/boot/dracut/dracut.git
 
-	git@github.com:dracutdevs/dracut.git
+	git://github.com/haraldh/dracut.git
+
+	git://dracut.git.sourceforge.net/gitroot/dracut/dracut
 
 Git Web:
-	https://github.com/dracutdevs/dracut.git
+	http://git.kernel.org/?p=boot/dracut/dracut.git
 
-        http://git.kernel.org/?p=boot/dracut/dracut.git
+	https://haraldh@github.com/haraldh/dracut.git
 
-Project Documentation:
+	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:

README.md

@@ -1,31 +0,0 @@
-# dracut - master branch
-
-dracut is an initramfs infrastructure.
-
-## Travis
-
-[![Build Status](https://travis-ci.org/dracutdevs/dracut.svg?branch=master)](https://travis-ci.org/dracutdevs/dracut)
-
-## CentOS CI
-
-[![Build Status](https://ci.centos.org/job/dracut-push-master/badge/icon)](https://ci.centos.org/job/dracut-push-master/)
-
-- Test 01: [![Test 01](https://ci.centos.org/job/dracut-matrix-master/TESTS=01,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=01,label=dracut-ci-slave01/)
-- Test 02: [![Test 02](https://ci.centos.org/job/dracut-matrix-master/TESTS=02,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=02,label=dracut-ci-slave01/)
-- Test 03: [![Test 03](https://ci.centos.org/job/dracut-matrix-master/TESTS=03,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=03,label=dracut-ci-slave01/)
-- Test 04: [![Test 04](https://ci.centos.org/job/dracut-matrix-master/TESTS=04,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=04,label=dracut-ci-slave01/)
-- Test 10: [![Test 10](https://ci.centos.org/job/dracut-matrix-master/TESTS=10,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=10,label=dracut-ci-slave01/)
-- Test 11: [![Test 11](https://ci.centos.org/job/dracut-matrix-master/TESTS=11,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=11,label=dracut-ci-slave01/)
-- Test 12: [![Test 12](https://ci.centos.org/job/dracut-matrix-master/TESTS=12,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=12,label=dracut-ci-slave01/)
-- Test 13: [![Test 13](https://ci.centos.org/job/dracut-matrix-master/TESTS=13,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=13,label=dracut-ci-slave01/)
-- Test 14: [![Test 14](https://ci.centos.org/job/dracut-matrix-master/TESTS=14,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=14,label=dracut-ci-slave01/)
-- Test 15: [![Test 15](https://ci.centos.org/job/dracut-matrix-master/TESTS=15,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=15,label=dracut-ci-slave01/)
-- Test 16: [![Test 16](https://ci.centos.org/job/dracut-matrix-master/TESTS=16,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=16,label=dracut-ci-slave01/)
-- Test 17: [![Test 17](https://ci.centos.org/job/dracut-matrix-master/TESTS=17,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=17,label=dracut-ci-slave01/)
-- Test 20: [![Test 20](https://ci.centos.org/job/dracut-matrix-master/TESTS=20,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=20,label=dracut-ci-slave01/)
-- Test 30: [![Test 30](https://ci.centos.org/job/dracut-matrix-master/TESTS=30,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=30,label=dracut-ci-slave01/)
-- Test 31: [![Test 31](https://ci.centos.org/job/dracut-matrix-master/TESTS=31,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=31,label=dracut-ci-slave01/)
-- Test 40: [![Test 40](https://ci.centos.org/job/dracut-matrix-master/TESTS=40,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=40,label=dracut-ci-slave01/)
-- Test 50: [![Test 50](https://ci.centos.org/job/dracut-matrix-master/TESTS=50,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=50,label=dracut-ci-slave01/)
-- Test 60: [![Test 60](https://ci.centos.org/job/dracut-matrix-master/TESTS=60,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=60,label=dracut-ci-slave01/)
-- Test 70: [![Test 70](https://ci.centos.org/job/dracut-matrix-master/TESTS=70,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=70,label=dracut-ci-slave01/)

README.testsuite

@@ -1,28 +1,15 @@
 For the testsuite to work, you will have to install at least the following software packages:
 dash \
+bridge-utils \
 asciidoc \
 mdadm \
 lvm2 \
-dmraid \
 cryptsetup \
 nfs-utils \
 nbd \
 dhcp-server \
 scsi-target-utils \
-iscsi-initiator-utils \
-strace \
-syslinux \
-python-imgcreate \
-genisoimage \
-btrfs-progs \
-kmod-devel \
-gcc \
-bzip2 \
-xz \
-tar \
-wget \
-rpm-build \
-${NULL}
+iscsi-initiator-utils
 
 TEST-04-FULL-SYSTEMD: systemd >= 187
 

TODO

@@ -6,11 +6,6 @@ Items are ordered in priority.
 
 INITRAMFS TODO
 
-- search domain string
-- allow dual stack configuration (IPv4, IPv6) for the same interface
-- "bind-mount" kernel drivers in real root for the rescue image,
-  if the real root does not have any kernel modules for this kernel
-  https://bugzilla.redhat.com/show_bug.cgi?id=1046510
 - use info and warn prefix
 - generate systemd unit dracut-initramfs-restore in /run/systemd dynamically
 - put "root=" parsing hooks in separate hook dir
@@ -18,15 +13,16 @@ INITRAMFS TODO
 - 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
 
-- report errors on missing files in check()
 - remove wait for swap devs, if no "resume=" is given on the kernel command line
-- remove wait for swap devs, if the "resume" dracut module is not included (omitted)
 - 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
@@ -46,6 +42,3 @@ 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
 
-- lsinitrd --print-cmdline
-- dracut --print-cmdline error if additional arguments
-- library for cmdline

configure

@@ -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
 
 # We don't support srcdir != builddir
 echo \#buildapi-variable-no-builddir >/dev/null
@@ -7,8 +9,6 @@ prefix=/usr
 
 enable_documentation=yes
 
-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.
@@ -52,11 +52,6 @@ while (($# > 0)); do
     shift
 done
 
-if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 23 "; then
-    echo "dracut needs pkg-config and libkmod >= 23." >&2
-    exit 1
-fi
-
 cat > Makefile.inc.$$ <<EOF
 prefix ?= ${prefix}
 libdir ?= ${libdir:-${prefix}/lib}
@@ -66,8 +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 ")
 EOF
 
 {

dracut-bash-completion.sh

@@ -1,4 +1,7 @@
 #
+# -*- 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
@@ -29,17 +32,15 @@ _dracut() {
                               --hardlink --nohardlink --noprefix --mdadmconf --nomdadmconf
                               --lvmconf --nolvmconf --debug --profile --verbose --quiet
                               --local --hostonly --no-hostonly --fstab --help --bzip2 --lzma
-                              --xz --zstd --no-compress --gzip --list-modules --show-modules --keep
+                              --xz --no-compress --gzip --list-modules --show-modules --keep
                               --printsize --regenerate-all --noimageifnotneeded --early-microcode
-                              --no-early-microcode --print-cmdline --reproducible --uefi'
+                              --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 --install-optional
-                              --loginstall --uefi-stub --kernel-image
-                              '
+                              --kernel-cmdline --sshkey --persistent-policy'
         )
 
         if __contains_word "$prev" ${OPTS[ARG]}; then
@@ -48,7 +49,7 @@ _dracut() {
                                 comps=$(compgen -d -- "$cur")
                                 compopt -o filenames
                         ;;
-                        -c|--conf|--sshkey|--add-fstab|--add-device|-I|--install|--install-optional)
+                        -c|--conf|--sshkey|--add-fstab|--add-device|-I|--install)
                                 comps=$(compgen -f -- "$cur")
                                 compopt -o filenames
                         ;;

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.
 #

dracut-initramfs-restore.sh

@@ -1,11 +1,9 @@
 #!/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
@@ -14,8 +12,6 @@ SKIP="$dracutbasedir/skipcpio"
 
 [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
 
-mount -o ro /boot &>/dev/null || true
-
 if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
     IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
 fi
@@ -24,15 +20,12 @@ fi
 cd /run/initramfs
 
 [ -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
     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
-    rm -f -- .need_shutdown
 else
     # something failed, so we clean up
     echo "Unpacking of $IMG to /run/initramfs failed" >&2

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
 #
@@ -148,7 +150,8 @@ dlog_init() {
             && 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"
+            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" &
@@ -263,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)
@@ -279,7 +282,7 @@ _dlvl2syslvl() {
     local lvl
 
     case "$1" in
-        1) lvl=2;;
+        1) lvl=0;;
         2) lvl=3;;
         3) lvl=4;;
         4) lvl=6;;
@@ -323,7 +326,7 @@ _do_dlog() {
     local msg="$*"
     local lmsg="$lvlc: $*"
 
-    (( $lvl <= $stdloglvl )) && printf -- 'dracut: %s\n' "$msg" >&2
+    (( $lvl <= $stdloglvl )) && echo "$msg" >&2
 
     if (( $lvl <= $sysloglvl )); then
         if [[ "$_dlogfd" ]]; then

dracut.8.asc

@@ -6,7 +6,7 @@ DRACUT(8)
 
 NAME
 ----
-dracut - low-level tool for generating an initramfs/initrd image
+dracut - low-level tool for generating an initramfs image
 
 SYNOPSIS
 --------
@@ -28,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
@@ -56,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.
@@ -83,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"
@@ -140,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.
@@ -243,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)
 
@@ -317,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.
@@ -346,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
@@ -374,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
@@ -426,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.
 
@@ -486,37 +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-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_
-    or _$prefix/lib/gummiboot/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
-
-**--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**.
-
 FILES
 -----
 _/var/log/dracut.log_::
@@ -574,4 +500,4 @@ Will Woods
 
 SEE ALSO
 --------
-*dracut.cmdline*(7) *dracut.conf*(5) *lsinitrd*(1)
+*dracut.cmdline*(7) *dracut.conf*(5)

dracut.asc

@@ -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

dracut.cmdline.7.asc

@@ -32,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>__::
@@ -81,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
@@ -109,30 +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
-~~~~~~~~~~~~~~~~~
-
-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.
@@ -146,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,7 +137,7 @@ Misc
 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
+_/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.
@@ -187,8 +157,8 @@ 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-4]**::
-    Print memory usage info at various points, set the verbose level from 0 to 4.
+**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:
 +
@@ -197,10 +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 + tracekomem
-        NOTE: tracekomem is a shell script utilizing kernel trace to track
-              the rough total memory consumption of kernel modules during
-              loading. It may override other trace configurations.
 ----
 
 **rd.break**::
@@ -311,11 +277,6 @@ 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 **rd.luks.key=**__<keypath>__:__<keydev>__:__<luksdev>__::
@@ -397,11 +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
-
 FIPS
 ~~~~
 **rd.fips**::
@@ -485,7 +441,7 @@ USB Android phone::
 * enp0s29u1u2
 =====================
 
-**ip=**__{dhcp|on|any|dhcp6|auto6|either6}__::
+**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.
@@ -494,8 +450,6 @@ USB Android phone::
 
     dhcp6::: IPv6 DHCP
 
-    either6::: if auto6 fails, then dhcp6
-
 **ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6}__[:[__<mtu>__][:__<macaddr>__]]::
     This parameter can be specified multiple times.
 +
@@ -507,7 +461,7 @@ 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
@@ -561,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
 
@@ -576,14 +527,13 @@ interface name. Better name it "bootnet" or "bluesocket".
     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>__::
@@ -601,7 +551,7 @@ 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}__::
     root=dhcp alone directs initrd to look at the DHCP root-path where NFS
@@ -620,7 +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_.
+    Set the NFSv4 domain name. Will overwrite 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.
@@ -734,9 +684,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.
@@ -765,32 +712,22 @@ iscsistart -b --param node.session.timeo.replacement_timeout=30
 
 FCoE
 ~~~~
-**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!
 
 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=dhcp** with **dhcp** **root-path=**nbd:__<server>__:__<port/exportname>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]::
+**root=dhcp** with **dhcp** **root-path=**nbd:__<server>__:__<port>__[:__<fstype>__[:__<mountopts>__[:__<nbdopts>__]]]::
     root=dhcp alone directs initrd to look at the DHCP root-path where NBD
     options can be specified. This syntax is only usable in cases where you are
     directly mounting the volume as the rootfs.
-+
-NOTE:
-    If "exportname" instead of "port" is given the standard port is used.
-    Newer versions of nbd are only supported with "exportname".
 
 DASD
 ~~~~
@@ -800,19 +737,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**::
@@ -821,9 +751,6 @@ 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.
 +
 [listing]
@@ -838,27 +765,21 @@ 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.
+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
+over the read only filesystem.  Using this method ensures a relatively fast
+boot and lower RAM usage. Users **must be careful** to avoid writing too many
+blocks to the snapshot volume.  Once the blocks of the snapshot are exhaused,
+the live filesystem becomes unusable and requires a reboot.
 +
-The filesystem structure is traditionally expected to be:
+The filesystem structure is expected to be:
 +
 [listing]
 --
-squashfs.img          |  SquashFS from LiveCD .iso
+squashfs.img          |  Squashfs downloaded via network
    !(mount)
    /LiveOS
-       |- rootfs.img  |  Filesystem image to mount read-only
+       |- ext3fs.img  |  Filesystem image to mount read-only
             !(mount)
             /bin      |  Live filesystem
             /boot     |
@@ -866,60 +787,23 @@ squashfs.img          |  SquashFS from LiveCD .iso
             ...       |
 --
 +
-For OverlayFS mount overlays, the filesystem structure may also be a direct
-compression of the root filesystem:
+Dracut uses this method 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.
 +
-[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.
+writable filesystem image::: The system will retrieve a compressed filesystem
+image, connect it to a loopback device, and mount it as a writable volume.  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.
 +
 The filesystem structure is expected to be:
 +
 [listing]
 --
-rootfs.tgz            |  Compressed tarball containing filesystem image
+rootfs.tgz            |  Compressed tarball containing fileystem image
    !(unpack)
-   /rootfs.img        |  Filesystem image at /run/initramfs/fsimg/
+   /rootfs.img        |  Filesystem image
       !(mount)
       /bin            |  Live filesystem
       /boot           |
@@ -927,155 +811,63 @@ rootfs.tgz            |  Compressed tarball containing filesystem image
       ...             |
 --
 +
-To use this boot option, ensure that **rd.writable.fsimg=1** is in your kernel
+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.
+of your compressed filesystem image tarball.
 =====================
 
-**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__.
+Boots a live image retrieved from __<url>__.  Valid handlers: __http, httpd, ftp, tftp__.
 +
 [listing]
-.Examples
+.Example
 --
 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__.
+Specifies the directory within the squashfs where the ext3fs.img or rootfs.img
+can be found.  By default, this is __LiveOS__.
 
 **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.
+when the image resides on i.e. 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
-`/<+++<b>rd.live.dir</b>+++>/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.
---
+**rd.live.overlay=**_<devspec>_:_(<pathspec>|auto)__
+Allow 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 **root=live:__<url>__** option.
 +
 [listing]
-.Examples
+.Example
 --
 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
+The advantage of thin snapshots is, that they support discards, and will free
+blocks which 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.
+**rd.writable.fsimg=**1::
+Enables writable filesystem support.  The system will boot with a fully 
+writable 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.
 +
-If a persistent overlay is detected at the standard LiveOS path, the overlay &
-overlay type detected, whether OverlayFS or Device-mapper, will be used.
+NOTE: There must be enough free RAM available to hold the complete image.
 +
-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.
+This method is very suitable for diskless boots.
 
 
-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**::
@@ -1129,8 +921,7 @@ their new replacement.
 
 rdbreak:: rd.break
 
-rd.ccw:: rd.znet
-rd_CCW:: rd.znet
+rd_CCW:: rd.ccw
 
 rd_DASD_MOD:: rd.dasd
 
@@ -1198,8 +989,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

@@ -10,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
@@ -54,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.
@@ -75,26 +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=*"__{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.
-
 *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.
@@ -164,7 +147,7 @@ provide a valid _/etc/fstab_.
     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.
@@ -181,7 +164,7 @@ 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.
 
@@ -192,22 +175,6 @@ provide a valid _/etc/fstab_.
 *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_
-    or _/usr/lib/gummiboot/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
-
-*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_::
@@ -215,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,13 +2,11 @@
 
 # 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="/"
 systemdutildir=/usr/lib/systemd
 systemdsystemunitdir=/usr/lib/systemd/system
@@ -17,4 +15,3 @@ udevdir=/usr/lib/udev
 hostonly="yes"
 hostonly_cmdline="no"
 early_microcode="yes"
-reproducible="yes"

dracut.conf.d/suse.conf.example

@@ -1,24 +1,3 @@
-# SUSE specifc dracut settings
-#
-# SUSE by default always builds a 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"
 
-# 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.modules.7.asc

@@ -19,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
@@ -168,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_.
 
@@ -212,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
@@ -255,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>
 

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}
@@ -26,33 +27,45 @@ 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
-BuildRequires: kmod-devel >= 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
+
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+BuildRequires: systemd-units
 %endif
 
 %if 0%{?suse_version} > 9999
@@ -60,17 +73,12 @@ Obsoletes: mkinitrd < 2.6.1
 Provides: mkinitrd = 2.6.1
 %endif
 
-Obsoletes: dracut-fips <= 047
-Provides:  dracut-fips = %{version}-%{release}
-Obsoletes: dracut-fips-aesni <= 047
-Provides:  dracut-fips-aesni = %{version}-%{release}
-
 Obsoletes: dracut-kernel < 005
 Provides:  dracut-kernel = %{version}-%{release}
 
-Obsoletes: dracut < 030
-Obsoletes: dracut-norescue < 030
-Provides:  dracut-norescue = %{version}-%{release}
+Obsoletes: dracut <= 029
+Obsoletes: dracut-norescue
+Provides:  dracut-norescue
 
 Requires: bash >= 4
 Requires: coreutils
@@ -78,50 +86,39 @@ Requires: cpio
 Requires: filesystem >= 2.1.0
 Requires: findutils
 Requires: grep
+Requires: hardlink
+Requires: gzip xz
 Requires: kmod
 Requires: sed
-Requires: xz
-Requires: gzip
+Requires: kpartx
 
-%if 0%{?fedora} || 0%{?rhel}
-Recommends: hardlink
-Recommends: pigz
-Recommends: kpartx
+%if 0%{?fedora} || 0%{?rhel} > 6
 Requires: util-linux >= 2.21
 Requires: systemd >= 219
-Requires: systemd-udev >= 219
 Requires: procps-ng
+Conflicts: grubby < 8.23
 %else
-Requires: hardlink
-Requires: gzip
-Requires: kpartx
 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 previous 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: dhclient
@@ -132,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}
@@ -141,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
@@ -172,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
@@ -185,32 +190,29 @@ 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 %{?_smp_mflags}
 
 %install
+%if 0%{?fedora} || 0%{?rhel}
+rm -rf -- $RPM_BUILD_ROOT
+%endif
 make %{?_smp_mflags} install \
      DESTDIR=$RPM_BUILD_ROOT \
      libdir=%{_prefix}/lib
@@ -219,6 +221,7 @@ echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dr
 
 %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}
@@ -239,68 +242,62 @@ 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
-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%{?suse_version}
 install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
 %endif
 
-%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999
+%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}
-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
-
-# FIXME: remove after F30
+%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
 
-%files
-%if %{with doc}
-%doc README HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+> $RPM_BUILD_ROOT/etc/system-fips
 %endif
-%{!?_licensedir:%global license %%doc}
-%license COPYING lgpl-2.1.txt
+
+# 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
+%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.sh
 %{dracutlibdir}/dracut-functions
 %{dracutlibdir}/dracut-version.sh
 %{dracutlibdir}/dracut-logger.sh
@@ -313,13 +310,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %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
@@ -328,84 +321,66 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %{_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
-%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-initrd
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
 %{dracutlibdir}/modules.d/05busybox
-%{dracutlibdir}/modules.d/06rngd
 %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/50drm
 %{dracutlibdir}/modules.d/50plymouth
-%{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/90stratis
 %{dracutlibdir}/modules.d/90qemu
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
 %{dracutlibdir}/modules.d/95debug
-%{dracutlibdir}/modules.d/95fstab-sys
-%{dracutlibdir}/modules.d/95lunmask
 %{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/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
@@ -422,60 +397,60 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %{_unitdir}/initrd.target.wants/dracut-pre-udev.service
 
 %endif
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_prefix}/lib/kernel/install.d/50-dracut.install
 %endif
 
 %files network
-%{dracutlibdir}/modules.d/02systemd-networkd
-%{dracutlibdir}/modules.d/35network-manager
-%{dracutlibdir}/modules.d/35network-legacy
+%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}
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
-# FIXME: remove after F30
 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
 %endif
 

dracut.usage.asc

@@ -37,10 +37,14 @@ the --hostonly or -H option. Using this option, the resulting image will
 contain only those dracut modules, kernel modules and filesystems, which are
 needed to boot this specific machine. This has the drawback, that you can't put
 the disk on another controller or machine, and that you can't switch to another
-root filesystem, without recreating the initramfs image. The usage of the
---hostonly option is only for experts and you will have to keep the broken
-pieces. At least keep a copy of a general purpose image (and corresponding
-kernel) as a fallback to rescue your system.
+root filesystem, without recreating the initramfs image.
+
+[NOTE]
+===============================
+On RHEL-7 the hostonly mode is the default mode. Generic "non-hostonly" images
+are created, if the dracut-config-generic rpm is installed. The rescue kernel
+entry in the bootloader menu is also a generic image.
+===============================
 
 === Inspecting the Contents
 To see the contents of the image created by dracut, you can use the lsinitrd
@@ -99,6 +103,11 @@ 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/grub2/grub.cfg_
+(or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems), if
+grub2 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>>.
 
@@ -242,8 +251,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 +276,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
@@ -281,7 +305,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 +330,8 @@ 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. _/boot/grub2/grub.cfg_ (or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems))
+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
@@ -340,49 +365,17 @@ Successfully debugging dracut will require some form of console
 logging during the system boot.  This section documents configuring a
 serial console connection to record boot messages.
 
-. First, enable serial console output for both the kernel and the bootloader.
-. Open the file _/boot/grub2/grub.cfg_ for editing. Below the line ''timeout=5'', add
-the following:
-+
-----
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-----
-+
-. Also in _/boot/grub2/grub.cfg_, add the following boot arguemnts to the ''kernel''
+. In _/boot/grub2/grub.cfg_ (or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems),
+add the following boot arguments to the ''linux16''
 line:
 +
 ----
 console=tty0 console=ttyS0,9600
 ----
 +
-. When finished, the _/boot/grub2/grub.cfg_ file should look similar to the example
-below.
-+
-----
-default=0
-timeout=5
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-title Fedora (2.6.29.5-191.fc11.x86_64)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 console=ttyS0,9600
-  initrd /dracut-2.6.29.5-191.fc11.x86_64.img
-----
-+
 . More detailed information on how to configure the kernel for console output
 can be found at
 http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL.
-. Redirecting non-interactive output
-+
---
-NOTE: You can redirect all non-interactive output to _/dev/kmsg_ and the kernel
-will put it out on the console when it reaches the kernel buffer by doing
-
-----
-# exec >/dev/kmsg 2>&1 </dev/console
-----
---
 
 [[using-the-dracut-shell]]
 ==== Using the dracut shell
@@ -391,20 +384,18 @@ 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. _/boot/grub2/grub.cfg_ (or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems))
 . Remove the boot arguments ''rhgb'' and ''quiet''
 +
-A sample _/boot/grub2/grub.cfg_ bootloader configuration file is listed below.
+A sample _grub.cfg_ bootloader configuration file snippet is listed below.
 +
 ----
-default=0
-timeout=5
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-title Fedora (2.6.29.5-191.fc11.x86_64)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell
-  initrd /dracut-2.6.29.5-191.fc11.x86_64.img
+menuentry 'Red Hat Enterprise Linux Server (3.10.0-308.el7.x86_64) 7.0 (Maipo)' […] {
+  […]
+  linux16 /vmlinuz-3.10.0-308.el7.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell
+  initrd16 /initramfs-3.10.0-308.el7.x86_64.img
+  […]
+}
 ----
 +
 . If system boot fails, you will be dropped into a shell as seen in the example
@@ -509,7 +500,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
 ----
 

fedora-test.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-[[ -d ${0%/*} ]] && cd ${0%/*}
-
-RUN_ID="$1"
-TESTS=$2
-
-dnf -y update --best --allowerasing &>/dev/null
-
-dnf -y install --best --allowerasing \
-    dash \
-    asciidoc \
-    mdadm \
-    lvm2 \
-    dmraid \
-    cryptsetup \
-    nfs-utils \
-    nbd \
-    dhcp-server \
-    scsi-target-utils \
-    iscsi-initiator-utils \
-    strace \
-    btrfs-progs \
-    kmod-devel \
-    gcc \
-    bzip2 \
-    xz \
-    tar \
-    wget \
-    rpm-build \
-    make \
-    git \
-    bash-completion \
-    sudo \
-    kernel \
-    dhcp-client \
-    /usr/bin/qemu-kvm \
-    /usr/bin/qemu-system-$(uname -i) \
-    e2fsprogs \
-    $NULL &>/dev/null
-
-./configure
-
-NCPU=$(getconf _NPROCESSORS_ONLN)
-
-if ! [[ $TESTS ]]; then
-    make -j$NCPU all syncheck rpm logtee
-else
-    make -j$NCPU all logtee
-
-    cd test
-
-    time sudo make \
-         KVERSION=$(rpm -qa kernel --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' | sort -rn | head -1) \
-         TEST_RUN_ID=$RUN_ID \
-         ${TESTS:+TESTS="$TESTS"} \
-         -k V=2 \
-         check
-fi

git2spec.pl

@@ -3,28 +3,10 @@
 sub create_patches {
     my $tag=shift;
     my $pdir=shift;
-    my $n=1;
-    my @lines;
-    my $fname;
-    my $f=0;
-
-    mkdir $pdir, 0755;
-
-    open( GIT, 'git log -p --pretty=email --stat -m --first-parent --reverse '.$tag.'..HEAD |');
-
-    while (<GIT>) {
-        if (/^From [a-z0-9]{40} .*$/) {
-            $fname = sprintf("%04d", $n++).".patch";
-            open FH, ">".$pdir."/".$fname;
-            $f=1;
-        }
-        if (/^---$/ && $f == 1) {
-            push @lines, $fname;
-            $f=0;
-        }
-        print FH;
-    }
-
+    my $num=0;
+    open( GIT, 'git format-patch -M -N --no-signature -o "'.$pdir.'" '.$tag.' |');
+    @lines=<GIT>;
+    close GIT;         # be done
     return @lines;
 };
 
@@ -37,23 +19,22 @@ $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/ if $tag !~ /\b[0-9a-f]{5,40}\b/;
-my $release="$num.git$datestr";
-$release="1" if $num == 1;
+$tag=~s/[^0-9]+?([0-9]+)/$1/;
+my $release="$num";
 
 while(<>) {
     if (/^Version:/) {
 	print "Version: $tag\n";
     }
-    elsif (/^%define dist_free_release/) {
-	print "%define dist_free_release $release\n";
+    elsif (/^Release:/) {
+	print "Release: $release%{?dist}\n";
     }
     elsif ((/^Source0:/) || (/^Source:/)) {
 	print $_;
 	$num=1;
 	for(@patches) {
 	    s/.*\///g;
-	    print "Patch$num: $_\n";
+	    print "Patch$num: $_";
 	    $num++;
 	}
 	print "\n";

install/hashmap.c

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 /***
   This file is part of systemd.
 

install/hashmap.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #ifndef foohashmaphfoo
 #define foohashmaphfoo
 

install/log.c

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 /***
   This file is part of systemd.
 
@@ -101,10 +103,11 @@ void log_set_facility(int facility) {
 static int write_to_console(
                 int level,
                 const char*file,
-                unsigned int line,
+                int line,
                 const char *func,
                 const char *buffer) {
 
+        char location[64];
         struct iovec iovec[5];
         unsigned n = 0;
 
@@ -116,9 +119,7 @@ static int write_to_console(
         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);
         }
 

install/log.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #ifndef foologhfoo
 #define foologhfoo
 

install/macro.h

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 #pragma once
 
 /***
@@ -205,7 +207,7 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
         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);

install/strv.c

@@ -1,585 +0,0 @@
-/***
-  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 <assert.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-
-#include "util.h"
-#include "strv.h"
-
-char *strv_find(char **l, const char *name) {
-        char **i;
-
-        assert(name);
-
-        STRV_FOREACH(i, l)
-                if (streq(*i, name))
-                        return *i;
-
-        return NULL;
-}
-
-char *strv_find_prefix(char **l, const char *name) {
-        char **i;
-
-        assert(name);
-
-        STRV_FOREACH(i, l)
-                if (startswith(*i, name))
-                        return *i;
-
-        return NULL;
-}
-
-void strv_free(char **l) {
-        char **k;
-
-        if (!l)
-                return;
-
-        for (k = l; *k; k++)
-                free(*k);
-
-        free(l);
-}
-
-char **strv_copy(char * const *l) {
-        char **r, **k;
-
-        k = r = new(char*, strv_length(l) + 1);
-        if (!r)
-                return NULL;
-
-        if (l)
-                for (; *l; k++, l++) {
-                        *k = strdup(*l);
-                        if (!*k) {
-                                strv_free(r);
-                                return NULL;
-                        }
-                }
-
-        *k = NULL;
-        return r;
-}
-
-unsigned int strv_length(char * const *l) {
-        unsigned n = 0;
-
-        if (!l)
-                return 0;
-
-        for (; *l; l++)
-                n++;
-
-        return n;
-}
-
-char **strv_new_ap(const char *x, va_list ap) {
-        const char *s;
-        char **a;
-        unsigned n = 0, i = 0;
-        va_list aq;
-
-        /* As a special trick we ignore all listed strings that equal
-         * (const char*) -1. This is supposed to be used with the
-         * STRV_IFNOTNULL() macro to include possibly NULL strings in
-         * the string list. */
-
-        if (x) {
-                n = x == (const char*) -1 ? 0 : 1;
-
-                va_copy(aq, ap);
-                while ((s = va_arg(aq, const char*))) {
-                        if (s == (const char*) -1)
-                                continue;
-
-                        n++;
-                }
-
-                va_end(aq);
-        }
-
-        a = new(char*, n+1);
-        if (!a)
-                return NULL;
-
-        if (x) {
-                if (x != (const char*) -1) {
-                        a[i] = strdup(x);
-                        if (!a[i])
-                                goto fail;
-                        i++;
-                }
-
-                while ((s = va_arg(ap, const char*))) {
-
-                        if (s == (const char*) -1)
-                                continue;
-
-                        a[i] = strdup(s);
-                        if (!a[i])
-                                goto fail;
-
-                        i++;
-                }
-        }
-
-        a[i] = NULL;
-
-        return a;
-
-fail:
-        strv_free(a);
-        return NULL;
-}
-
-char **strv_new(const char *x, ...) {
-        char **r;
-        va_list ap;
-
-        va_start(ap, x);
-        r = strv_new_ap(x, ap);
-        va_end(ap);
-
-        return r;
-}
-
-char **strv_merge(char **a, char **b) {
-        char **r, **k;
-
-        if (!a)
-                return strv_copy(b);
-
-        if (!b)
-                return strv_copy(a);
-
-        r = new(char*, strv_length(a) + strv_length(b) + 1);
-        if (!r)
-                return NULL;
-
-        for (k = r; *a; k++, a++) {
-                *k = strdup(*a);
-                if (!*k)
-                        goto fail;
-        }
-
-        for (; *b; k++, b++) {
-                *k = strdup(*b);
-                if (!*k)
-                        goto fail;
-        }
-
-        *k = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-}
-
-char **strv_merge_concat(char **a, char **b, const char *suffix) {
-        char **r, **k;
-
-        /* Like strv_merge(), but appends suffix to all strings in b, before adding */
-
-        if (!b)
-                return strv_copy(a);
-
-        r = new(char*, strv_length(a) + strv_length(b) + 1);
-        if (!r)
-                return NULL;
-
-        k = r;
-        if (a)
-                for (; *a; k++, a++) {
-                        *k = strdup(*a);
-                        if (!*k)
-                                goto fail;
-                }
-
-        for (; *b; k++, b++) {
-                *k = strappend(*b, suffix);
-                if (!*k)
-                        goto fail;
-        }
-
-        *k = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-
-}
-
-char **strv_split(const char *s, const char *separator) {
-        char *state;
-        char *w;
-        size_t l;
-        unsigned n, i;
-        char **r;
-
-        assert(s);
-
-        n = 0;
-        FOREACH_WORD_SEPARATOR(w, l, s, separator, state)
-                n++;
-
-        r = new(char*, n+1);
-        if (!r)
-                return NULL;
-
-        i = 0;
-        FOREACH_WORD_SEPARATOR(w, l, s, separator, state) {
-                r[i] = strndup(w, l);
-                if (!r[i]) {
-                        strv_free(r);
-                        return NULL;
-                }
-
-                i++;
-        }
-
-        r[i] = NULL;
-        return r;
-}
-
-char **strv_split_quoted(const char *s) {
-        char *state;
-        char *w;
-        size_t l;
-        unsigned n, i;
-        char **r;
-
-        assert(s);
-
-        n = 0;
-        FOREACH_WORD_QUOTED(w, l, s, state)
-                n++;
-
-        r = new(char*, n+1);
-        if (!r)
-                return NULL;
-
-        i = 0;
-        FOREACH_WORD_QUOTED(w, l, s, state) {
-                r[i] = cunescape_length(w, l);
-                if (!r[i]) {
-                        strv_free(r);
-                        return NULL;
-                }
-                i++;
-        }
-
-        r[i] = NULL;
-        return r;
-}
-
-char **strv_split_newlines(const char *s) {
-        char **l;
-        unsigned int n;
-
-        assert(s);
-
-        /* Special version of strv_split() that splits on newlines and
-         * suppresses an empty string at the end */
-
-        l = strv_split(s, NEWLINE);
-        if (!l)
-                return NULL;
-
-        n = strv_length(l);
-        if (n == 0)
-                return l;
-
-        if (isempty(l[n-1])) {
-                free(l[n-1]);
-                l[n-1] = NULL;
-        }
-
-        return l;
-}
-
-char *strv_join(char **l, const char *separator) {
-        char *r, *e;
-        char **s;
-        size_t n, k;
-
-        if (!separator)
-                separator = " ";
-
-        k = strlen(separator);
-
-        n = 0;
-        STRV_FOREACH(s, l) {
-                if (n != 0)
-                        n += k;
-                n += strlen(*s);
-        }
-
-        r = new(char, n+1);
-        if (!r)
-                return NULL;
-
-        e = r;
-        STRV_FOREACH(s, l) {
-                if (e != r)
-                        e = stpcpy(e, separator);
-
-                e = stpcpy(e, *s);
-        }
-
-        *e = 0;
-
-        return r;
-}
-
-char **strv_append(char **l, const char *s) {
-        char **r, **k;
-
-        if (!l)
-                return strv_new(s, NULL);
-
-        if (!s)
-                return strv_copy(l);
-
-        r = new(char*, strv_length(l)+2);
-        if (!r)
-                return NULL;
-
-        for (k = r; *l; k++, l++) {
-                *k = strdup(*l);
-                if (!*k)
-                        goto fail;
-        }
-
-        k[0] = strdup(s);
-        if (!k[0])
-                goto fail;
-
-        k[1] = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-}
-
-int strv_push(char ***l, char *value) {
-        char **c;
-        unsigned n;
-
-        if (!value)
-                return 0;
-
-        n = strv_length(*l);
-        c = realloc(*l, sizeof(char*) * (n + 2));
-        if (!c)
-                return -ENOMEM;
-
-        c[n] = value;
-        c[n+1] = NULL;
-
-        *l = c;
-        return 0;
-}
-
-int strv_extend(char ***l, const char *value) {
-        char *v;
-        int r;
-
-        if (!value)
-                return 0;
-
-        v = strdup(value);
-        if (!v)
-                return -ENOMEM;
-
-        r = strv_push(l, v);
-        if (r < 0)
-                free(v);
-
-        return r;
-}
-
-char **strv_uniq(char **l) {
-        char **i;
-
-        /* Drops duplicate entries. The first identical string will be
-         * kept, the others dropped */
-
-        STRV_FOREACH(i, l)
-                strv_remove(i+1, *i);
-
-        return l;
-}
-
-char **strv_remove(char **l, const char *s) {
-        char **f, **t;
-
-        if (!l)
-                return NULL;
-
-        assert(s);
-
-        /* Drops every occurrence of s in the string list, edits
-         * in-place. */
-
-        for (f = t = l; *f; f++) {
-
-                if (streq(*f, s)) {
-                        free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
-
-        *t = NULL;
-        return l;
-}
-
-char **strv_remove_prefix(char **l, const char *s) {
-        char **f, **t;
-
-        if (!l)
-                return NULL;
-
-        assert(s);
-
-        /* Drops every occurrence of a string prefixed with s in the
-         * string list, edits in-place. */
-
-        for (f = t = l; *f; f++) {
-
-                if (startswith(*f, s)) {
-                        free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
-
-        *t = NULL;
-        return l;
-}
-
-char **strv_parse_nulstr(const char *s, size_t l) {
-        const char *p;
-        unsigned c = 0, i = 0;
-        char **v;
-
-        assert(s || l == 0);
-
-        if (l == 0)
-                return new0(char*, 1);
-
-        for (p = s; p < s + l; p++)
-                if (*p == 0)
-                        c++;
-
-        if (s[l-1] != 0)
-                c++;
-
-        v = new0(char*, c+1);
-        if (!v)
-                return NULL;
-
-        p = s;
-        while (p < s + l) {
-                const char *e;
-
-                e = memchr(p, 0, s + l - p);
-
-                v[i] = strndup(p, e ? e - p : s + l - p);
-                if (!v[i]) {
-                        strv_free(v);
-                        return NULL;
-                }
-
-                i++;
-
-                if (!e)
-                        break;
-
-                p = e + 1;
-        }
-
-        assert(i == c);
-
-        return v;
-}
-
-char **strv_split_nulstr(const char *s) {
-        const char *i;
-        char **r = NULL;
-
-        NULSTR_FOREACH(i, s)
-                if (strv_extend(&r, i) < 0) {
-                        strv_free(r);
-                        return NULL;
-                }
-
-        if (!r)
-                return strv_new(NULL, NULL);
-
-        return r;
-}
-
-bool strv_overlap(char **a, char **b) {
-        char **i, **j;
-
-        STRV_FOREACH(i, a) {
-                STRV_FOREACH(j, b) {
-                        if (streq(*i, *j))
-                                return true;
-                }
-        }
-
-        return false;
-}
-
-static int str_compare(const void *_a, const void *_b) {
-        const char **a = (const char**) _a, **b = (const char**) _b;
-
-        return strcmp(*a, *b);
-}
-
-char **strv_sort(char **l) {
-
-        if (strv_isempty(l))
-                return l;
-
-        qsort(l, strv_length(l), sizeof(char*), str_compare);
-        return l;
-}
-
-void strv_print(char **l) {
-        char **s;
-
-        if (!l)
-                return;
-
-        STRV_FOREACH(s, l)
-                puts(*s);
-}

install/strv.h

@@ -1,116 +0,0 @@
-#pragma once
-
-/***
-  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 <stdarg.h>
-#include <stdbool.h>
-
-#include "util.h"
-
-char *strv_find(char **l, const char *name) _pure_;
-char *strv_find_prefix(char **l, const char *name) _pure_;
-
-void strv_free(char **l);
-DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free);
-#define _cleanup_strv_free_ _cleanup_(strv_freep)
-
-char **strv_copy(char * const *l);
-unsigned int strv_length(char * const *l) _pure_;
-
-char **strv_merge(char **a, char **b);
-char **strv_merge_concat(char **a, char **b, const char *suffix);
-char **strv_append(char **l, const char *s);
-int strv_extend(char ***l, const char *value);
-int strv_push(char ***l, char *value);
-
-char **strv_remove(char **l, const char *s);
-char **strv_remove_prefix(char **l, const char *s);
-char **strv_uniq(char **l);
-
-#define strv_contains(l, s) (!!strv_find((l), (s)))
-
-char **strv_new(const char *x, ...) _sentinel_;
-char **strv_new_ap(const char *x, va_list ap);
-
-static inline const char* STRV_IFNOTNULL(const char *x) {
-        return x ? x : (const char *) -1;
-}
-
-static inline bool strv_isempty(char * const *l) {
-        return !l || !*l;
-}
-
-char **strv_split(const char *s, const char *separator);
-char **strv_split_quoted(const char *s);
-char **strv_split_newlines(const char *s);
-
-char *strv_join(char **l, const char *separator);
-
-char **strv_parse_nulstr(const char *s, size_t l);
-char **strv_split_nulstr(const char *s);
-
-bool strv_overlap(char **a, char **b) _pure_;
-
-#define STRV_FOREACH(s, l)                      \
-        for ((s) = (l); (s) && *(s); (s)++)
-
-#define STRV_FOREACH_BACKWARDS(s, l)            \
-        STRV_FOREACH(s, l)                      \
-                ;                               \
-        for ((s)--; (l) && ((s) >= (l)); (s)--)
-
-#define STRV_FOREACH_PAIR(x, y, l)               \
-        for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
-
-char **strv_sort(char **l);
-void strv_print(char **l);
-
-#define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
-
-#define STRV_MAKE_EMPTY ((char*[1]) { NULL })
-
-#define strv_from_stdarg_alloca(first)                          \
-        ({                                                      \
-                char **_l;                                      \
-                                                                \
-                if (!first)                                     \
-                        _l = (char**) &first;                   \
-                else {                                          \
-                        unsigned _n;                            \
-                        va_list _ap;                            \
-                                                                \
-                        _n = 1;                                 \
-                        va_start(_ap, first);                   \
-                        while (va_arg(_ap, char*))              \
-                                _n++;                           \
-                        va_end(_ap);                            \
-                                                                \
-                        _l = newa(char*, _n+1);                 \
-                        _l[_n = 0] = (char*) first;             \
-                        va_start(_ap, first);                   \
-                        for (;;) {                              \
-                                _l[++_n] = va_arg(_ap, char*);  \
-                                if (!_l[_n])                    \
-                                        break;                  \
-                        }                                       \
-                        va_end(_ap);                            \
-                }                                               \
-                _l;                                             \
-        })

install/util.c

@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
 /***
   This file is part of systemd.
 
@@ -222,7 +224,7 @@ char *strappend(const char *s, const char *suffix) {
 char *strjoin(const char *x, ...) {
         va_list ap;
         size_t l;
-        char *r;
+        char *r, *p;
 
         va_start(ap, x);
 
@@ -255,8 +257,6 @@ char *strjoin(const char *x, ...) {
                 return NULL;
 
         if (x) {
-                char *p;
-
                 p = stpcpy(r, x);
 
                 va_start(ap, x);
@@ -277,238 +277,3 @@ char *strjoin(const char *x, ...) {
 
         return r;
 }
-
-char *cunescape_length_with_prefix(const char *s, size_t length, const char *prefix) {
-        char *r, *t;
-        const char *f;
-        size_t pl;
-
-        assert(s);
-
-        /* Undoes C style string escaping, and optionally prefixes it. */
-
-        pl = prefix ? strlen(prefix) : 0;
-
-        r = new(char, pl+length+1);
-        if (!r)
-                return r;
-
-        if (prefix)
-                memcpy(r, prefix, pl);
-
-        for (f = s, t = r + pl; f < s + length; f++) {
-
-                if (*f != '\\') {
-                        *(t++) = *f;
-                        continue;
-                }
-
-                f++;
-
-                switch (*f) {
-
-                case 'a':
-                        *(t++) = '\a';
-                        break;
-                case 'b':
-                        *(t++) = '\b';
-                        break;
-                case 'f':
-                        *(t++) = '\f';
-                        break;
-                case 'n':
-                        *(t++) = '\n';
-                        break;
-                case 'r':
-                        *(t++) = '\r';
-                        break;
-                case 't':
-                        *(t++) = '\t';
-                        break;
-                case 'v':
-                        *(t++) = '\v';
-                        break;
-                case '\\':
-                        *(t++) = '\\';
-                        break;
-                case '"':
-                        *(t++) = '"';
-                        break;
-                case '\'':
-                        *(t++) = '\'';
-                        break;
-
-                case 's':
-                        /* This is an extension of the XDG syntax files */
-                        *(t++) = ' ';
-                        break;
-
-                case 'x': {
-                        /* hexadecimal encoding */
-                        int a, b;
-
-                        a = unhexchar(f[1]);
-                        b = unhexchar(f[2]);
-
-                        if (a < 0 || b < 0) {
-                                /* Invalid escape code, let's take it literal then */
-                                *(t++) = '\\';
-                                *(t++) = 'x';
-                        } else {
-                                *(t++) = (char) ((a << 4) | b);
-                                f += 2;
-                        }
-
-                        break;
-                }
-
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7': {
-                        /* octal encoding */
-                        int a, b, c;
-
-                        a = unoctchar(f[0]);
-                        b = unoctchar(f[1]);
-                        c = unoctchar(f[2]);
-
-                        if (a < 0 || b < 0 || c < 0) {
-                                /* Invalid escape code, let's take it literal then */
-                                *(t++) = '\\';
-                                *(t++) = f[0];
-                        } else {
-                                *(t++) = (char) ((a << 6) | (b << 3) | c);
-                                f += 2;
-                        }
-
-                        break;
-                }
-
-                case 0:
-                        /* premature end of string.*/
-                        *(t++) = '\\';
-                        goto finish;
-
-                default:
-                        /* Invalid escape code, let's take it literal then */
-                        *(t++) = '\\';
-                        *(t++) = *f;
-                        break;
-                }
-        }
-
-finish:
-        *t = 0;
-        return r;
-}
-
-char *cunescape_length(const char *s, size_t length) {
-        return cunescape_length_with_prefix(s, length, NULL);
-}
-
-
-/* Split a string into words, but consider strings enclosed in '' and
- * "" as words even if they include spaces. */
-char *split_quoted(const char *c, size_t *l, char **state) {
-        const char *current, *e;
-        bool escaped = false;
-
-        assert(c);
-        assert(l);
-        assert(state);
-
-        current = *state ? *state : c;
-
-        current += strspn(current, WHITESPACE);
-
-        if (*current == 0)
-                return NULL;
-
-        else if (*current == '\'') {
-                current ++;
-
-                for (e = current; *e; e++) {
-                        if (escaped)
-                                escaped = false;
-                        else if (*e == '\\')
-                                escaped = true;
-                        else if (*e == '\'')
-                                break;
-                }
-
-                *l = e-current;
-                *state = (char*) (*e == 0 ? e : e+1);
-
-        } else if (*current == '\"') {
-                current ++;
-
-                for (e = current; *e; e++) {
-                        if (escaped)
-                                escaped = false;
-                        else if (*e == '\\')
-                                escaped = true;
-                        else if (*e == '\"')
-                                break;
-                }
-
-                *l = e-current;
-                *state = (char*) (*e == 0 ? e : e+1);
-
-        } else {
-                for (e = current; *e; e++) {
-                        if (escaped)
-                                escaped = false;
-                        else if (*e == '\\')
-                                escaped = true;
-                        else if (strchr(WHITESPACE, *e))
-                                break;
-                }
-                *l = e-current;
-                *state = (char*) e;
-        }
-
-        return (char*) current;
-}
-
-/* Split a string into words. */
-char *split(const char *c, size_t *l, const char *separator, char **state) {
-        char *current;
-
-        current = *state ? *state : (char*) c;
-
-        if (!*current || *c == 0)
-                return NULL;
-
-        current += strspn(current, separator);
-        *l = strcspn(current, separator);
-        *state = current+*l;
-
-        return (char*) current;
-}
-
-int unhexchar(char c) {
-
-        if (c >= '0' && c <= '9')
-                return c - '0';
-
-        if (c >= 'a' && c <= 'f')
-                return c - 'a' + 10;
-
-        if (c >= 'A' && c <= 'F')
-                return c - 'A' + 10;
-
-        return -1;
-}
-
-int unoctchar(char c) {
-
-        if (c >= '0' && c <= '7')
-                return c - '0';
-
-        return -1;
-}

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>
@@ -135,16 +134,8 @@ 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);
@@ -167,7 +158,7 @@ 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
+#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);
@@ -571,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

logtee.c

@@ -1,54 +0,0 @@
-#define _GNU_SOURCE
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-
-#define BUFLEN 4096
-
-int
-main(int argc, char *argv[])
-{
-	int fd;
-	int len, slen;
-
-	if (argc != 2) {
-		fprintf(stderr, "Usage: %s <file>\n", argv[0]);
-		exit(EXIT_FAILURE);
-	}
-
-	fd = open(argv[1], O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (fd == -1) {
-		perror("open");
-		exit(EXIT_FAILURE);
-	}
-
-	fprintf(stderr, "Logging to %s: ", argv[1]);
-
-	slen = 0;
-
-	do {
-		len = splice(STDIN_FILENO, NULL, fd, NULL,
-			     BUFLEN, SPLICE_F_MOVE);
-
-		if (len < 0) {
-			if (errno == EAGAIN)
-				continue;
-			perror("tee");
-			exit(EXIT_FAILURE);
-		} else
-			if (len == 0)
-				break;
-		slen += len;
-		if ((slen/BUFLEN) > 0) {
-			fprintf(stderr, ".");
-		}
-		slen = slen % BUFLEN;
-
-	} while (1);
-	close(fd);
-	fprintf(stderr, "\n");
-	exit(EXIT_SUCCESS);
-}

lsinitrd-bash-completion.sh

@@ -1,4 +1,7 @@
 #
+# -*- 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

lsinitrd.1.asc

@@ -34,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.
@@ -27,12 +29,6 @@ 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
@@ -43,20 +39,16 @@ usage()
 
 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 \
     -- "$@")
 
 if (( $? != 0 )); then
@@ -68,16 +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
@@ -121,19 +110,13 @@ if ! [[ -f "$image" ]]; then
     exit 1
 fi
 
-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
+    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
+        $CAT $image 2>/dev/null | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
         ((ret+=$?))
         [[ $nofileinfo ]] || echo "========================================================================"
         [[ $nofileinfo ]] || echo
@@ -143,8 +126,7 @@ extract_files()
 list_modules()
 {
     echo "dracut modules:"
-    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
-        $(dracutlibdirs modules.txt) 2>/dev/null
+    $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
     ((ret+=$?))
 }
 
@@ -160,22 +142,9 @@ list_files()
     echo "========================================================================"
 }
 
-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
-}
 
-
-if (( ${#filenames[@]} <= 0 )) && [[ -z "$unpack" ]] && [[ -z "$unpackearly" ]]; then
-    echo "Image: $image: $(du -h $image | while read a b || [ -n "$a" ]; do echo $a;done)"
+if (( ${#filenames[@]} <= 0 )); then
+    echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)"
     echo "========================================================================"
 fi
 
@@ -185,22 +154,13 @@ case $bin in
         CAT="cat --"
         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
@@ -211,38 +171,39 @@ case $bin in
         ;;
 esac
 
-if [[ $SKIP ]] ; then
-    bin="$($SKIP "$image" | { read -N 6 bin && echo "$bin" ; })"
-else
-    read -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 --"
+
+CAT=$({
+        if [[ $SKIP ]]; then
+            $SKIP "$image"
         else
-            CAT="xzcat --"
-        fi
-        ;;
-esac
+            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()
 {
@@ -254,26 +215,12 @@ if [[ $SKIP ]]; then
     CAT=skipcpio
 fi
 
-if (( ${#filenames[@]} > 1 )); then
-    TMPFILE="$(mktemp -t --suffix=.cpio lsinitrd.XXXXXX)"
-    $CAT "$image" 2>/dev/null > $TMPFILE
-    trap "rm -f '$TMPFILE'" EXIT
-    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
-    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
-        $(dracutlibdirs 'dracut-*') 2>/dev/null)
+    version=$($CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
     ((ret+=$?))
     echo "Version: $version"
     echo
@@ -282,8 +229,7 @@ else
         echo "========================================================================"
     else
         echo -n "Arguments: "
-        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
-            $(dracutlibdirs build-parameter.txt) 2>/dev/null
+        $CAT "$image" 2>/dev/null | 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

mkinitrd-dracut.sh

@@ -1,11 +1,6 @@
 #!/bin/bash --norc
 kver=$(uname -r)
 
-boot_dir="/boot"
-quiet=0
-host_only=0
-force=0
-
 error() { echo "$@" >&2; }
 
 usage () {
@@ -29,105 +24,36 @@ read_arg() {
     # $1 = arg name
     # $2 = arg value
     # $3 = arg parameter
-    param="$1"
-    local rematch='^[^=]*=(.*)$' result
+    local rematch='^[^=]*=(.*)$'
     if [[ $2 =~ $rematch ]]; then
-        read "$param" <<< "${BASH_REMATCH[1]}"
-    else
-	for ((i=3; $i <= $#; i++)); do
-            # Only read next arg if it not an arg itself.
-            if [[ ${@:$i:1} = -* ]];then
-		break
-            fi
-            result="$result ${@:$i:1}"
-            # There is no way to shift our callers args, so
-            # return "no of args" to indicate they should do it instead.
-	done
-	read "$1" <<< "$result"
-        return $(($i - 3))
+        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
 }
 
-# Taken over from SUSE mkinitrd
-default_kernel_images() {
-    local regex kernel_image kernel_version version_version initrd_image
-    local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'
-
-    case "$(uname -m)" in
-        s390|s390x)
-            regex='image'
-            ;;
-        ppc|ppc64)
-            regex='vmlinux'
-            ;;
-        i386|x86_64)
-            regex='vmlinuz'
-            ;;
-        arm*)
-            regex='[uz]Image'
-            ;;
-        aarch64)
-            regex='Image'
-            ;;
-        *)  regex='vmlinu.'
-            ;;
-    esac
-
-    # user mode linux
-    if grep -q UML /proc/cpuinfo; then
-            regex='linux'
-    fi
-
-    kernel_images=""
-    initrd_images=""
-    for kernel_image in $(ls $boot_dir \
-            | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \
-            | grep -v kdump$ ) ; do
-
-        # Note that we cannot check the RPM database here -- this
-        # script is itself called from within the binary kernel
-        # packages, and rpm does not allow recursive calls.
-
-        [ -L "$boot_dir/$kernel_image" ] && continue
-        [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
-        kernel_version=$(/usr/bin/get_kernel_version \
-                         $boot_dir/$kernel_image 2> /dev/null)
-        initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
-        if [ "$kernel_image" != "$initrd_image" -a \
-             -n "$kernel_version" -a \
-             -d "/lib/modules/$kernel_version" ]; then
-                kernel_images="$kernel_images $boot_dir/$kernel_image"
-                initrd_images="$initrd_images $boot_dir/$initrd_image"
-        fi
-    done
-    for kernel_image in $kernel_images;do
-	kernels="$kernels ${kernel_image#*-}"
-    done
-    for initrd_image in $initrd_images;do
-	targets="$targets $initrd_image"
-    done
-    host_only=1
-    force=1
-}
-
 while (($# > 0)); do
     case ${1%%=*} in
-        --with-usb) read_arg usbmodule "$@" || shift $?
+        --with-usb) read_arg usbmodule "$@" || shift
             basicmodules="$basicmodules ${usbmodule:-usb-storage}"
             unset usbmodule;;
-        --with-avail) read_arg modname "$@" || shift $?
+        --with-avail) read_arg modname "$@" || shift
             basicmodules="$basicmodules $modname";;
-        --with) read_arg modname "$@" || shift $?
+        --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) force=1;;
-        --preload) read_arg modname "$@" || shift $?
+        -f|--force) dracut_args="${dracut_args} -f";;
+        --preload) read_arg modname "$@" || shift
             basicmodules="$basicmodules $modname";;
         --image-version) img_vers=yes;;
-        --rootfs|-d) read_arg rootfs "$@" || shift $?
+        --rootfs) read_arg rootfs "$@" || shift
             dracut_args="${dracut_args} --filesystems $rootfs";;
         --nocompress) dracut_args="$dracut_args --no-compress";;
         --help) usage -n;;
@@ -154,31 +80,10 @@ while (($# > 0)); do
         --looppath*) ;;
         --dsdt*) ;;
         --bootchart) ;;
-	-s) ;;
-	--quiet|-q) quiet=1;;
-	-b) read_arg boot_dir "$@" || shift $?
-	    if [ ! -d $boot_dir ];then
-		error "Boot directory $boot_dir does not exist"
-		exit 1
-	    fi
-	    ;;
-	-k) # Would be nice to get a list of images here
-	    read_arg kernel_images "$@" || shift $?
-	    for kernel_image in $kernel_images;do
-		kernels="$kernels ${kernel_image#*-}"
-	    done
-	    host_only=1
-	    force=1
-	    ;;
-	-i) read_arg initrd_images "$@" || shift $?
-	    for initrd_image in $initrd_images;do
-		targets="$targets $boot_dir/$initrd_image"
-	    done
-	    ;;
-        *)  if [[ ! $targets ]]; then
-            targets=$1
-            elif [[ ! $kernels ]]; then
-            kernels=$1
+        *) if [[ ! $target ]]; then
+            target=$1
+            elif [[ ! $kernel ]]; then
+            kernel=$1
             else
             usage
             fi;;
@@ -186,41 +91,11 @@ while (($# > 0)); do
     shift
 done
 
-[[ $targets && $kernels ]] || default_kernel_images
-[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage)
+[[ $target && $kernel ]] || usage
+[[ $img_vers ]] && target="$target-$kernel"
 
-# We can have several targets/kernels, transform the list to an array
-targets=( $targets )
-[[ $kernels ]] && kernels=( $kernels )
-
-[[ $host_only == 1 ]] && dracut_args="${dracut_args} -H"
-[[ $force == 1 ]]     && dracut_args="${dracut_args} -f"
-
-echo "Creating: target|kernel|dracut args|basicmodules "
-for ((i=0 ; $i<${#targets[@]} ; i++)); do
-
-    if [[ $img_vers ]];then
-	target="${targets[$i]}-${kernels[$i]}"
-    else
-	target="${targets[$i]}"
-    fi
-    kernel="${kernels[$i]}"
-
-    # Duplicate code: No way found how to redirect output based on $quiet
-    if [[ $quiet == 1 ]];then
-	echo "$target|$kernel|$dracut_args|$basicmodules"
-	if [[ $basicmodules ]]; then
-            dracut $dracut_args --add-drivers "$basicmodules" "$target" \
-		"$kernel" &>/dev/null
-	else
-            dracut $dracut_args "$target" "$kernel" &>/dev/null
-	fi
-    else
-	if [[ $basicmodules ]]; then
-            dracut $dracut_args --add-drivers "$basicmodules" "$target" \
-		"$kernel"
-	else
-            dracut $dracut_args "$target" "$kernel"
-	fi
-    fi
-done
+if [[ $basicmodules ]]; then
+        dracut $dracut_args --add-drivers "$basicmodules" "$target" "$kernel"
+else
+        dracut $dracut_args "$target" "$kernel"
+fi

mkinitrd-suse.8.asc

@@ -1,106 +0,0 @@
-MKINITRD(8)
-===========
-:doctype: manpage
-:man source:   dracut
-:man manual:   dracut
-
-NAME
-----
-mkinitrd-suse - is a compat wrapper, which calls dracut to generate an initramfs
-
-SYNOPSIS
---------
-*mkinitrd* ['OPTION...']
-
-DESCRIPTION
------------
-*mkinitrd* creates an initramfs image <initrd-image> for the kernel with
-version <kernel-version> by calling *dracut*.
-
-[IMPORTANT]
-This version of mkinitrd is provided for compatibility with older
-versions of mkinitrd. If a more fine grained control over the
-resulting image is needed, *dracut* should be called directly.
-
-OPTIONS
--------
-**-R, --version**::
-    print info about the version
-
-**-k** _<kernel_list>_::
-    List of kernel images for which initrd files are created (relative
-    to _boot_dir_), Image name should begin with the following string,
-    defaults to _vmlinux_ on ppc/ppc64, _image_ on s390/s390x and _vmlinuz_
-    for everything else.
-
-**-i** _<initrd_list>_::
-    List of file names (relative to _boot_dir_) for the initrd; positions
-    have to match the _kernel_list_. Defaults to _initrd_.
-
-**-m** _<module_list>_::
-    Modules to include in initrd, defaults to _INITRD_MODULES_ variable
-    in */etc/sysconfig/kernel*.
-
-**-f** _<feature_list>_::
-    Features to be enabled for the initrd. In general mkinitrd
-    configures the initrd for the root device it is started from. With
-    this option additional feature can be enabled.
-
-**-b** _<bootdir>_::
-    Boot directory, defaults to */boot*, where the initrd is created.
-
-**-d** _<root_device>_::
-    Root device, defaults to the device from which the root_dir is
-    mounted; overwrites the rootdev environment variable if set
-
-**-s** _<size>_::
-    Add splash animation and bootscreen to initrd.
-
-**-D** _<interface>::
-    Run dhcp on the specified interface (for example "eth0").
-
-**-I** _<interface>::
-    Configure the specified interface statically.
-
-**-a** _<acpi_dsdt>::
-    Attach compiled ACPI DSDT (Differentiated System Description Table)
-    to initrd. This replaces the DSDT of the BIOS. Defaults to the
-    _ACPI_DSDT_ variable in */etc/sysconfig/kernel*.
-
-**-M** _<map>::
-    System.map file to use.
-
-**-B**::
-    Don’t run the *update-bootloader(8)* script after the initrd(s) have
-    been created. This is useful if you call mkinitrd(8) for anything
-    else than the running system.
-
-**-A**::
-    Create a so called "monster initrd" which includes all available
-    features and modules. This calls dracut with --no-hostonly and
-    --no-hostonly-cmdline parameters internally, instead of the default
-    --hostonly and --hostonly-cmdline.
-
-**-v, --verbose**::
-    increase verbosity level
-
-**-L**::
-    Disable logging to _/var/log/YaST2/mkinitrd.log_. This is useful for
-    testing if you don’t want to clutter the system log.
-
-**--help**::
-    print a help message and exit.
-
-AVAILABILITY
-------------
-The mkinitrd command is part of the dracut package and is available from
-link:$$https://dracut.wiki.kernel.org$$[https://dracut.wiki.kernel.org]
-
-AUTHORS
--------
-Harald Hoyer, Hannes Reinecke
-
-SEE ALSO
---------
-*dracut*(8)
-*update-bootloader*(8)

mkinitrd-suse.sh

@@ -1,393 +0,0 @@
-#!/bin/bash --norc
-#
-# mkinitrd compability wrapper for SUSE.
-#
-# Copyright (c) 2013 SUSE Linux Products GmbH. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-boot_dir="/boot"
-quiet=0
-logfile=/var/log/YaST2/mkinitrd.log
-dracut_cmd=dracut
-
-error() { echo "$@" >&2; }
-
-usage () {
-    [[ $1 = '-n' ]] && cmd=echo || cmd=error
-
-    $cmd "usage: ${0##*/} [options]"
-    $cmd ""
-    $cmd "	Create initial ramdisk images that contain all kernel modules needed"
-    $cmd "	in the early boot process, before the root file system becomes"
-    $cmd "	available."
-    $cmd "	This usually includes SCSI and/or RAID modules, a file system module"
-    $cmd "	for the root file system, or a network interface driver module for dhcp."
-    $cmd ""
-    $cmd "	options:"
-    $cmd "	-f \"feature list\"	Features to be enabled when generating initrd."
-    $cmd "				Available features are:"
-    $cmd "					iscsi, md, multipath, lvm, lvm2,"
-    $cmd "					ifup, fcoe, dcbd"
-    $cmd "	-k \"kernel list\"	List of kernel images for which initrd files are"
-    $cmd "				created. Defaults to all kernels found in /boot."
-    $cmd "	-i \"initrd list\"	List of file names for the initrd; position have"
-    $cmd "				match to \"kernel list\". Defaults to all kernels"
-    $cmd "				found in /boot."
-    $cmd "	-b boot_dir		Boot directory. Defaults to /boot."
-    $cmd "	-t tmp_dir		Temporary directory. Defaults to /var/tmp."
-    $cmd "	-M map			System.map file to use."
-    $cmd "	-A			Create a so called \"monster initrd\" which"
-    $cmd "				includes all features and modules possible."
-    $cmd "	-B			Do not update bootloader configuration."
-    $cmd "	-v			Verbose mode."
-    $cmd "	-L			Disable logging."
-    $cmd "	-h			This help screen."
-    $cmd "	-m \"module list\"	Modules to include in initrd. Defaults to the"
-    $cmd "				INITRD_MODULES variable in /etc/sysconfig/kernel"
-    $cmd "	-u \"DomU module list\"	Modules to include in initrd. Defaults to the"
-    $cmd "				DOMU_INITRD_MODULES variable in"
-    $cmd "				/etc/sysconfig/kernel."
-    $cmd "	-d root_device		Root device. Defaults to the device from"
-    $cmd "				which / is mounted. Overrides the rootdev"
-    $cmd "				enviroment variable if set."
-    $cmd "	-j device		Journal device"
-    $cmd "	-D interface		Run dhcp on the specified interface."
-    $cmd "	-I interface		Configure the specified interface statically."
-    $cmd "	-a acpi_dsdt		Obsolete, do not use."
-    $cmd "	-s size			Add splash animation and bootscreen to initrd."
-
-    [[ $1 = '-n' ]] && exit 0
-    exit 1
-}
-
-# Little helper function for reading args from the commandline.
-# it automatically handles -a b and -a=b variants, and returns 1 if
-# we need to shift $3.
-read_arg() {
-    # $1 = arg name
-    # $2 = arg value
-    # $3 = arg parameter
-    param="$1"
-    local rematch='^[^=]*=(.*)$' result
-    if [[ $2 =~ $rematch ]]; then
-        read "$param" <<< "${BASH_REMATCH[1]}"
-    else
-	for ((i=3; $i <= $#; i++)); do
-            # Only read next arg if it not an arg itself.
-            if [[ ${@:$i:1} = -* ]];then
-		break
-            fi
-            result="$result ${@:$i:1}"
-            # There is no way to shift our callers args, so
-            # return "no of args" to indicate they should do it instead.
-	done
-	read "$1" <<< "$result"
-        return $(($i - 3))
-    fi
-}
-
-# Helper functions to calculate ipconfig command line
-calc_netmask() {
-    local prefix=$1
-
-    [ -z "$prefix" ] && return
-    mask=$(( 0xffffffff << (32 - $prefix) ))
-    byte1=$(( mask >> 24 ))
-    byte2=$(( mask >> 16 ))
-    byte3=$(( mask >> 8 ))
-    byte4=$(( mask & 0xff ))
-    netmask=$(printf "%d.%d.%d.%d" $(( byte1 & 0xff )) $(( byte2 & 0xff )) $(( byte3 & 0xff )) $byte4);
-
-    echo $netmask
-}
-
-ipconfig() {
-    local interface=$1
-    local iplink macaddr broadcast gateway ipaddr prefix netmask
-
-    iplink=$(ip addr show dev $interface | sed -n 's/ *inet \(.*\) brd.*/\1/p')
-    macaddr=$(ip addr show dev $interface | sed -n 's/.*ether \(.*\) brd.*/\1/p')
-    broadcast=$(ip addr show dev $interface | sed -n 's/.*brd \(.*\) scope.*/\1/p')
-    gateway=$(ip route show dev $interface | sed -n 's/default via \([0-9\.]*\).*/\1/p')
-
-    ipaddr=${iplink%%/*}
-    prefix=${iplink##*/}
-    netmask=$(calc_netmask $prefix)
-
-    echo "${ipaddr}:${serveraddr}:${gateway}:${netmask}:${hostname}:${interface}:none::${macaddr}"
-}
-
-is_xen_kernel() {
-    local kversion=$1
-    local root_dir=$2
-    local cfg
-
-    for cfg in ${root_dir}/boot/config-$kversion $root_dir/lib/modules/$kversion/build/.config
-    do
-        test -r $cfg || continue
-        grep -q "^CONFIG_XEN=y\$" $cfg
-        return
-    done
-    test $kversion != "${kversion%-xen*}"
-    return
-}
-
-# kernel_image_gz_from_image() and kernel_version_from_image() are helpers
-# for arm* kernels which produce zImage files which cannot be read from
-# get_kernel_version -> get rid of this workaround if possible
-kernel_image_gz_from_image() {
-    local arch=$(uname -i)
-    local r=${1}.gz
-
-    # uImage kernels can't be extracted directly. Use the vmlinux.gz instead
-    r=${r//uImage/vmlinux}
-
-    # on ARM a zImage can't be extracted directly. Other platforms define it
-    # as a gzipped vmlinux file, but not ARM. So only on ARM, use vmlinux.gz.
-    if [[ $arch =~ arm ]] || [[ $arch =~ aarch ]]; then
-        r=${r//zImage/vmlinux}
-    fi
-
-    echo $r
-}
-
-kernel_version_from_image() {
-    local kernel_image="$1" kernel_image_gz=$(kernel_image_gz_from_image "$1")
-
-    if get_kernel_version "$kernel_image" 2>/dev/null; then
-        return
-    fi
-    get_kernel_version "$kernel_image_gz" 2>/dev/null
-}
-
-# Taken over from SUSE mkinitrd
-default_kernel_images() {
-    local regex kernel_image kernel_version version_version initrd_image
-    local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'
-
-    case "$(uname -m)" in
-        s390|s390x)
-            regex='image'
-            ;;
-        ppc|ppc64)
-            regex='vmlinux'
-            ;;
-        i386|x86_64)
-            regex='vmlinuz'
-            ;;
-        arm*)
-            regex='[uz]Image'
-            ;;
-        aarch64)
-            regex='Image'
-            ;;
-        *)  regex='vmlinu.'
-            ;;
-    esac
-
-    kernel_images=""
-    initrd_images=""
-    for kernel_image in $(ls $boot_dir \
-            | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \
-            | grep -v kdump$ ) ; do
-
-        # Note that we cannot check the RPM database here -- this
-        # script is itself called from within the binary kernel
-        # packages, and rpm does not allow recursive calls.
-
-        [ -L "$boot_dir/$kernel_image" ] && continue
-        [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
-
-        kernel_version=$(kernel_version_from_image \
-                         $boot_dir/$kernel_image 2> /dev/null)
-        initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
-        if [ "$kernel_image" != "$initrd_image" -a \
-             -n "$kernel_version" -a \
-             -d "/lib/modules/$kernel_version" ]; then
-                kernel_images="$kernel_images $boot_dir/$kernel_image"
-                initrd_images="$initrd_images $boot_dir/$initrd_image"
-        fi
-    done
-    for kernel_image in $kernel_images;do
-	kernels="$kernels ${kernel_image#*-}"
-    done
-    for initrd_image in $initrd_images;do
-	targets="$targets $initrd_image"
-    done
-}
-
-while (($# > 0)); do
-    case ${1%%=*} in
-	-f) read_arg feature_list "$@" || shift $?
-	    # Could be several features
-	    ;;
-	-k) # Would be nice to get a list of images here
-	    read_arg kernel_images "$@" || shift $?
-	    for kernel_image in $kernel_images;do
-		[ -L "/boot/$kernel_image" ] && kernel_image="$(readlink "/boot/$kernel_image")"
-		kernels="$kernels ${kernel_image#*-}"
-	    done
-	    ;;
-	-i) read_arg initrd_images "$@" || shift $?
-	    for initrd_image in $initrd_images;do
-		[ -L "/boot/$initrd_image" ] && initrd_image="$(readlink "/boot/$initrd_image")"
-		# Check if the initrd_image contains a path.
-		# if not, then add the default boot_dir
-		dname=`dirname $initrd_image`
-		if [ "$dname" == "." ]; then
-                    targets="$targets $boot_dir/$initrd_image";
-		else
-                    targets="$targets $initrd_image";
-		fi
-	    done
-	    ;;
-	-b) read_arg boot_dir "$@" || shift $?
-	    if [ ! -d $boot_dir ];then
-		error "Boot directory $boot_dir does not exist"
-		exit 1
-	    fi
-	    ;;
-	-t) read_arg tmp_dir "$@" || shift $?
-	    dracut_args="${dracut_args} --tmpdir $tmp_dir"
-	    ;;
-	-M) read_arg map_file "$@" || shift $?
-	    ;;
-	-A) dracut_args="${dracut_args} --no-host-only";;
-	-B) skip_update_bootloader=1;;
-        -v|--verbose) dracut_args="${dracut_args} -v";;
-	-L) logfile=;;
-        -h|--help) usage -n;;
-	-m) read_arg module_list "$@" || shift $? ;;
-	-u) read_arg domu_module_list "$@" || shift $?
-	    echo "mkinitrd: DomU modules not yet supported" ;;
-        -d) read_arg rootfs "$@" || shift $?
-            dracut_args="${dracut_args} --filesystems $rootfs" ;;
-	-D) read_arg dhcp_if "$@" || shift $?
-	    dracut_cmdline="${dracut_cmdline} ip=${dhcp_if}:dhcp"
-	    ;;
-	-I) read_arg static_if "$@" || shift $?
-	    dracut_cmdline="${dracut_cmdline} ip=$(ipconfig $static_if)":
-	    ;;
-	-a) read_arg acpi_dsdt "$@" || shift $?
-	    echo "Obsolete -a param, use acpi_table_dir= and acpi_override= variables in /etc/dracut.conf.d/"
-	    exit 1
-	    ;;
-	-s) read_arg boot_splash "$@" || shift $?
-	    echo "mkinitrd: boot splash not yet supported"
-	    exit 1
-	    ;;
-	-V) echo "mkinitrd: vendor scipts are no longer supported"
-	    exit 1;;
-	--dracut)
-	    read_arg dracut_cmd "$@" || shift $? ;;
-        --version|-R)
-            echo "mkinitrd: dracut compatibility wrapper"
-            exit 0;;
-	--quiet|-q) quiet=1;;
-        *)  if [[ ! $targets ]]; then
-            targets=$1
-            elif [[ ! $kernels ]]; then
-            kernels=$1
-            else
-            usage
-            fi;;
-    esac
-    shift
-done
-
-[[ $targets && $kernels ]] || default_kernel_images
-if [[ ! $targets || ! $kernels ]];then
-    error "No kernel found in $boot_dir or bad modules dir in /lib/modules"
-    exit 1
-fi
-
-# We can have several targets/kernels, transform the list to an array
-targets=( $targets )
-[[ $kernels ]] && kernels=( $kernels )
-
-[[ $logfile ]]        && dracut_args="${dracut_args} --logfile $logfile"
-dracut_args="${dracut_args} --force"
-
-[[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline ${dracut_cmdline}"
-[ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1
-
-# Update defaults from /etc/sysconfig/kernel
-if [ -f /etc/sysconfig/kernel ] ; then
-    . /etc/sysconfig/kernel
-fi
-[[ $module_list ]] || module_list="${INITRD_MODULES}"
-[[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}"
-shopt -s extglob
-
-failed=""
-
-for ((i=0 ; $i<${#targets[@]} ; i++)); do
-
-    if [[ $img_vers ]];then
-	target="${targets[$i]}-${kernels[$i]}"
-    else
-	target="${targets[$i]}"
-    fi
-    kernel="${kernels[$i]}"
-
-    if is_xen_kernel $kernel $rootfs ; then
-	modules_all="${module_list} ${domu_module_list}"
-    else
-        modules_all="${module_list}"
-    fi
-
-    # Remove leading and trailing spaces needs (set above): shopt -s extglob
-    modules_all=${modules_all%%+([[:space:]])}
-    modules_all=${modules_all##+([[:space:]])}
-
-    echo "Creating initrd: $target"
-
-    # Duplicate code: No way found how to redirect output based on $quiet
-    if [[ $quiet == 1 ]];then
-        # Duplicate code: --force-drivers must not be called with empty string
-        # -> dracut bug workarounded ugly, because of complex whitespace
-        # expansion magics
-        if [ -n "${modules_all}" ];then
-            $dracut_cmd $dracut_args --force-drivers "${modules_all}" "$target" "$kernel" &>/dev/null
-            [ $? -ne 0 ] && failed="$failed $target"
-        else
-            $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null
-            [ $? -ne 0 ] && failed="$failed $target"
-        fi
-    else
-        if [ -n "${modules_all}" ];then
-            $dracut_cmd $dracut_args --force-drivers "${modules_all}" "$target" "$kernel"
-            [ $? -ne 0 ] && failed="$failed $target"
-        else
-            $dracut_cmd $dracut_args "$target" "$kernel"
-            [ $? -ne 0 ] && failed="$failed $target"
-        fi
-    fi
-done
-
-if [ "$skip_update_bootloader" ] ; then
-    echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually."
-else
-    update-bootloader --refresh
-    [ $? -ne 0 ] && echo "Updating bootloader failed" && exit 1
-fi
-
-if [ "$failed" != "" ]; then
-    echo "Generating $failed targets failed"
-    exit 1
-fi
-
-exit 0

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
 }
 
-# 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

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

@@ -1,18 +1,17 @@
 #!/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() {
     [[ "$mount_needs" ]] && return 1
     require_binaries /sbin/bootchartd || return 1
     return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     inst_symlink /init /sbin/init
     inst_dir /lib/bootchart/tmpfs

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
 }
 
-# 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

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
+    require_binaries $systemdutildir/systemd-bootchart || return 1
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_symlink /init /sbin/init
+    inst_multiple $systemdutildir/systemd-bootchart
+}

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=$(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 line ; do
-	if test "$line" = LOCAL ; then
-	    hwclock --systz
-	fi
-    done < /etc/adjtime
-fi

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

@@ -1,4 +1,6 @@
 #!/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

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

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
-else
-    . /sbin/fips.sh
-    fips_load_crypto || die "FIPS integrity test failed"
-fi

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

@@ -1,4 +1,6 @@
 #!/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

modules.d/01fips/fips.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 mount_boot()
 {
@@ -59,8 +61,8 @@ do_rhevh_check()
     kpath=${1}
 
     # If we're on RHEV-H, the kernel is in /run/initramfs/live/vmlinuz0
-    HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b || [ -n "$a" ]; do printf "%s\n" $a; done)
-    HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b || [ -n "$a" ]; do printf "%s\n" $a; done || return 1)
+    HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b; do printf "%s\n" $a; done)
+    HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b; do printf "%s\n" $a; done || return 1)
     if [ -z "$HMAC_SUM_ORIG" ] || [ -z "$HMAC_SUM_CALC" ] || [ "${HMAC_SUM_ORIG}" != "${HMAC_SUM_CALC}" ]; then
         warn "HMAC sum mismatch"
         return 1
@@ -69,8 +71,20 @@ do_rhevh_check()
     return 0
 }
 
-fips_load_crypto()
+do_fips()
 {
+    local _v
+    local _s
+    local _v
+    local _module
+
+    KERNEL=$(uname -r)
+
+    if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
+        warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist"
+        return 1
+    fi
+
     FIPSMODULES=$(cat /etc/fipsmodules)
 
     info "Loading and integrity checking all crypto modules"
@@ -80,7 +94,7 @@ fips_load_crypto()
             if ! modprobe "${_module}"; then
                 # check if kernel provides generic algo
                 _found=0
-                while read _k _s _v || [ -n "$_k" ]; do
+                while read _k _s _v; do
                     [ "$_k" != "name" -a "$_k" != "driver" ] && continue
                     [ "$_v" != "$_module" ] && continue
                     _found=1
@@ -95,16 +109,6 @@ fips_load_crypto()
     info "Self testing crypto algorithms"
     modprobe tcrypt || return 1
     rmmod tcrypt
-}
-
-do_fips()
-{
-    local _v
-    local _s
-    local _v
-    local _module
-
-    KERNEL=$(uname -r)
 
     info "Checking integrity of kernel"
     if [ -e "/run/initramfs/live/vmlinuz0" ]; then
@@ -112,34 +116,7 @@ do_fips()
     elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then
         do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
     else
-        BOOT_IMAGE="$(getarg BOOT_IMAGE)"
-
-        # Trim off any leading GRUB boot device (e.g. ($root) )
-        BOOT_IMAGE="$(echo "${BOOT_IMAGE}" | sed 's/^(.*)//')"
-
-        BOOT_IMAGE_NAME="${BOOT_IMAGE##*/}"
-        BOOT_IMAGE_PATH="${BOOT_IMAGE%${BOOT_IMAGE_NAME}}"
-
-        if [ -z "$BOOT_IMAGE_NAME" ]; then
-            BOOT_IMAGE_NAME="vmlinuz-${KERNEL}"
-        elif ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE_NAME}" ]; then
-            #if /boot is not a separate partition BOOT_IMAGE might start with /boot
-            BOOT_IMAGE_PATH=${BOOT_IMAGE_PATH#"/boot"}
-            #on some achitectures BOOT_IMAGE does not contain path to kernel
-            #so if we can't find anything, let's treat it in the same way as if it was empty
-            if ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE_NAME}" ]; then
-                BOOT_IMAGE_NAME="vmlinuz-${KERNEL}"
-                BOOT_IMAGE_PATH=""
-            fi
-        fi
-
-        BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE_PATH}/.${BOOT_IMAGE_NAME}.hmac"
-        if ! [ -e "${BOOT_IMAGE_HMAC}" ]; then
-            warn "${BOOT_IMAGE_HMAC} does not exist"
-            return 1
-        fi
-
-        (cd "${BOOT_IMAGE_HMAC%/*}" && sha512hmac -c "${BOOT_IMAGE_HMAC}") || return 1
+        sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
     fi
 
     info "All initrd crypto checks done"

modules.d/01fips/module-setup.sh

@@ -1,43 +1,23 @@
 #!/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() {
     return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 installkernel() {
-    local _fipsmodules _mod _bootfstype
-    if [[ -f "${srcmods}/modules.fips" ]]; then
-        _fipsmodules="$(cat "${srcmods}/modules.fips")"
-    else
-        _fipsmodules=""
-
-        # Hashes:
-        _fipsmodules+="sha1 sha224 sha256 sha384 sha512 "
-        _fipsmodules+="sha3-224 sha3-256 sha3-384 sha3-512 "
-        _fipsmodules+="crc32c crct10dif ghash "
-
-        # Ciphers:
-        _fipsmodules+="cipher_null des3_ede aes cfb "
-
-        # Modes/templates:
-        _fipsmodules+="ecb cbc ctr xts gcm ccm authenc hmac cmac "
-
-        # Compression algs:
-        _fipsmodules+="deflate lzo zlib "
-
-        # PRNG algs:
-        _fipsmodules+="ansi_cprng "
-
-        # Misc:
-        _fipsmodules+="aead cryptomgr tcrypt crypto_user "
-    fi
+    local _fipsmodules _mod
+    _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
+    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
+    _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+    _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+    _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390"
+    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
 
     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
 
@@ -47,39 +27,22 @@ installkernel() {
             echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
         fi
     done
-
-    # with hostonly_default_device fs module for /boot is not installed by default
-    if [[ $hostonly ]] && [[ "$hostonly_default_device" == "no" ]]; then
-        _bootfstype=$(find_mp_fstype /boot)
-        if [[ -n "$_bootfstype" ]]; then
-            hostonly='' instmods $_bootfstype
-        else
-            dwarning "Can't determine fs type for /boot, FIPS check may fail."
-        fi
-    fi
 }
 
-# called by dracut
 install() {
     local _dir
     inst_hook pre-trigger 01 "$moddir/fips-boot.sh"
     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
-    inst_hook pre-udev 01 "$moddir/fips-load-crypto.sh"
     inst_script "$moddir/fips.sh" /sbin/fips.sh
 
-    inst_multiple sha512hmac rmmod insmod mount uname umount
+    inst_multiple sha512hmac rmmod insmod mount uname umount fipscheck
 
+    inst_libdir_file libsoftokn3.so libsoftokn3.so \
+        libsoftokn3.chk libfreebl3.so libfreebl3.chk \
+        libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \
+        libfreeblpriv3.so libfreeblpriv3.chk
+
+    inst_multiple -o prelink
     inst_simple /etc/system-fips
-    [ -c ${initdir}/dev/random ] || mknod ${initdir}/dev/random c 1 8 \
-        || {
-            dfatal "Cannot create /dev/random"
-            dfatal "To create an initramfs with fips support, dracut has to run as root"
-            return 1
-        }
-    [ -c ${initdir}/dev/urandom ] || mknod ${initdir}/dev/urandom c 1 9 \
-        || {
-            dfatal "Cannot create /dev/random"
-            dfatal "To create an initramfs with fips support, dracut has to run as root"
-            return 1
-        }
 }
+

modules.d/01systemd-initrd/module-setup.sh

@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
-    [[ $mount_needs ]] && return 1
-
-    if ! dracut_module_included "systemd"; then
-        derror "systemd-initrd needs systemd in the initramfs"
-        return 1
-    fi
-
-    return 0
-}
-
-# called by dracut
-depends() {
-    echo "systemd"
-}
-
-installkernel() {
-    return 0
-}
-
-# called by dracut
-install() {
-    local _mods
-
-    inst_multiple -o \
-        $systemdsystemunitdir/initrd.target \
-        $systemdsystemunitdir/initrd-fs.target \
-        $systemdsystemunitdir/initrd-root-device.target \
-        $systemdsystemunitdir/initrd-root-fs.target \
-        $systemdsystemunitdir/initrd-switch-root.target \
-        $systemdsystemunitdir/initrd-switch-root.service \
-        $systemdsystemunitdir/initrd-cleanup.service \
-        $systemdsystemunitdir/initrd-udevadm-cleanup-db.service \
-        $systemdsystemunitdir/initrd-parse-etc.service
-
-    ln_r "${systemdsystemunitdir}/initrd.target" "${systemdsystemunitdir}/default.target"
-
-    local VERSION=""
-    local PRETTY_NAME=""
-    if [ -e /etc/os-release ]; then
-        . /etc/os-release
-        [[ -n ${VERSION} ]] && VERSION+=" "
-        [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" "
-    fi
-    NAME=dracut
-    ID=dracut
-    VERSION+="dracut-$DRACUT_VERSION"
-    PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"
-    VERSION_ID=$DRACUT_VERSION
-    ANSI_COLOR="0;34"
-
-    {
-        echo NAME=\"$NAME\"
-        echo VERSION=\"$VERSION\"
-        echo ID=$ID
-        echo VERSION_ID=$VERSION_ID
-        echo PRETTY_NAME=\"$PRETTY_NAME\"
-        echo ANSI_COLOR=\"$ANSI_COLOR\"
-    } > $initdir/usr/lib/initrd-release
-    echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
-    ln -sf ../usr/lib/initrd-release $initdir/etc/initrd-release
-    ln -sf initrd-release $initdir/usr/lib/os-release
-    ln -sf initrd-release $initdir/etc/os-release
-}
-

modules.d/02caps/caps.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 capsmode=$(getarg rd.caps)
 
 if [ "$capsmode" = "1" ]; then
     CAPS_INIT_DROP=$(getarg rd.caps.initdrop=)
-    CAPS_USERMODEHELPER_BSET=$(capsh --drop="$CAPS_INIT_DROP" -- -c 'while read a b  || [ -n "$a" ]; do [ "$a" = "CapBnd:" ] && echo $((0x${b:$((${#b}-8)):8})) $((0x${b:$((${#b}-16)):8})) && break; done < /proc/self/status')
+    CAPS_USERMODEHELPER_BSET=$(capsh --drop="$CAPS_INIT_DROP" -- -c 'while read a b ; do [ "$a" = "CapBnd:" ] && echo $((0x${b:$((${#b}-8)):8})) $((0x${b:$((${#b}-16)):8})) && break; done < /proc/self/status')
     CAPS_MODULES_DISABLED=$(getarg rd.caps.disablemodules=)
     CAPS_KEXEC_DISABLED=$(getarg rd.caps.disablekexec=)
 

modules.d/02caps/module-setup.sh

@@ -1,17 +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 capsh
-    return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     if ! dracut_module_included "systemd"; then
         inst_hook pre-pivot 00 "$moddir/caps.sh"

modules.d/02fips-aesni/module-setup.sh

@@ -0,0 +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
+
+check() {
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+installkernel() {
+    local _fipsmodules _mod
+    _fipsmodules="aesni-intel ghash_clmulni_intel"
+
+    mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+
+    for _mod in $_fipsmodules; do
+        if instmods $_mod; then
+            echo $_mod >> "${initdir}/etc/fipsmodules"
+            echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
+        fi
+    done
+}
+
+install() {
+    return 0
+}
+

modules.d/02systemd-networkd/module-setup.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
-    [[ $mount_needs ]] && return 1
-
-    if ! dracut_module_included "systemd"; then
-        derror "systemd-networkd needs systemd in the initramfs"
-        return 1
-    fi
-
-    return 255
-}
-
-# called by dracut
-depends() {
-    echo "systemd kernel-network-modules"
-}
-
-installkernel() {
-    return 0
-}
-
-# called by dracut
-install() {
-    inst_multiple -o \
-        $systemdutildir/systemd-networkd \
-        $systemdutildir/systemd-networkd-wait-online \
-        $systemdsystemunitdir/systemd-networkd-wait-online.service \
-        $systemdsystemunitdir/systemd-networkd.service \
-        $systemdsystemunitdir/systemd-networkd.socket \
-        $systemdutildir/network/99-default.link \
-        networkctl ip
-
-        #hostnamectl timedatectl
-        # $systemdutildir/systemd-timesyncd \
-        # $systemdutildir/systemd-timedated \
-        # $systemdutildir/systemd-hostnamed \
-        # $systemdutildir/systemd-resolvd \
-        # $systemdutildir/systemd-resolve-host \
-        # $systemdsystemunitdir/systemd-resolved.service \
-        # $systemdsystemunitdir/systemd-hostnamed.service \
-        # $systemdsystemunitdir/systemd-timesyncd.service \
-        # $systemdsystemunitdir/systemd-timedated.service \
-        # $systemdsystemunitdir/time-sync.target \
-        # /etc/systemd/resolved.conf \
-
-
-    # inst_dir /var/lib/systemd/clock
-
-    grep '^systemd-network:' /etc/passwd 2>/dev/null >> "$initdir/etc/passwd"
-    grep '^systemd-network:' /etc/group >> "$initdir/etc/group"
-    # grep '^systemd-timesync:' /etc/passwd 2>/dev/null >> "$initdir/etc/passwd"
-    # grep '^systemd-timesync:' /etc/group >> "$initdir/etc/group"
-
-    _arch=$(uname -m)
-    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
-                     {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*" \
-                     {"tls/$_arch/",tls/,"$_arch/",}"libnss_myhostname.so.*" \
-                     {"tls/$_arch/",tls/,"$_arch/",}"libnss_resolve.so.*"
-
-    for i in \
-        systemd-networkd-wait-online.service \
-            systemd-networkd.service \
-            systemd-networkd.socket
-#            systemd-timesyncd.service
-    do
-        systemctl --root "$initdir" enable "$i"
-    done
-}
-

modules.d/03modsign/load-modsign-keys.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 #
 # Licensed under the GPLv2
 #

modules.d/03modsign/module-setup.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 #
 # Licensed under the GPLv2
 #
 # Copyright 2013 Red Hat, Inc.
 # Peter Jones <pjones@redhat.com>
 
-# called by dracut
 check() {
     require_binaries keyctl || return 1
 
@@ -19,15 +20,13 @@ check() {
     return 0
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     inst_dir /lib/modules/keys
-    inst_binary keyctl
+    inst_binary /usr/bin/keyctl
 
     inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
 

modules.d/03rescue/module-setup.sh

@@ -1,20 +1,19 @@
 #!/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() {
     # do not add this module by default
     return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     inst_multiple -o ps grep more cat rm strace free showmount \
         ping netstat rpcinfo vi scp ping6 ssh \
-        fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.f2fs fsck.vfat e2fsck
+        fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.vfat e2fsck
 }
 

modules.d/04watchdog/module-setup.sh

@@ -1,79 +1,28 @@
 #!/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() {
     return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
-    # Do not add watchdog hooks if systemd module is included
-    # In that case, systemd will manage watchdog kick
-    if ! dracut_module_included "systemd"; then
-        inst_hook cmdline   00 "$moddir/watchdog.sh"
-        inst_hook cmdline   50 "$moddir/watchdog.sh"
-        inst_hook pre-trigger 00 "$moddir/watchdog.sh"
-        inst_hook initqueue 00 "$moddir/watchdog.sh"
-        inst_hook mount     00 "$moddir/watchdog.sh"
-        inst_hook mount     50 "$moddir/watchdog.sh"
-        inst_hook mount     99 "$moddir/watchdog.sh"
-        inst_hook pre-pivot 00 "$moddir/watchdog.sh"
-        inst_hook pre-pivot 99 "$moddir/watchdog.sh"
-        inst_hook cleanup   00 "$moddir/watchdog.sh"
-        inst_hook cleanup   99 "$moddir/watchdog.sh"
-    fi
+    inst_hook cmdline   00 "$moddir/watchdog.sh"
+    inst_hook cmdline   50 "$moddir/watchdog.sh"
+    inst_hook pre-trigger 00 "$moddir/watchdog.sh"
+    inst_hook initqueue 00 "$moddir/watchdog.sh"
+    inst_hook mount     00 "$moddir/watchdog.sh"
+    inst_hook mount     50 "$moddir/watchdog.sh"
+    inst_hook mount     99 "$moddir/watchdog.sh"
+    inst_hook pre-pivot 00 "$moddir/watchdog.sh"
+    inst_hook pre-pivot 99 "$moddir/watchdog.sh"
+    inst_hook cleanup   00 "$moddir/watchdog.sh"
+    inst_hook cleanup   99 "$moddir/watchdog.sh"
     inst_hook emergency 02 "$moddir/watchdog-stop.sh"
     inst_multiple -o wdctl
 }
 
-installkernel() {
-    local -A _drivers
-    local _alldrivers _active _wdtdrv _wdtppath _dir
-    [[ -d /sys/class/watchdog/ ]] || return
-    for _dir in /sys/class/watchdog/*; do
-        [[ -d "$_dir" ]] || continue
-        [[ -f "$_dir/state" ]] || continue
-        _active=$(< "$_dir/state")
-        ! [[ $hostonly ]] || [[ "$_active" =  "active" ]] || continue
-        # device/modalias will return driver of this device
-        _wdtdrv=$(< "$_dir/device/modalias")
-        # There can be more than one module represented by same
-        # modalias. Currently load all of them.
-        # TODO: Need to find a way to avoid any unwanted module
-        # represented by modalias
-        _wdtdrv=$(modprobe --set-version "$kernel" -R $_wdtdrv 2>/dev/null)
-        if [[ $_wdtdrv ]]; then
-            instmods $_wdtdrv
-            for i in $_wdtdrv; do
-                _drivers[$i]=1
-            done
-        fi
-        # however in some cases, we also need to check that if there is
-        # a specific driver for the parent bus/device.  In such cases
-        # we also need to enable driver for parent bus/device.
-        _wdtppath=$(readlink -f "$_dir/device")
-        while [[ -d "$_wdtppath" ]] && [[ "$_wdtppath" != "/sys" ]]; do
-            _wdtppath=$(readlink -f "$_wdtppath/..")
-            [[ -f "$_wdtppath/modalias" ]] || continue
-
-            _wdtdrv=$(< "$_wdtppath/modalias")
-            _wdtdrv=$(modprobe --set-version "$kernel" -R $_wdtdrv 2>/dev/null)
-            if [[ $_wdtdrv ]]; then
-                instmods $_wdtdrv
-                for i in $_wdtdrv; do
-                    _drivers[$i]=1
-                done
-            fi
-        done
-    done
-    # ensure that watchdog module is loaded as early as possible
-    _alldrivers="${!_drivers[*]}"
-    [[ $_alldrivers ]] && echo "rd.driver.pre=${_alldrivers// /,}" > ${initdir}/etc/cmdline.d/00-watchdog.conf
-
-    return 0
-}

modules.d/04watchdog/watchdog-stop.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-[ -c /dev/watchdog ] && printf 'V' > /dev/watchdog
+[ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog

modules.d/05busybox/module-setup.sh

@@ -1,18 +1,17 @@
 #!/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 busybox || return 1
 
     return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     local _i _progs _path _busybox
     _busybox=$(type -P busybox)

modules.d/06rngd/module-setup.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: set tabstop=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80:
-#
-# Copyright (c) 2019 Red Hat, Inc.
-# Author: Renaud Métrich <rmetrich@redhat.com>
-#
-# 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 3 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/>.
-#
-
-depends() {
-    echo systemd
-    return 0
-}
-
-check() {
-    # if there's no rngd binary, no go.
-    require_binaries rngd || return 1
-
-    return 0
-}
-
-install() {
-    inst rngd
-    inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service"
-    mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants"
-    ln -rfs "${initdir}${systemdsystemunitdir}/rngd.service" \
-        "${initdir}${systemdsystemunitdir}/sysinit.target.wants/rngd.service"
-}

modules.d/06rngd/rngd.service

@@ -1,7 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-DefaultDependencies=no
-Before=systemd-udevd.service
-
-[Service]
-ExecStart=/usr/sbin/rngd -f

modules.d/10i18n/console_init.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 [ -n "$DRACUT_SYSTEMD" ] && exit 0
 

modules.d/10i18n/module-setup.sh

@@ -1,6 +1,7 @@
 #!/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() {
     [[ "$mount_needs" ]] && return 1
 
@@ -9,12 +10,10 @@ check() {
     return 0
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     if dracut_module_included "systemd"; then
         unset FONT
@@ -29,24 +28,20 @@ install() {
 
     # This is from 10redhat-i18n.
     findkeymap () {
-        local MAPS=$1
-        local MAPNAME=${1%.map*}
-        local map
-        [[ ! -f $MAPS ]] && \
-            MAPS=$(find ${kbddir}/keymaps -type f -name ${MAPNAME} -o -name ${MAPNAME}.map -o -name ${MAPNAME}.map.\*)
+        local MAP=$1
+        [[ ! -f $MAP ]] && \
+            MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
+        [[ " $KEYMAPS " = *" $MAP "* ]] && return
+        KEYMAPS="$KEYMAPS $MAP"
+        case $MAP in
+            *.gz) cmd=zgrep;;
+            *.bz2) cmd=bzgrep;;
+            *) cmd=grep ;;
+        esac
 
-        for map in $MAPS; do
-            KEYMAPS="$KEYMAPS $map"
-            case $map in
-                *.gz) cmd=zgrep;;
-                *.bz2) cmd=bzgrep;;
-                *) cmd=grep ;;
-            esac
-
-            for INCL in $($cmd "^include " $map | while read a a b || [ -n "$a" ]; do echo ${a//\"/}; done); do
-                for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
-                    strstr "$KEYMAPS" "$FN" || findkeymap $FN
-                done
+        for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a//\"/}; done); do
+            for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
+                findkeymap $FN
             done
         done
     }
@@ -104,13 +99,6 @@ install() {
             inst_rules ${moddir}/10-console.rules
             inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
         fi
-
-        if [[ ${kbddir} != "/usr/share" ]]; then
-            inst_dir /usr/share
-            for _src in $(eval echo {${KBDSUBDIRS}}); do
-                [ ! -e "${initdir}/usr/share/${_src}" ] && ln -s "${kbddir}/${_src}" "${initdir}/usr/share/${_src}"
-            done
-        fi
     }
 
     install_all_kbd() {
@@ -118,19 +106,19 @@ install() {
 
         for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do
             inst_dir "$_src"
-            $DRACUT_CP -L -t "${initdir}/${_src}" "$_src"/*
+            cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/*
         done
 
         # remove unnecessary files
         rm -f -- "${initdir}${kbddir}/consoletrans/utflist"
         find "${initdir}${kbddir}/" -name README\* -delete
         find "${initdir}${kbddir}/" -name '*.gz' -print -quit \
-            | while read line || [ -n "$line" ]; do
+            | while read line; do
             inst_multiple gzip
             done
 
         find "${initdir}${kbddir}/" -name '*.bz2' -print -quit \
-            | while read line || [ -n "$line" ]; do
+            | while read line; do
             inst_multiple bzip2
             done
     }
@@ -164,9 +152,6 @@ install() {
         # Gentoo user may have KEYMAP set to something like "-u pl2",
         KEYMAP=${KEYMAP#-* }
 
-        # openSUSE user may have KEYMAP set to something like ".gz"
-        KEYMAP=${KEYMAP/.gz/}
-
         # KEYTABLE is a bit special - it defines base keymap name and UNICODE
         # determines whether non-UNICODE or UNICODE version is used
 
@@ -194,9 +179,7 @@ install() {
             findkeymap ${map}
         done
 
-        for keymap in ${KEYMAPS}; do
-            inst_opt_decompress ${keymap}
-        done
+        inst_opt_decompress ${KEYMAPS}
 
         inst_opt_decompress ${kbddir}/consolefonts/${DEFAULT_FONT}.*
 
@@ -209,11 +192,7 @@ install() {
         if [[ ${FONT_MAP} ]]
         then
             FONT_MAP=${FONT_MAP%.trans}
-            # There are three different formats that setfont supports
-            inst_simple ${kbddir}/consoletrans/${FONT_MAP} \
-            || inst_simple ${kbddir}/consoletrans/${FONT_MAP}.trans \
-            || inst_simple ${kbddir}/consoletrans/${FONT_MAP}_to_uni.trans \
-            || dwarn "Could not find FONT_MAP ${FONT_MAP}!"
+            inst_simple ${kbddir}/consoletrans/${FONT_MAP}.trans
         fi
 
         if [[ ${FONT_UNIMAP} ]]

modules.d/10i18n/parse-i18n.sh

@@ -1,33 +1,42 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 inst_key_val() {
     local _value
     local _file
     local _default
-    _file="$1"; shift
-    _key="$1"; shift
-    _default="$1"; shift
-    _value="$(getarg $@)"
+    _default=$1
+    shift
+    _file=$1
+    shift
+    _value=$(getarg $@)
     [ -z "${_value}" ] && _value=$_default
     if [ -n "${_value}" ]; then
-        printf '%s="%s"\n' ${_key} ${_value} >> $_file
+        printf '%s="%s"\n' $2 ${_value} >> $_file
     fi
     unset _file
     unset _value
 }
 
-inst_key_val /etc/vconsole.conf KEYMAP      '' rd.vconsole.keymap       KEYMAP      -d KEYTABLE
-inst_key_val /etc/vconsole.conf FONT        '' rd.vconsole.font         FONT        -d SYSFONT
-inst_key_val /etc/vconsole.conf FONT_MAP    '' rd.vconsole.font.map     FONT_MAP    -d CONTRANS
-inst_key_val /etc/vconsole.conf FONT_UNIMAP '' rd.vconsole.font.unimap  FONT_UNIMAP -d UNIMAP
-inst_key_val /etc/vconsole.conf UNICODE      1 rd.vconsole.font.unicode UNICODE vconsole.unicode
-inst_key_val /etc/vconsole.conf EXT_KEYMAP  '' rd.vconsole.keymap.ext   EXT_KEYMAP
+inst_key_val '' /etc/vconsole.conf vconsole.keymap      KEYMAP      -d KEYTABLE
+inst_key_val '' /etc/vconsole.conf vconsole.font        FONT        -d SYSFONT
+inst_key_val '' /etc/vconsole.conf vconsole.font.map    FONT_MAP    -d CONTRANS
+inst_key_val '' /etc/vconsole.conf vconsole.font.unimap FONT_UNIMAP -d UNIMAP
+inst_key_val 1  /etc/vconsole.conf vconsole.font.unicode UNICODE vconsole.unicode
+inst_key_val '' /etc/vconsole.conf vconsole.keymap.ext  EXT_KEYMAP
 
-inst_key_val /etc/locale.conf   LANG        '' rd.locale.LANG           LANG
-inst_key_val /etc/locale.conf   LC_ALL      '' rd.locale.LC_ALL         LC_ALL
+inst_key_val '' /etc/locale.conf   locale.LANG   LANG
+inst_key_val '' /etc/locale.conf   locale.LC_ALL LC_ALL
 
 if [ -f /etc/locale.conf ]; then
     . /etc/locale.conf
     export LANG
     export LC_ALL
 fi
+
+if [ -n "$DRACUT_SYSTEMD" ]; then
+    rm -f -- /etc/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/console_init
+fi

modules.d/30convertfs/convertfs.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
 
 ROOT="$1"
 
@@ -74,7 +76,7 @@ rm -f -- "$testfile"
 find_mount() {
     local dev mnt etc wanted_dev
     wanted_dev="$(readlink -e -q $1)"
-    while read dev mnt etc || [ -n "$dev" ]; do
+    while read dev mnt etc; do
         [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
     done < /proc/mounts
     return 1
@@ -93,7 +95,7 @@ else
             return 1
         fi
 
-        while read a m a || [ -n "$m" ]; do
+        while read a m a; do
             [ "$m" = "$1" ] && return 0
         done < /proc/mounts
         return 1

modules.d/30convertfs/do-convertfs.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
 
 if getargbool 0 rd.convertfs; then
     if getargbool 0 rd.debug; then

modules.d/30convertfs/module-setup.sh

@@ -1,17 +1,16 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# called by dracut
 check() {
     [[ $mount_needs ]] && return 1
     return 255
 }
 
-# called by dracut
 depends() {
     return 0
 }
 
-# called by dracut
 install() {
     inst_multiple bash find ldconfig mv rm cp ln
     inst_hook pre-pivot 99 "$moddir/do-convertfs.sh"

modules.d/35network-legacy/dhclient.conf

@@ -1,8 +0,0 @@
-
-option classless-static-routes code 121 = array of unsigned integer 8;
-
-send dhcp-client-identifier = hardware;
-
-request subnet-mask, broadcast-address, time-offset, routers,
-        domain-name, domain-name-servers, domain-search, host-name,
-        root-path, interface-mtu, classless-static-routes;

modules.d/35network-legacy/ifup.sh

@@ -1,488 +0,0 @@
-#!/bin/sh
-#
-# We don't need to check for ip= errors here, that is handled by the
-# cmdline parser script
-#
-# without $2 means this is for real netroot case
-# or it is for manually bring up network ie. for kdump scp vmcore
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
-
-# Huh? No $1?
-[ -z "$1" ] && exit 1
-
-# $netif reads easier than $1
-netif=$1
-
-# loopback is always handled the same way
-if [ "$netif" = "lo" ] ; then
-    ip link set lo up
-    ip addr add 127.0.0.1/8 dev lo
-    exit 0
-fi
-
-# Run dhclient
-do_dhcp() {
-    # dhclient-script will mark the netif up and generate the online
-    # event for nfsroot
-    # XXX add -V vendor class and option parsing per kernel
-
-    local _COUNT=0
-    local _timeout=$(getargs rd.net.timeout.dhcp=)
-    local _DHCPRETRY=$(getargs rd.net.dhcp.retry=)
-    _DHCPRETRY=${_DHCPRETRY:-1}
-
-    [ -e /tmp/dhclient.$netif.pid ] && return 0
-
-    if ! iface_has_carrier $netif; then
-        warn "No carrier detected on interface $netif"
-        return 1
-    fi
-
-    if [ ! -e /run/NetworkManager/conf.d/10-dracut-dhclient.conf ]; then
-        mkdir -p /run/NetworkManager/conf.d
-        echo '[main]' > /run/NetworkManager/conf.d/10-dracut-dhclient.conf
-        echo 'dhcp=dhclient' >>/run/NetworkManager/conf.d/10-dracut-dhclient.conf
-    fi
-
-    while [ $_COUNT -lt $_DHCPRETRY ]; do
-        info "Starting dhcp for interface $netif"
-        dhclient "$@" \
-                 ${_timeout:+-timeout $_timeout} \
-                 -q \
-                 -cf /etc/dhclient.conf \
-                 -pf /tmp/dhclient.$netif.pid \
-                 -lf /tmp/dhclient.$netif.lease \
-                 $netif \
-            && return 0
-        _COUNT=$(($_COUNT+1))
-        [ $_COUNT -lt $_DHCPRETRY ] && sleep 1
-    done
-    warn "dhcp for interface $netif failed"
-    return 1
-}
-
-load_ipv6() {
-    [ -d /proc/sys/net/ipv6 ] && return
-    modprobe ipv6
-    i=0
-    while [ ! -d /proc/sys/net/ipv6 ]; do
-        i=$(($i+1))
-        [ $i -gt 10 ] && break
-        sleep 0.1
-    done
-}
-
-do_ipv6auto() {
-    local ret
-    load_ipv6
-    echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
-    echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
-    echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
-    linkup $netif
-    wait_for_ipv6_auto $netif
-    ret=$?
-
-    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
-
-    return $ret
-}
-
-# Handle static ip configuration
-do_static() {
-    strglobin $ip '*:*:*' && load_ipv6
-
-    if ! iface_has_carrier "$netif"; then
-        warn "No carrier detected on interface $netif"
-        return 1
-    elif ! linkup "$netif"; then
-        warn "Could not bring interface $netif up!"
-        return 1
-    fi
-
-    ip route get "$ip" | {
-        read a rest
-        if [ "$a" = "local" ]; then
-            warn "Not assigning $ip to interface $netif, cause it is already assigned!"
-            return 1
-        fi
-        return 0
-    } || return 1
-
-    [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
-    [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
-    if strglobin $ip '*:*:*'; then
-        # note no ip addr flush for ipv6
-        ip addr add $ip/$mask ${srv:+peer $srv} dev $netif
-        echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
-        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
-        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
-        wait_for_ipv6_dad $netif
-    else
-        if [ -z "$srv" ]; then
-            if command -v arping2 >/dev/null; then
-                if arping2 -q -C 1 -c 2 -I $netif -0 $ip ; then
-                    warn "Duplicate address detected for $ip for interface $netif."
-                    return 1
-                fi
-            else
-                if ! arping -f -q -D -c 2 -I $netif $ip ; then
-                    warn "Duplicate address detected for $ip for interface $netif."
-                    return 1
-                fi
-            fi
-        fi
-        ip addr flush dev $netif
-        ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif
-    fi
-
-    [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
-    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
-
-    return 0
-}
-
-get_vid() {
-    case "$1" in
-    vlan*)
-        echo ${1#vlan}
-        ;;
-    *.*)
-        echo ${1##*.}
-        ;;
-    esac
-}
-
-# check, if we need VLAN's for this interface
-if [ -z "$DO_VLAN_PHY" ] && [ -e /tmp/vlan.${netif}.phy ]; then
-    unset DO_VLAN
-    NO_AUTO_DHCP=yes DO_VLAN_PHY=yes ifup "$netif"
-    modprobe -b -q 8021q
-
-    for i in /tmp/vlan.*.${netif}; do
-        [ -e "$i" ] || continue
-        unset vlanname
-        unset phydevice
-        . "$i"
-        if [ -n "$vlanname" ]; then
-            linkup "$phydevice"
-            ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname)"
-            ifup "$vlanname"
-        fi
-    done
-    exit 0
-fi
-
-# Check, if interface is VLAN interface
-if ! [ -e /tmp/vlan.${netif}.phy ]; then
-    for i in /tmp/vlan.${netif}.*; do
-        [ -e "$i" ] || continue
-        export DO_VLAN=yes
-        break
-    done
-fi
-
-
-# bridge this interface?
-if [ -z "$NO_BRIDGE_MASTER" ]; then
-    for i in /tmp/bridge.*.info; do
-        [ -e "$i" ] || continue
-        unset bridgeslaves
-        unset bridgename
-        . "$i"
-        for ethname in $bridgeslaves ; do
-            [ "$netif" != "$ethname" ] && continue
-
-            NO_BRIDGE_MASTER=yes NO_AUTO_DHCP=yes ifup $ethname
-            linkup $ethname
-            if [ ! -e /tmp/bridge.$bridgename.up ]; then
-                ip link add name $bridgename type bridge
-                echo 0 > /sys/devices/virtual/net/$bridgename/bridge/forward_delay
-                > /tmp/bridge.$bridgename.up
-            fi
-            ip link set dev $ethname master $bridgename
-            ifup $bridgename
-            exit 0
-        done
-    done
-fi
-
-# enslave this interface to bond?
-if [ -z "$NO_BOND_MASTER" ]; then
-    for i in /tmp/bond.*.info; do
-        [ -e "$i" ] || continue
-        unset bondslaves
-        unset bondname
-        . "$i"
-        for slave in $bondslaves ; do
-            [ "$netif" != "$slave" ] && continue
-
-            # already setup
-            [ -e /tmp/bond.$bondname.up ] && exit 0
-
-            # wait for all slaves to show up
-            for slave in $bondslaves ; do
-                # try to create the slave (maybe vlan or bridge)
-                NO_BOND_MASTER=yes NO_AUTO_DHCP=yes ifup $slave
-
-                if ! ip link show dev $slave >/dev/null 2>&1; then
-                    # wait for the last slave to show up
-                    exit 0
-                fi
-            done
-
-            modprobe -q -b bonding
-            echo "+$bondname" >  /sys/class/net/bonding_masters 2>/dev/null
-            ip link set $bondname down
-
-            # Stolen from ifup-eth
-            # add the bits to setup driver parameters here
-            for arg in $bondoptions ; do
-                key=${arg%%=*};
-                value=${arg##*=};
-                # %{value:0:1} is replaced with non-bash specific construct
-                if [ "${key}" = "arp_ip_target" -a "${#value}" != "0" -a "+${value%%+*}" != "+" ]; then
-                    OLDIFS=$IFS;
-                    IFS=',';
-                    for arp_ip in $value; do
-                        echo +$arp_ip > /sys/class/net/${bondname}/bonding/$key
-                    done
-                    IFS=$OLDIFS;
-                else
-                    echo $value > /sys/class/net/${bondname}/bonding/$key
-                fi
-            done
-
-            linkup $bondname
-
-            for slave in $bondslaves ; do
-                cat /sys/class/net/$slave/address > /tmp/net.${bondname}.${slave}.hwaddr
-                ip link set $slave down
-                echo "+$slave" > /sys/class/net/$bondname/bonding/slaves
-                linkup $slave
-            done
-
-            # Set mtu on bond master
-            [ -n "$bondmtu" ] && ip link set mtu $bondmtu dev $bondname
-
-            # add the bits to setup the needed post enslavement parameters
-            for arg in $bondoptions ; do
-                key=${arg%%=*};
-                value=${arg##*=};
-                if [ "${key}" = "primary" ]; then
-                    echo $value > /sys/class/net/${bondname}/bonding/$key
-                fi
-            done
-
-            > /tmp/bond.$bondname.up
-
-            NO_BOND_MASTER=yes ifup $bondname
-            exit $?
-        done
-    done
-fi
-
-if [ -z "$NO_TEAM_MASTER" ]; then
-    for i in /tmp/team.*.info; do
-        [ -e "$i" ] || continue
-        unset teammaster
-        unset teamslaves
-        . "$i"
-        for slave in $teamslaves ; do
-            [ "$netif" != "$slave" ] && continue
-
-            [ -e /tmp/team.$teammaster.up ] && exit 0
-
-            # wait for all slaves to show up
-            for slave in $teamslaves ; do
-                # try to create the slave (maybe vlan or bridge)
-                NO_TEAM_MASTER=yes NO_AUTO_DHCP=yes ifup $slave
-
-                if ! ip link show dev $slave >/dev/null 2>&1; then
-                    # wait for the last slave to show up
-                    exit 0
-                fi
-            done
-
-            if [ ! -e /tmp/team.$teammaster.up ] ; then
-                # We shall only bring up those _can_ come up
-                # in case of some slave is gone in active-backup mode
-                working_slaves=""
-                for slave in $teamslaves ; do
-                    teamdctl ${teammaster} port present ${slave} 2>/dev/null \
-                        && continue
-                    ip link set dev $slave up 2>/dev/null
-                    if wait_for_if_up $slave; then
-                        working_slaves="$working_slaves$slave "
-                    fi
-                done
-                # Do not add slaves now
-                teamd -d -U -n -N -t $teammaster -f /etc/teamd/${teammaster}.conf
-                for slave in $working_slaves; do
-                    # team requires the slaves to be down before joining team
-                    ip link set dev $slave down
-                    (
-                        unset TEAM_PORT_CONFIG
-                        _hwaddr=$(cat /sys/class/net/$slave/address)
-                        _subchannels=$(iface_get_subchannels "$slave")
-                        if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
-                            . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf"
-                        elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then
-                            . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf"
-                        elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then
-                            . "/etc/sysconfig/network-scripts/ifcfg-${slave}"
-                        fi
-
-                        if [ -n "${TEAM_PORT_CONFIG}" ]; then
-                            /usr/bin/teamdctl ${teammaster} port config update ${slave} "${TEAM_PORT_CONFIG}"
-                        fi
-                    )
-                    teamdctl $teammaster port add $slave
-                done
-
-                ip link set dev $teammaster up
-
-                > /tmp/team.$teammaster.up
-                NO_TEAM_MASTER=yes ifup $teammaster
-                exit $?
-            fi
-        done
-    done
-fi
-
-# all synthetic interfaces done.. now check if the interface is available
-if ! ip link show dev $netif >/dev/null 2>&1; then
-    exit 1
-fi
-
-# disable manual ifup while netroot is set for simplifying our logic
-# in netroot case we prefer netroot to bringup $netif automaticlly
-[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
-
-if [ -n "$manualup" ]; then
-    >/tmp/net.$netif.manualup
-    rm -f /tmp/net.${netif}.did-setup
-else
-    [ -e /tmp/net.${netif}.did-setup ] && exit 0
-    [ -z "$DO_VLAN" ] && \
-    [ -e /sys/class/net/$netif/address ] && \
-        [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
-fi
-
-
-# No ip lines default to dhcp
-ip=$(getarg ip)
-
-if [ -z "$NO_AUTO_DHCP" ] && [ -z "$ip" ]; then
-    if [ "$netroot" = "dhcp6" ]; then
-        do_dhcp -6
-    else
-        do_dhcp -4
-    fi
-
-    for s in $(getargs nameserver); do
-        [ -n "$s" ] || continue
-        echo nameserver $s >> /tmp/net.$netif.resolv.conf
-    done
-fi
-
-
-# Specific configuration, spin through the kernel command line
-# looking for ip= lines
-for p in $(getargs ip=); do
-    ip_to_var $p
-    # skip ibft
-    [ "$autoconf" = "ibft" ] && continue
-
-    case "$dev" in
-        ??:??:??:??:??:??)  # MAC address
-            _dev=$(iface_for_mac $dev)
-            [ -n "$_dev" ] && dev="$_dev"
-            ;;
-        ??-??-??-??-??-??)  # MAC address in BOOTIF form
-            _dev=$(iface_for_mac $(fix_bootif $dev))
-            [ -n "$_dev" ] && dev="$_dev"
-            ;;
-    esac
-
-    # If this option isn't directed at our interface, skip it
-    if [ -n "$dev" ]; then
-        [ "$dev" != "$netif" ] && continue
-    else
-        iface_is_enslaved "$netif" && continue
-    fi
-
-    # Store config for later use
-    for i in ip srv gw mask hostname macaddr mtu dns1 dns2; do
-        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
-    done > /tmp/net.$netif.override
-
-    for autoopt in $(str_replace "$autoconf" "," " "); do
-        case $autoopt in
-            dhcp|on|any)
-                do_dhcp -4 ;;
-            dhcp6)
-                load_ipv6
-                do_dhcp -6 ;;
-            auto6)
-                do_ipv6auto ;;
-            either6)
-                do_ipv6auto || do_dhcp -6 ;;
-            *)
-                do_static ;;
-        esac
-    done
-    ret=$?
-
-    # setup nameserver
-    for s in "$dns1" "$dns2" $(getargs nameserver); do
-        [ -n "$s" ] || continue
-        echo nameserver $s >> /tmp/net.$netif.resolv.conf
-    done
-
-    if [ $ret -eq 0 ]; then
-        > /tmp/net.${netif}.up
-
-        if  [ -z "$DO_VLAN" ] && [ -e /sys/class/net/${netif}/address ]; then
-            > /tmp/net.$(cat /sys/class/net/${netif}/address).up
-        fi
-
-        case $autoconf in
-            dhcp|on|any|dhcp6)
-            ;;
-            *)
-                if [ $ret -eq 0 ]; then
-                    setup_net $netif
-                    source_hook initqueue/online $netif
-                    if [ -z "$manualup" ]; then
-                        /sbin/netroot $netif
-                    fi
-                fi
-                ;;
-        esac
-        exit $ret
-    fi
-done
-
-# no ip option directed at our interface?
-if [ -z "$NO_AUTO_DHCP" ] && [ ! -e /tmp/net.${netif}.up ]; then
-    if [ -e /tmp/net.bootdev ]; then
-        BOOTDEV=$(cat /tmp/net.bootdev)
-        if [ "$netif" = "$BOOTDEV" ] || [ "$BOOTDEV" = "$(cat /sys/class/net/${netif}/address)" ]; then
-            load_ipv6
-            do_dhcp
-        fi
-    else
-        if getargs 'ip=dhcp6'; then
-            load_ipv6
-            do_dhcp -6
-        fi
-        if getargs 'ip=dhcp'; then
-            do_dhcp -4
-        fi
-    fi
-fi
-
-exit 0

modules.d/35network-legacy/module-setup.sh

@@ -1,92 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
-    local _program
-
-    require_binaries ip dhclient sed awk grep || return 1
-    require_any_binary arping arping2 || return 1
-
-    return 255
-}
-
-# called by dracut
-depends() {
-    return 0
-}
-
-# called by dracut
-installkernel() {
-    return 0
-}
-
-# called by dracut
-install() {
-    local _arch _i _dir
-    inst_multiple ip dhclient sed awk grep
-
-    inst_multiple -o arping arping2
-    strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2"
-
-    inst_multiple -o ping ping6
-    inst_multiple -o teamd teamdctl teamnl
-    inst_simple /etc/libnl/classid
-    inst_script "$moddir/ifup.sh" "/sbin/ifup"
-    inst_script "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
-    inst_simple -H "/etc/dhclient.conf"
-    cat "$moddir/dhclient.conf" >> "${initdir}/etc/dhclient.conf"
-    inst_hook pre-udev 60 "$moddir/net-genrules.sh"
-    inst_hook cmdline 92 "$moddir/parse-ibft.sh"
-    inst_hook cmdline 95 "$moddir/parse-vlan.sh"
-    inst_hook cmdline 96 "$moddir/parse-bond.sh"
-    inst_hook cmdline 96 "$moddir/parse-team.sh"
-    inst_hook cmdline 97 "$moddir/parse-bridge.sh"
-    inst_hook cmdline 98 "$moddir/parse-ip-opts.sh"
-    inst_hook cmdline 99 "$moddir/parse-ifname.sh"
-    inst_hook cleanup 10 "$moddir/kill-dhclient.sh"
-
-    # install all config files for teaming
-    unset TEAM_MASTER
-    unset TEAM_CONFIG
-    unset TEAM_PORT_CONFIG
-    unset HWADDR
-    unset SUBCHANNELS
-    for i in /etc/sysconfig/network-scripts/ifcfg-*; do
-        [ -e "$i" ] || continue
-        case "$i" in
-            *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
-                continue
-                ;;
-        esac
-        (
-            . "$i"
-            if ! [ "${ONBOOT}" = "no" -o "${ONBOOT}" = "NO" ] \
-                    && [ -n "${TEAM_MASTER}${TEAM_CONFIG}${TEAM_PORT_CONFIG}" ]; then
-                if [ -n "$TEAM_CONFIG" ] && [ -n "$DEVICE" ]; then
-                    mkdir -p $initdir/etc/teamd
-                    printf -- "%s" "$TEAM_CONFIG" > "$initdir/etc/teamd/${DEVICE}.conf"
-                elif [ -n "$TEAM_PORT_CONFIG" ]; then
-                    inst_simple "$i"
-
-                    HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')"
-                    if [ -n "$HWADDR" ]; then
-                        ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf"
-                    fi
-
-                    SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
-                    if [ -n "$SUBCHANNELS" ]; then
-                        ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf"
-                    fi
-                fi
-            fi
-        )
-    done
-
-    _arch=$(uname -m)
-
-    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
-        {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
-
-    dracut_need_initqueue
-}
-

modules.d/35network-legacy/parse-team.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# Format:
-#       team=<teammaster>:<teamslaves>
-#
-#       teamslaves is a comma-separated list of physical (ethernet) interfaces
-#
-
-parseteam() {
-    local v=${1}:
-    set --
-    while [ -n "$v" ]; do
-        set -- "$@" "${v%%:*}"
-        v=${v#*:}
-    done
-
-    case $# in
-    2)  teammaster=$1; teamslaves=$(str_replace "$2" "," " ") ;;
-    *)  die "team= requires two parameters" ;;
-    esac
-    return 0
-}
-
-for team in $(getargs team); do
-    [ "$team" = "team" ] && continue
-
-    unset teammaster
-    unset teamslaves
-
-    parseteam "$team" || continue
-
-    echo "teammaster=$teammaster" > /tmp/team.${teammaster}.info
-    echo "teamslaves=\"$teamslaves\"" >> /tmp/team.${teammaster}.info
-
-    if ! [ -e /etc/teamd/${teammaster}.conf ]; then
-        warn "Team master $teammaster specified, but no /etc/teamd/$teammaster.conf present. Using activebackup."
-        mkdir -p /etc/teamd
-        printf -- "%s" '{"runner": {"name": "activebackup"}, "link_watch": {"name": "ethtool"}}' > "/etc/teamd/${teammaster}.conf"
-    fi
-done
-

modules.d/35network-legacy/parse-vlan.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Format:
-#	vlan=<vlanname>:<phydevice>
-#
-
-parsevlan() {
-    local v=${1}:
-    set --
-    while [ -n "$v" ]; do
-        set -- "$@" "${v%%:*}"
-        v=${v#*:}
-    done
-
-    unset vlanname phydevice
-    case $# in
-    2)  vlanname=$1; phydevice=$2 ;;
-    *)  die "vlan= requires two parameters" ;;
-    esac
-}
-
-for vlan in $(getargs vlan=); do
-    unset vlanname
-    unset phydevice
-    if [ ! "$vlan" = "vlan" ]; then
-        parsevlan "$vlan"
-    fi
-
-    echo "phydevice=\"$phydevice\"" > /tmp/vlan.${phydevice}.phy
-    {
-        echo "vlanname=\"$vlanname\""
-        echo "phydevice=\"$phydevice\""
-    } > /tmp/vlan.${vlanname}.${phydevice}
-done

modules.d/35network-manager/module-setup.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
-    local _program
-
-    require_binaries sed grep || return 1
-
-    # do not add this module by default
-    return 255
-}
-
-# called by dracut
-depends() {
-    return 0
-}
-
-# called by dracut
-installkernel() {
-    return 0
-}
-
-# called by dracut
-install() {
-    local _nm_version
-
-    _nm_version=$(NetworkManager --version)
-
-    inst_multiple sed grep
-
-    inst NetworkManager
-    inst /usr/libexec/nm-initrd-generator
-    inst_multiple -o teamd dhclient
-    inst_hook cmdline 99 "$moddir/nm-config.sh"
-    inst_hook initqueue/settled 99 "$moddir/nm-run.sh"
-    inst_rules 85-nm-unmanaged.rules
-    inst_libdir_file "NetworkManager/$_nm_version/libnm-device-plugin-team.so"
-
-    if [[ -x "$initdir/usr/sbin/dhclient" ]]; then
-        inst /usr/libexec/nm-dhcp-helper
-    elif ! [[ -e "$initdir/etc/machine-id" ]]; then
-        # The internal DHCP client silently fails if we
-        # have no machine-id
-        systemd-machine-id-setup --root="$initdir"
-    fi
-
-    # We don't install the ifcfg files from the host automatically.
-    # But if the user chooses to include them, we pull in the machinery to read them.
-    if ! [[ -d "$initdir/etc/sysconfig/network-scripts" ]]; then
-        inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
-    fi
-}

modules.d/35network-manager/nm-config.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
-    echo rd.neednet >> /etc/cmdline.d/35-neednet.conf
-fi
-
-/usr/libexec/nm-initrd-generator -- $(getcmdline)

modules.d/35network-manager/nm-run.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
-    /usr/sbin/NetworkManager --configure-and-quit=initrd --debug --log-level=trace
-else
-    /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
-fi
-
-for _i in /sys/class/net/*/
-do
-    state=/run/NetworkManager/devices/$(cat $_i/ifindex)
-    grep -q connection-uuid= $state 2>/dev/null || continue
-    ifname=${_i##*/}
-    sed -n 's/root-path/new_root_path/p;s/next-server/new_next_server/p' <$state >/tmp/dhclient.$ifname.dhcpopts
-    source_hook initqueue/online $ifname
-    /sbin/netroot $ifname
-done

modules.d/40network/dhclient-script.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
@@ -18,6 +20,7 @@ setup_interface() {
     search=$(printf -- "$new_domain_search")
     namesrv=$new_domain_name_servers
     hostname=$new_host_name
+
     [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
     [ -n "$new_max_life" ] && lease_time=$new_max_life
     preferred_lft=$lease_time
@@ -44,30 +47,20 @@ setup_interface() {
         ${preferred_lft:+preferred_lft ${preferred_lft}}
 
     if [ -n "$gw" ] ; then
-        if [ "$mask" = "255.255.255.255" ] ; then
+        if [ "$mask" == "255.255.255.255" ] ; then
             # point-to-point connection => set explicit route to gateway
             echo ip route add $gw dev $netif > /tmp/net.$netif.gw
         fi
-
-        echo "$gw" | {
-            IFS=' ' read -r main_gw other_gw
-            echo ip route replace default via $main_gw dev $netif >> /tmp/net.$netif.gw
-            if [ -n "$other_gw" ] ; then
-                for g in $other_gw; do
-                    echo ip route add default via $g dev $netif >> /tmp/net.$netif.gw
-                done
-            fi
-        }
+        echo ip route replace default via $gw dev $netif >> /tmp/net.$netif.gw
     fi
 
-    if getargbool 1 rd.peerdns; then
-        [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
-        if  [ -n "$namesrv" ] ; then
-            for s in $namesrv; do
-                echo nameserver $s
-            done
-        fi >> /tmp/net.$netif.resolv.conf
-    fi
+    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
+
     # Note: hostname can be fqdn OR short hostname, so chop off any
     # trailing domain name and explicity add any domain if set.
     [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
@@ -90,65 +83,18 @@ setup_interface6() {
         ${lease_time:+valid_lft $lease_time} \
         ${preferred_lft:+preferred_lft ${preferred_lft}}
 
-    if getargbool 1 rd.peerdns; then
-        [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
-        if  [ -n "$namesrv" ] ; then
-            for s in $namesrv; do
-                echo nameserver $s
-            done
-        fi >> /tmp/net.$netif.resolv.conf
-    fi
+    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
 
     # Note: hostname can be fqdn OR short hostname, so chop off any
     # trailing domain name and explicity add any domain if set.
     [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
 }
 
-parse_option_121() {
-    while [ $# -ne 0 ]; do
-        mask="$1"
-        shift
-
-        # Is the destination a multicast group?
-        if [ $1 -ge 224 -a $1 -lt 240 ]; then
-            multicast=1
-        else
-            multicast=0
-        fi
-
-        # Parse the arguments into a CIDR net/mask string
-        if [ $mask -gt 24 ]; then
-            destination="$1.$2.$3.$4/$mask"
-            shift; shift; shift; shift
-        elif [ $mask -gt 16 ]; then
-            destination="$1.$2.$3.0/$mask"
-            shift; shift; shift
-        elif [ $mask -gt 8 ]; then
-            destination="$1.$2.0.0/$mask"
-            shift; shift
-        else
-            destination="$1.0.0.0/$mask"
-            shift
-        fi
-
-        # Read the gateway
-        gateway="$1.$2.$3.$4"
-        shift; shift; shift; shift
-
-        # Multicast routing on Linux
-        #  - If you set a next-hop address for a multicast group, this breaks with Cisco switches
-        #  - If you simply leave it link-local and attach it to an interface, it works fine.
-        if [ $multicast -eq 1 ]; then
-            temp_result="$destination dev $interface"
-        else
-            temp_result="$destination via $gateway dev $interface"
-        fi
-
-        echo "/sbin/ip route add $temp_result"
-    done
-}
-
-
 case $reason in
     PREINIT)
         echo "dhcp: PREINIT $netif up"
@@ -158,7 +104,7 @@ case $reason in
     PREINIT6)
         echo "dhcp: PREINIT6 $netif up"
         linkup $netif
-        wait_for_ipv6_dad_link $netif
+        wait_for_ipv6_dad $netif
         ;;
 
     BOUND)
@@ -168,21 +114,14 @@ case $reason in
             read layer2 < /sys/class/net/$netif/device/layer2
         fi
         if [ "$layer2" != "0" ]; then
-            if command -v arping2 >/dev/null; then
-                if arping2 -q -C 1 -c 2 -I $netif -0 $new_ip_address ; then
-                    warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
-                    exit 1
-                fi
-            else
-                if ! arping -f -q -D -c 2 -I $netif $new_ip_address ; then
-                    warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
-                    exit 1
-                fi
+            if ! arping -f -q -D -c 2 -I $netif $new_ip_address ; then
+                warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
+                exit 1
             fi
         fi
         unset layer2
         setup_interface
-        set | while read line || [ -n "$line" ]; do
+        set | while read line; do
             [ "${line#new_}" = "$line" ] && continue
             echo "$line"
         done >/tmp/dhclient.$netif.dhcpopts
@@ -190,12 +129,6 @@ case $reason in
         {
             echo '. /lib/net-lib.sh'
             echo "setup_net $netif"
-            if [ -n "$new_classless_static_routes" ]; then
-                OLDIFS="$IFS"
-                IFS=".$IFS"
-                parse_option_121 $new_classless_static_routes
-                IFS="$OLDIFS"
-            fi
             echo "source_hook initqueue/online $netif"
             [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
             echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
@@ -224,7 +157,7 @@ case $reason in
         echo "dhcp: BOND6 setting $netif"
         setup_interface6
 
-        set | while read line || [ -n "$line" ]; do
+        set | while read line; do
             [ "${line#new_}" = "$line" ] && continue
             echo "$line"
         done >/tmp/dhclient.$netif.dhcpopts

modules.d/40network/dhclient.conf

@@ -0,0 +1,3 @@
+request subnet-mask, broadcast-address, time-offset, routers,
+        domain-name, domain-name-servers, domain-search, host-name,
+        root-path, interface-mtu;

modules.d/40network/dhcp-root.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 # This script is sourced, so root should be set. But let's be paranoid
 [ -z "$root" ] && root=$(getarg root=)

modules.d/40network/ifname-genrules.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 # if there are no ifname parameters, just use NAME=KERNEL
 if ! getarg ifname= >/dev/null ; then

modules.d/40network/ifup.sh

@@ -0,0 +1,450 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# We don't need to check for ip= errors here, that is handled by the
+# cmdline parser script
+#
+# without $2 means this is for real netroot case
+# or it is for manually bring up network ie. for kdump scp vmcore
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
+
+# Huh? No $1?
+[ -z "$1" ] && exit 1
+
+# $netif reads easier than $1
+netif=$1
+use_bridge='false'
+use_vlan='false'
+
+# enslave this interface to bond?
+for i in /tmp/bond.*.info; do
+    [ -e "$i" ] || continue
+    unset bondslaves
+    unset bondname
+    . "$i"
+    for slave in $bondslaves ; do
+        if [ "$netif" = "$slave" ] ; then
+            netif=$bondname
+            break 2
+        fi
+    done
+done
+
+for i in /tmp/team.*.info; do
+    [ -e "$i" ] || continue
+    unset teamslaves
+    unset teammaster
+    . "$i"
+    for slave in $teamslaves ; do
+        if [ "$netif" = "$slave" ] ; then
+            netif=$teammaster
+        fi
+    done
+done
+
+if [ -e /tmp/vlan.info ]; then
+    . /tmp/vlan.info
+    if [ "$netif" = "$phydevice" ]; then
+        if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
+            : # We need to really setup bond (recursive call)
+        elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+            : # We need to really setup team (recursive call)
+        else
+            netif="$vlanname"
+            use_vlan='true'
+        fi
+    fi
+fi
+
+# bridge this interface?
+if [ -e /tmp/bridge.info ]; then
+    . /tmp/bridge.info
+    for ethname in $bridgeslaves ; do
+        if [ "$netif" = "$ethname" ]; then
+            if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
+                : # We need to really setup bond (recursive call)
+            elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+                : # We need to really setup team (recursive call)
+            elif [ "$netif" = "$vlanname" ] && [ -n "$DO_VLAN_SETUP" ]; then
+                : # We need to really setup vlan (recursive call)
+            else
+                netif="$bridgename"
+                use_bridge='true'
+            fi
+        fi
+    done
+fi
+
+# disable manual ifup while netroot is set for simplifying our logic
+# in netroot case we prefer netroot to bringup $netif automaticlly
+[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
+
+if [ -n "$manualup" ]; then
+    >/tmp/net.$netif.manualup
+    rm -f /tmp/net.${netif}.did-setup
+else
+    [ -e /tmp/net.${netif}.did-setup ] && exit 0
+    [ -e /sys/class/net/$netif/address ] && \
+        [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
+fi
+
+# Run dhclient
+do_dhcp() {
+    # dhclient-script will mark the netif up and generate the online
+    # event for nfsroot
+    # XXX add -V vendor class and option parsing per kernel
+
+    local _COUNT=0
+    local _timeout=$(getargs rd.net.timeout.dhcp=)
+    local _DHCPRETRY=$(getargs rd.net.dhcp.retry=)
+    _DHCPRETRY=${_DHCPRETRY:-1}
+
+    [ -e /tmp/dhclient.$netif.pid ] && return 0
+
+    if ! iface_has_link $netif; then
+        warn "No carrier detected on interface $netif"
+        return 1
+    fi
+
+    while [ $_COUNT -lt $_DHCPRETRY ]; do
+        info "Starting dhcp for interface $netif"
+        dhclient "$@" \
+                 ${_timeout:+-timeout $_timeout} \
+                 -q \
+                 -cf /etc/dhclient.conf \
+                 -pf /tmp/dhclient.$netif.pid \
+                 -lf /tmp/dhclient.$netif.lease \
+                 $netif \
+            && return 0
+        _COUNT=$(($_COUNT+1))
+        [ $_COUNT -lt $_DHCPRETRY ] && sleep 1
+    done
+    warn "dhcp for interface $netif failed"
+    return 1
+}
+
+load_ipv6() {
+    [ -d /proc/sys/net/ipv6 ] && return
+    modprobe ipv6
+    i=0
+    while [ ! -d /proc/sys/net/ipv6 ]; do
+        i=$(($i+1))
+        [ $i -gt 10 ] && break
+        sleep 0.1
+    done
+}
+
+do_ipv6auto() {
+    load_ipv6
+    echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
+    echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
+    echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
+    linkup $netif
+    wait_for_ipv6_auto $netif
+
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    return 0
+}
+
+# Handle static ip configuration
+do_static() {
+    strstr $ip '*:*:*' && load_ipv6
+
+    if ! linkup $netif; then
+        warn "Could not bring interface $netif up!"
+        return 1
+    fi
+
+    ip route get "$ip" | {
+        read a rest
+        if [ "$a" = "local" ]; then
+            warn "Not assigning $ip to interface $netif, cause it is already assigned!"
+            return 1
+        fi
+        return 0
+    } || return 1
+
+    [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
+    [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
+    if strstr $ip '*:*:*'; then
+        # note no ip addr flush for ipv6
+        ip addr add $ip/$mask ${srv:+peer $srv} dev $netif
+        wait_for_ipv6_dad $netif
+    else
+        if ! arping -f -q -D -c 2 -I $netif $ip; then
+            warn "Duplicate address detected for $ip for interface $netif."
+            return 1
+        fi
+        ip addr flush dev $netif
+        ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif
+    fi
+
+    [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    return 0
+}
+
+# loopback is always handled the same way
+if [ "$netif" = "lo" ] ; then
+    ip link set lo up
+    ip addr add 127.0.0.1/8 dev lo
+    exit 0
+fi
+
+# start bond if needed
+if [ -e /tmp/bond.${netif}.info ]; then
+    . /tmp/bond.${netif}.info
+
+    if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
+        modprobe bonding
+        echo "+$netif" >  /sys/class/net/bonding_masters
+        ip link set $netif down
+
+        # Stolen from ifup-eth
+        # add the bits to setup driver parameters here
+        for arg in $bondoptions ; do
+            key=${arg%%=*};
+            value=${arg##*=};
+            # %{value:0:1} is replaced with non-bash specific construct
+            if [ "${key}" = "arp_ip_target" -a "${#value}" != "0" -a "+${value%%+*}" != "+" ]; then
+                OLDIFS=$IFS;
+                IFS=',';
+                for arp_ip in $value; do
+                    echo +$arp_ip > /sys/class/net/${netif}/bonding/$key
+                done
+                IFS=$OLDIFS;
+            else
+                echo $value > /sys/class/net/${netif}/bonding/$key
+            fi
+        done
+
+        linkup $netif
+
+        for slave in $bondslaves ; do
+            ip link set $slave down
+            cat /sys/class/net/$slave/address > /tmp/net.${netif}.${slave}.hwaddr
+            echo "+$slave" > /sys/class/net/$bondname/bonding/slaves
+            linkup $slave
+        done
+
+        # add the bits to setup the needed post enslavement parameters
+        for arg in $BONDING_OPTS ; do
+            key=${arg%%=*};
+            value=${arg##*=};
+            if [ "${key}" = "primary" ]; then
+                echo $value > /sys/class/net/${netif}/bonding/$key
+            fi
+        done
+    fi
+fi
+
+if [ -e /tmp/team.${netif}.info ]; then
+    . /tmp/team.${netif}.info
+    if [ "$netif" = "$teammaster" ] && [ ! -e /tmp/net.$teammaster.up ] ; then
+        # We shall only bring up those _can_ come up
+        # in case of some slave is gone in active-backup mode
+        working_slaves=""
+        for slave in $teamslaves ; do
+            teamdctl ${teammaster} port present ${slave} 2>/dev/null \
+                     && continue
+            ip link set dev $slave up 2>/dev/null
+            if wait_for_if_up $slave; then
+                working_slaves+="$slave "
+            fi
+        done
+        # Do not add slaves now
+        teamd -d -U -n -N -t $teammaster -f /etc/teamd/$teammaster.conf
+        for slave in $working_slaves; do
+            # team requires the slaves to be down before joining team
+            ip link set dev $slave down
+            (
+                unset TEAM_PORT_CONFIG
+                _hwaddr=$(cat /sys/class/net/$slave/address)
+                _subchannels=$(iface_get_subchannels "$slave")
+                if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
+                    . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf"
+                elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then
+                    . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf"
+                elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then
+                    . "/etc/sysconfig/network-scripts/ifcfg-${slave}"
+                fi
+
+                if [ -n "${TEAM_PORT_CONFIG}" ]; then
+                    /usr/bin/teamdctl ${teammaster} port config update ${slave} "${TEAM_PORT_CONFIG}"
+                fi
+            )
+            teamdctl $teammaster port add $slave
+        done
+        ip link set dev $teammaster up
+    fi
+fi
+
+# XXX need error handling like dhclient-script
+
+if [ -e /tmp/bridge.info ]; then
+    . /tmp/bridge.info
+# start bridge if necessary
+    if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
+        brctl addbr $bridgename
+        brctl setfd $bridgename 0
+        for ethname in $bridgeslaves ; do
+            if [ "$ethname" = "$bondname" ] ; then
+                DO_BOND_SETUP=yes ifup $bondname -m
+            elif [ "$ethname" = "$teammaster" ] ; then
+                DO_TEAM_SETUP=yes ifup $teammaster -m
+            elif [ "$ethname" = "$vlanname" ]; then
+                DO_VLAN_SETUP=yes ifup $vlanname -m
+            else
+                linkup $ethname
+            fi
+            brctl addif $bridgename $ethname
+        done
+    fi
+fi
+
+get_vid() {
+    case "$1" in
+    vlan*)
+        echo ${1#vlan}
+        ;;
+    *.*)
+        echo ${1##*.}
+        ;;
+    esac
+}
+
+if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
+    modprobe 8021q
+    if [ "$phydevice" = "$bondname" ] ; then
+        DO_BOND_SETUP=yes ifup $phydevice -m
+    elif [ "$phydevice" = "$teammaster" ] ; then
+        DO_TEAM_SETUP=yes ifup $phydevice -m
+    else
+        linkup "$phydevice"
+    fi
+    ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname)"
+    ip link set "$vlanname" up
+fi
+
+# No ip lines default to dhcp
+ip=$(getarg ip)
+
+if [ -z "$ip" ]; then
+    for s in $(getargs nameserver); do
+        [ -n "$s" ] || continue
+        echo nameserver $s >> /tmp/net.$netif.resolv.conf
+    done
+
+    if [ "$netroot" = "dhcp6" ]; then
+        do_dhcp -6
+    else
+        do_dhcp -4
+    fi
+fi
+
+
+# Specific configuration, spin through the kernel command line
+# looking for ip= lines
+for p in $(getargs ip=); do
+    ip_to_var $p
+    # skip ibft
+    [ "$autoconf" = "ibft" ] && continue
+
+    case "$dev" in
+        ??:??:??:??:??:??)  # MAC address
+            _dev=$(iface_for_mac $dev)
+            [ -n "$_dev" ] && dev="$_dev"
+            ;;
+        ??-??-??-??-??-??)  # MAC address in BOOTIF form
+            _dev=$(iface_for_mac $(fix_bootif $dev))
+            [ -n "$_dev" ] && dev="$_dev"
+            ;;
+    esac
+
+    # If this option isn't directed at our interface, skip it
+    [ -n "$dev" ] && [ "$dev" != "$netif" ] && \
+    [ "$use_bridge" != 'true' ] && \
+    [ "$use_vlan" != 'true' ] && continue
+
+    # setup nameserver
+    for s in "$dns1" "$dns2" $(getargs nameserver); do
+        [ -n "$s" ] || continue
+        echo nameserver $s >> /tmp/net.$netif.resolv.conf
+    done
+
+    # Store config for later use
+    for i in ip srv gw mask hostname macaddr dns1 dns2; do
+        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
+    done > /tmp/net.$netif.override
+
+    for autoopt in $(str_replace "$autoconf" "," " "); do
+        case $autoopt in
+            dhcp|on|any)
+                do_dhcp -4 ;;
+            dhcp6)
+                load_ipv6
+                do_dhcp -6 ;;
+            auto6)
+                do_ipv6auto ;;
+            *)
+                do_static ;;
+        esac
+    done
+    ret=$?
+
+    > /tmp/net.${netif}.up
+
+    if [ -e /sys/class/net/${netif}/address ]; then
+        > /tmp/net.$(cat /sys/class/net/${netif}/address).up
+    fi
+
+    case $autoconf in
+        dhcp|on|any|dhcp6)
+            ;;
+        *)
+            if [ $ret -eq 0 ]; then
+                setup_net $netif
+                source_hook initqueue/online $netif
+                if [ -z "$manualup" ]; then
+                    /sbin/netroot $netif
+                fi
+            fi
+            ;;
+    esac
+
+    exit 0
+done
+
+# netif isn't the top stack? Then we should exit here.
+# eg. netif is bond0. br0 is on top of it. dhcp br0 is correct but dhcp
+#     bond0 doesn't make sense.
+if [ -n "$DO_BOND_SETUP" -o -n "$DO_TEAM_SETUP" -o -n "$DO_VLAN_SETUP" ]; then
+    exit 0
+fi
+
+# no ip option directed at our interface?
+if [ ! -e /tmp/net.${netif}.up ]; then
+    if [ -e /tmp/net.bootdev ]; then
+        BOOTDEV=$(cat /tmp/net.bootdev)
+        if [ "$netif" = "$BOOTDEV" ] || [ "$BOOTDEV" = "$(cat /sys/class/net/${netif}/address)" ]; then
+            load_ipv6
+            do_dhcp
+        fi
+    else
+        if getargs 'ip=dhcp6'; then
+            load_ipv6
+            do_dhcp -6
+        fi
+        if getargs 'ip=dhcp'; then
+            do_dhcp -4
+        fi
+    fi
+fi
+
+exit 0

modules.d/40network/kill-dhclient.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 for f in /tmp/dhclient.*.pid; do
     [ -e $f ] || continue

modules.d/40network/module-setup.sh

@@ -1,34 +1,138 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# called by dracut
 check() {
+    local _program
+
+    require_binaries ip arping dhclient || return 1
+
     return 255
 }
 
-# called by dracut
 depends() {
-    echo -n "kernel-network-modules "
-    # RHEL 8.1: Default to network-legacy unless the user chose
-    # network-manager manually
-    if ! dracut_module_included "network-manager" ; then
-        echo "network-legacy"
-    fi
     return 0
 }
 
-# called by dracut
 installkernel() {
-    return 0
+    # Include wired net drivers, excluding wireless
+
+    net_module_filter() {
+        local _net_drivers='eth_type_trans|register_virtio_device|usbnet_open'
+        local _unwanted_drivers='/(wireless|isdn|uwb|net/ethernet|net/phy|net/team)/'
+        local _ret
+        # subfunctions inherit following FDs
+        local _merge=8 _side2=9
+        function nmf1() {
+            local _fname _fcont
+            while read _fname; do
+                [[ $_fname =~ $_unwanted_drivers ]] && continue
+                case "$_fname" in
+                    *.ko)    _fcont="$(<        $_fname)" ;;
+                    *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
+                    *.ko.xz) _fcont="$(xz -dc   $_fname)" ;;
+                esac
+                [[   $_fcont =~ $_net_drivers
+                && ! $_fcont =~ iw_handler_get_spy ]] \
+                && echo "$_fname"
+            done
+            return 0
+        }
+        function rotor() {
+            local _f1 _f2
+            while read _f1; do
+                echo "$_f1"
+                if read _f2; then
+                    echo "$_f2" 1>&${_side2}
+                fi
+            done | nmf1 1>&${_merge}
+            return 0
+        }
+        # Use two parallel streams to filter alternating modules.
+        set +x
+        eval "( ( rotor ) ${_side2}>&1 | nmf1 ) ${_merge}>&1"
+        [[ $debug ]] && set -x
+        return 0
+    }
+
+    { find_kernel_modules_by_path drivers/net; if [ "$_arch" = "s390" -o "$_arch" = "s390x" ]; then find_kernel_modules_by_path drivers/s390/net; fi; } \
+        | net_module_filter | instmods
+
+    #instmods() will take care of hostonly
+    instmods \
+        =drivers/net/phy \
+        =drivers/net/team \
+        =drivers/net/ethernet \
+        ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
+    hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
 }
 
-# called by dracut
 install() {
     local _arch _i _dir
-
+    inst_multiple ip arping dhclient sed
+    inst_multiple -o ping ping6
+    inst_multiple -o brctl
+    inst_multiple -o teamd teamdctl teamnl
+    inst_simple /etc/libnl/classid
+    inst_script "$moddir/ifup.sh" "/sbin/ifup"
     inst_script "$moddir/netroot.sh" "/sbin/netroot"
+    inst_script "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
     inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
+    inst_simple "$moddir/dhclient.conf" "/etc/dhclient.conf"
     inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
+    inst_hook pre-udev 60 "$moddir/net-genrules.sh"
     inst_hook cmdline 91 "$moddir/dhcp-root.sh"
+    inst_hook cmdline 92 "$moddir/parse-ibft.sh"
+    inst_hook cmdline 95 "$moddir/parse-vlan.sh"
+    inst_hook cmdline 96 "$moddir/parse-bond.sh"
+    inst_hook cmdline 96 "$moddir/parse-team.sh"
+    inst_hook cmdline 97 "$moddir/parse-bridge.sh"
+    inst_hook cmdline 98 "$moddir/parse-ip-opts.sh"
+    inst_hook cmdline 99 "$moddir/parse-ifname.sh"
+    inst_hook cleanup 10 "$moddir/kill-dhclient.sh"
+
+    # install all config files for teaming
+    unset TEAM_MASTER
+    unset TEAM_CONFIG
+    unset TEAM_PORT_CONFIG
+    unset HWADDR
+    unset SUBCHANNELS
+    for i in /etc/sysconfig/network-scripts/ifcfg-*; do
+        [ -e "$i" ] || continue
+        case "$i" in
+            *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
+                continue
+                ;;
+        esac
+        (
+            . "$i"
+            if ! [ "${ONBOOT}" = "no" -o "${ONBOOT}" = "NO" ] \
+                    && [ -n "${TEAM_MASTER}${TEAM_CONFIG}${TEAM_PORT_CONFIG}" ]; then
+                if [ -n "$TEAM_CONFIG" ] && [ -n "$DEVICE" ]; then
+                    mkdir -p $initdir/etc/teamd
+                    printf -- "%s" "$TEAM_CONFIG" > "$initdir/etc/teamd/${DEVICE}.conf"
+                elif [ -n "$TEAM_PORT_CONFIG" ]; then
+                    inst_simple "$i"
+
+                    HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')"
+                    if [ -n "$HWADDR" ]; then
+                        ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf"
+                    fi
+
+                    SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
+                    if [ -n "$SUBCHANNELS" ]; then
+                        ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf"
+                    fi
+                fi
+            fi
+        )
+    done
+
+    _arch=$(uname -m)
+
+    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
 
     dracut_need_initqueue
 }
+

modules.d/40network/net-genrules.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 getargbool 0 rd.neednet && NEEDNET=1
 
@@ -12,14 +14,11 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
 # Write udev rules
 {
     # bridge: attempt only the defined interface
-    for i in /tmp/bridge.*.info; do
-        [ -e "$i" ] || continue
-        unset bridgeslaves
-        unset bridgename
-        . "$i"
-        RAW_IFACES="$RAW_IFACES $bridgeslaves"
+    if [ -e /tmp/bridge.info ]; then
+        . /tmp/bridge.info
+        IFACES="$IFACES ${bridgeslaves%% *}"
         MASTER_IFACES="$MASTER_IFACES $bridgename"
-    done
+    fi
 
     # bond: attempt only the defined interface (override bridge defines)
     for i in /tmp/bond.*.info; do
@@ -28,7 +27,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
         unset bondname
         . "$i"
         # It is enough to fire up only one
-        RAW_IFACES="$RAW_IFACES $bondslaves"
+        IFACES="$IFACES ${bondslaves%% *}"
         MASTER_IFACES="$MASTER_IFACES ${bondname}"
     done
 
@@ -37,25 +36,15 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
         unset teamslaves
         unset teammaster
         . "$i"
-        RAW_IFACES="$RAW_IFACES ${teamslaves}"
+        IFACES="$IFACES ${teamslaves}"
         MASTER_IFACES="$MASTER_IFACES ${teammaster}"
     done
 
-    for i in /tmp/vlan.*.phy; do
-        [ -e "$i" ] || continue
-        unset phydevice
-        . "$i"
-        RAW_IFACES="$RAW_IFACES $phydevice"
-        for j in /tmp/vlan.*.${phydevice}; do
-            [ -e "$j" ] || continue
-            unset vlanname
-            . "$j"
-            MASTER_IFACES="$MASTER_IFACES ${vlanname}"
-        done
-    done
-
-    MASTER_IFACES="$(trim "$MASTER_IFACES")"
-    RAW_IFACES="$(trim "$RAW_IFACES")"
+    if [ -e /tmp/vlan.info ]; then
+        . /tmp/vlan.info
+        IFACES="$IFACES $phydevice"
+        MASTER_IFACES="$MASTER_IFACES ${vlanname}"
+    fi
 
     if [ -z "$IFACES" ]; then
         [ -e /tmp/net.ifaces ] && read IFACES < /tmp/net.ifaces
@@ -70,10 +59,10 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
     runcmd="RUN+=\"/sbin/initqueue --name ifup-\$env{INTERFACE} --unique --onetime $ifup\""
 
     # We have some specific interfaces to handle
-    if [ -n "${RAW_IFACES}${IFACES}" ]; then
+    if [ -n "$IFACES" ]; then
         echo 'SUBSYSTEM!="net", GOTO="net_end"'
         echo 'ACTION!="add|change|move", GOTO="net_end"'
-        for iface in $IFACES $RAW_IFACES; do
+        for iface in $IFACES; do
             case "$iface" in
                 ??:??:??:??:??:??)  # MAC address
                     cond="ATTR{address}==\"$iface\""
@@ -94,7 +83,13 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
         done
         echo 'LABEL="net_end"'
 
-        for iface in $IFACES; do
+        if [ -n "$MASTER_IFACES" ]; then
+            wait_ifaces=$MASTER_IFACES
+        else
+            wait_ifaces=$IFACES
+        fi
+
+        for iface in $wait_ifaces; do
             if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
                 echo "[ -f /tmp/net.${iface}.did-setup ]" >$hookdir/initqueue/finished/wait-$iface.sh
             fi
@@ -102,12 +97,9 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
     # Default: We don't know the interface to use, handle all
     # Fixme: waiting for the interface as well.
     else
-        cond='ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}!="wlan|wwan"'
+        cond='ACTION=="add", SUBSYSTEM=="net"'
         # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
         echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
-        if [ "$NEEDNET" = "1" ]; then
-            echo 'for i in /tmp/net.*.did-setup; do [ -f "$i" ]  && exit 0; done; exit 1' >$hookdir/initqueue/finished/wait-network.sh
-        fi
     fi
 
 # if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh