Harald Hoyer 1ee1e3
From dc824f19943d31bfba33f017be63e0c8ed74bb47 Mon Sep 17 00:00:00 2001
Harald Hoyer 1ee1e3
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 1ee1e3
Date: Wed, 14 Mar 2012 13:27:13 +0100
Harald Hoyer 1ee1e3
Subject: [PATCH] remove dracut-gencmdline
Harald Hoyer 1ee1e3
Harald Hoyer 1ee1e3
---
Harald Hoyer 1ee1e3
 Makefile                |    4 +-
Harald Hoyer 1ee1e3
 dracut-gencmdline.8.xml |   46 ---
Harald Hoyer 1ee1e3
 dracut-gencmdline.sh    |  716 -----------------------------------------------
Harald Hoyer 1ee1e3
 dracut.spec             |    2 -
Harald Hoyer 1ee1e3
 4 files changed, 1 insertion(+), 767 deletions(-)
Harald Hoyer 1ee1e3
 delete mode 100644 dracut-gencmdline.8.xml
Harald Hoyer 1ee1e3
 delete mode 100755 dracut-gencmdline.sh
Harald Hoyer 1ee1e3
Harald Hoyer 1ee1e3
diff --git a/Makefile b/Makefile
Harald Hoyer 1ee1e3
index 13c6c84..d79b2b0 100644
Harald Hoyer 1ee1e3
--- a/Makefile
Harald Hoyer 1ee1e3
+++ b/Makefile
Harald Hoyer 1ee1e3
@@ -9,7 +9,7 @@ sysconfdir ?= ${prefix}/etc
Harald Hoyer 1ee1e3
 bindir ?= ${prefix}/bin
Harald Hoyer 1ee1e3
 mandir ?= ${prefix}/share/man
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
-manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
Harald Hoyer 1ee1e3
+manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
 .PHONY: install clean archive rpm testimage test all check AUTHORS doc
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
@@ -32,7 +32,6 @@ install: doc
Harald Hoyer 1ee1e3
 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
Harald Hoyer 1ee1e3
 	mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
Harald Hoyer 1ee1e3
 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
Harald Hoyer 1ee1e3
-	install -m 0755 dracut-gencmdline.sh $(DESTDIR)$(bindir)/dracut-gencmdline
Harald Hoyer 1ee1e3
 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
Harald Hoyer 1ee1e3
 	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
Harald Hoyer 1ee1e3
 	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
Harald Hoyer 1ee1e3
@@ -45,7 +44,6 @@ install: doc
Harald Hoyer 1ee1e3
 	cp -arx modules.d $(DESTDIR)$(pkglibdir)
Harald Hoyer 1ee1e3
 	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8
Harald Hoyer 1ee1e3
 	install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8
Harald Hoyer 1ee1e3
-	install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8
Harald Hoyer 1ee1e3
 	install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5
Harald Hoyer 1ee1e3
 	install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7
Harald Hoyer 1ee1e3
 	ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
Harald Hoyer 1ee1e3
diff --git a/dracut-gencmdline.8.xml b/dracut-gencmdline.8.xml
Harald Hoyer 1ee1e3
deleted file mode 100644
Harald Hoyer 1ee1e3
index a893d0b..0000000
Harald Hoyer 1ee1e3
--- a/dracut-gencmdline.8.xml
Harald Hoyer 1ee1e3
+++ /dev/null
Harald Hoyer 1ee1e3
@@ -1,46 +0,0 @@
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-<refentry id='dracutgencmdline8'>
Harald Hoyer 1ee1e3
-<refmeta>
Harald Hoyer 1ee1e3
-<refentrytitle>DRACUT-GENCMDLINE</refentrytitle>
Harald Hoyer 1ee1e3
-<manvolnum>8</manvolnum>
Harald Hoyer 1ee1e3
-<refmiscinfo class='source'>June 2009</refmiscinfo>
Harald Hoyer 1ee1e3
-<refmiscinfo class='manual'>Linux</refmiscinfo>
Harald Hoyer 1ee1e3
-</refmeta>
Harald Hoyer 1ee1e3
-<refnamediv id='name'>
Harald Hoyer 1ee1e3
-<refname>dracut-gencmdline</refname>
Harald Hoyer 1ee1e3
-<refpurpose>generates kernel command line parameters for the dracut generated initramfs</refpurpose>
Harald Hoyer 1ee1e3
-</refnamediv>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-<refsynopsisdiv id='synopsis'>
Harald Hoyer 1ee1e3
-<cmdsynopsis>
Harald Hoyer 1ee1e3
-  <command>dracut-gencmdline</command>
Harald Hoyer 1ee1e3
-    <sbr/>
Harald Hoyer 1ee1e3
-</cmdsynopsis>
Harald Hoyer 1ee1e3
-</refsynopsisdiv>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-<refsect1 id='description'><title>DESCRIPTION</title>
Harald Hoyer 1ee1e3
-<para><command>dracut-gencmdline</command>
Harald Hoyer 1ee1e3
-generates kernel command line parameters for the dracut generated initramfs, which are very specific to the host system.</para>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-</refsect1>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-<refsect1 id='authors'><title>AUTHORS</title>
Harald Hoyer 1ee1e3
-<literallayout remap='.nf'>
Harald Hoyer 1ee1e3
-Harald Hoyer <harald@redhat.com>
Harald Hoyer 1ee1e3
-</literallayout> 
Harald Hoyer 1ee1e3
-</refsect1>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-<refsect1 id='availability'><title>AVAILABILITY</title>
Harald Hoyer 1ee1e3
-<para>The dracut-gencmdline command is part of the dracut package and is available from
Harald Hoyer 1ee1e3
-<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-</refsect1>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-<refsect1 id='see_also'><title>SEE ALSO</title>
Harald Hoyer 1ee1e3
-<para><citerefentry><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
Harald Hoyer 1ee1e3
-</refsect1>
Harald Hoyer 1ee1e3
-</refentry>
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
diff --git a/dracut-gencmdline.sh b/dracut-gencmdline.sh
Harald Hoyer 1ee1e3
deleted file mode 100755
Harald Hoyer 1ee1e3
index c909e27..0000000
Harald Hoyer 1ee1e3
--- a/dracut-gencmdline.sh
Harald Hoyer 1ee1e3
+++ /dev/null
Harald Hoyer 1ee1e3
@@ -1,716 +0,0 @@
Harald Hoyer 1ee1e3
-#!/bin/bash --norc
Harald Hoyer 1ee1e3
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
Harald Hoyer 1ee1e3
-# ex: ts=8 sw=4 sts=4 et filetype=sh
Harald Hoyer 1ee1e3
-#
Harald Hoyer 1ee1e3
-# Copyright 2005-2009 Red Hat, Inc.  All rights reserved.
Harald Hoyer 1ee1e3
-#
Harald Hoyer 1ee1e3
-# This program is free software; you can redistribute it and/or modify
Harald Hoyer 1ee1e3
-# it under the terms of the GNU General Public License as published by
Harald Hoyer 1ee1e3
-# the Free Software Foundation; either version 2 of the License, or
Harald Hoyer 1ee1e3
-# (at your option) any later version.
Harald Hoyer 1ee1e3
-#
Harald Hoyer 1ee1e3
-# This program is distributed in the hope that it will be useful,
Harald Hoyer 1ee1e3
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
Harald Hoyer 1ee1e3
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
Harald Hoyer 1ee1e3
-# GNU General Public License for more details.
Harald Hoyer 1ee1e3
-#
Harald Hoyer 1ee1e3
-# You should have received a copy of the GNU General Public License
Harald Hoyer 1ee1e3
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
Harald Hoyer 1ee1e3
-#
Harald Hoyer 1ee1e3
-# code taken from mkinitrd
Harald Hoyer 1ee1e3
-#
Harald Hoyer 1ee1e3
-#. /usr/libexec/initrd-functions
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-IF_verbose=""
Harald Hoyer 1ee1e3
-function set_verbose() {
Harald Hoyer 1ee1e3
-    case $1 in
Harald Hoyer 1ee1e3
-        1|true|yes|on)
Harald Hoyer 1ee1e3
-            IF_verbose="-v"
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        0|false|no|off)
Harald Hoyer 1ee1e3
-            IF_verbose=""
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-    esac
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-function is_verbose() {
Harald Hoyer 1ee1e3
-    [ -n "$IF_verbose" ] && return 0
Harald Hoyer 1ee1e3
-    return 1
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-function get_verbose() {
Harald Hoyer 1ee1e3
-    echo "$IF_verbose"
Harald Hoyer 1ee1e3
-    is_verbose
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-function get_numeric_dev() {
Harald Hoyer 1ee1e3
-    (
Harald Hoyer 1ee1e3
-        fmt="%d:%d"
Harald Hoyer 1ee1e3
-        if [ "$1" == "hex" ]; then
Harald Hoyer 1ee1e3
-            fmt="%x:%x"
Harald Hoyer 1ee1e3
-        fi
Harald Hoyer 1ee1e3
-        ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }'
Harald Hoyer 1ee1e3
-    ) 2>/dev/null
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-function error() {
Harald Hoyer 1ee1e3
-    echo "$@" >&2
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-function vecho() {
Harald Hoyer 1ee1e3
-    is_verbose && echo "$@"
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-# module dep finding and installation functions
Harald Hoyer 1ee1e3
-moduledep() {
Harald Hoyer 1ee1e3
-    MPARGS=""
Harald Hoyer 1ee1e3
-    if [ "$1" == "--ignore-install" ]; then
Harald Hoyer 1ee1e3
-        MPARGS="$MPARGS --ignore-install"
Harald Hoyer 1ee1e3
-        shift
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    vecho -n "Looking for deps of module $1"
Harald Hoyer 1ee1e3
-    deps=""
Harald Hoyer 1ee1e3
-    deps=$(modprobe $MPARGS --set-version $kernel --quiet --show-depends $1 | awk '/^insmod / { print gensub(".*/","","g",$2) }' | while read foo ; do [ "${foo%%.ko}" != "$1" ] && echo -n "${foo%%.ko} " ; done)
Harald Hoyer 1ee1e3
-    [ -n "$deps" ] && vecho ": $deps" || vecho
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-export MALLOC_PERTURB_=204
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
Harald Hoyer 1ee1e3
-export PATH
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-# Set the umask. For iscsi, the initrd can contain plaintext
Harald Hoyer 1ee1e3
-# password (chap secret), so only allow read by owner.
Harald Hoyer 1ee1e3
-umask 077
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-VERSION=6.0.87
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-PROBE="yes"
Harald Hoyer 1ee1e3
-MODULES=""
Harald Hoyer 1ee1e3
-GRAPHICSMODS=""
Harald Hoyer 1ee1e3
-PREMODS=""
Harald Hoyer 1ee1e3
-DMRAIDS=""
Harald Hoyer 1ee1e3
-ncryptodevs=0
Harald Hoyer 1ee1e3
-ncryptoparts=0
Harald Hoyer 1ee1e3
-ncryptolvs=0
Harald Hoyer 1ee1e3
-ncryptoraids=0
Harald Hoyer 1ee1e3
-root=""
Harald Hoyer 1ee1e3
-scsi_wait_scan="no"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-NET_LIST=""
Harald Hoyer 1ee1e3
-LD_SO_CONF=/etc/ld.so.conf
Harald Hoyer 1ee1e3
-LD_SO_CONF_D=/etc/ld.so.conf.d/
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-CONFMODS="$MODULES"
Harald Hoyer 1ee1e3
-MODULES=""
Harald Hoyer 1ee1e3
-ARCH=$(uname -m | sed -e 's/s390x/s390/')
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-compress=1
Harald Hoyer 1ee1e3
-allowmissing=""
Harald Hoyer 1ee1e3
-target=""
Harald Hoyer 1ee1e3
-kernel=""
Harald Hoyer 1ee1e3
-force=""
Harald Hoyer 1ee1e3
-img_vers=""
Harald Hoyer 1ee1e3
-builtins=""
Harald Hoyer 1ee1e3
-modulefile=/etc/modules.conf
Harald Hoyer 1ee1e3
-[ "$ARCH" != "s390" ] && withusb=1
Harald Hoyer 1ee1e3
-rc=0
Harald Hoyer 1ee1e3
-nolvm=""
Harald Hoyer 1ee1e3
-nodmraid=""
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-IMAGESIZE=8000
Harald Hoyer 1ee1e3
-PRESCSIMODS=""
Harald Hoyer 1ee1e3
-fstab="/etc/fstab"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-vg_list=""
Harald Hoyer 1ee1e3
-net_list="$NET_LIST"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-usage () {
Harald Hoyer 1ee1e3
-    if [ "$1" == "-n" ]; then
Harald Hoyer 1ee1e3
-        cmd=echo
Harald Hoyer 1ee1e3
-    else
Harald Hoyer 1ee1e3
-        cmd=error
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    $cmd "usage: `basename $0` [--version] [--help] [-v] [-f]"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [ "$1" == "-n" ]; then
Harald Hoyer 1ee1e3
-        exit 0
Harald Hoyer 1ee1e3
-    else
Harald Hoyer 1ee1e3
-        exit 1
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-qpushd() {
Harald Hoyer 1ee1e3
-    pushd "$1" >/dev/null 2>&1
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-qpopd() {
Harald Hoyer 1ee1e3
-    popd >/dev/null 2>&1
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-freadlink() {
Harald Hoyer 1ee1e3
-    readlink -f "$1"
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-resolve_device_name() {
Harald Hoyer 1ee1e3
-    if [ -z "${1##UUID=*}" ]; then
Harald Hoyer 1ee1e3
-        real=$(freadlink /dev/disk/by-uuid/${1##UUID=})
Harald Hoyer 1ee1e3
-        [ -b $real ] && { echo $real; return; }
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    if [ -z "${1##LABEL=*}" ]; then
Harald Hoyer 1ee1e3
-        real=$(freadlink /dev/disk/by-label/${1##LABEL=})
Harald Hoyer 1ee1e3
-        [ -b $real ] && { echo $real; return; }
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    echo "$1"
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-finddevnoinsys() {
Harald Hoyer 1ee1e3
-    majmin="$1"
Harald Hoyer 1ee1e3
-    if [ -n "$majmin" ]; then
Harald Hoyer 1ee1e3
-        dev=$(for x in /sys/block/* ; do find $x/ -name dev ; done | while read device ; do \
Harald Hoyer 1ee1e3
-            echo "$majmin" | cmp -s $device && echo $device ; done)
Harald Hoyer 1ee1e3
-        if [ -n "$dev" ]; then
Harald Hoyer 1ee1e3
-            dev=${dev%%/dev}
Harald Hoyer 1ee1e3
-            dev=${dev%%/}
Harald Hoyer 1ee1e3
-            echo "$dev"
Harald Hoyer 1ee1e3
-            return 0
Harald Hoyer 1ee1e3
-        fi
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    return 1
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-finddevicedriverinsys () {
Harald Hoyer 1ee1e3
-    if is_iscsi $PWD; then
Harald Hoyer 1ee1e3
-        handleiscsi "$PWD"
Harald Hoyer 1ee1e3
-        return
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    while [ "$PWD" != "/sys/devices" ]; do
Harald Hoyer 1ee1e3
-        deps=
Harald Hoyer 1ee1e3
-        if [ -f modalias ]; then
Harald Hoyer 1ee1e3
-            MODALIAS=$(cat modalias)
Harald Hoyer 1ee1e3
-            if [ "${MODALIAS::7}" == "scsi:t-" ]; then
Harald Hoyer 1ee1e3
-                scsi_wait_scan=yes
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            moduledep $MODALIAS
Harald Hoyer 1ee1e3
-            unset MODALIAS
Harald Hoyer 1ee1e3
-        fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-        cd ..
Harald Hoyer 1ee1e3
-    done
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-findstoragedriverinsys () {
Harald Hoyer 1ee1e3
-    local sysfs=$(freadlink "$1")
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    # if its a partition look at the device holding the partition
Harald Hoyer 1ee1e3
-    if [ -f "$sysfs/start" ]; then
Harald Hoyer 1ee1e3
-        sysfs=$(freadlink ${sysfs%/*})
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [[ ! "$sysfs" =~ ^/sys/.*block/.*$ ]]; then
Harald Hoyer 1ee1e3
-        #error "WARNING: $sysfs is a not a block sysfs path, skipping"
Harald Hoyer 1ee1e3
-        return
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    case " $handleddevices " in
Harald Hoyer 1ee1e3
-        *" $sysfs "*)
Harald Hoyer 1ee1e3
-            return ;;
Harald Hoyer 1ee1e3
-        *) handleddevices="$handleddevices $sysfs" ;;
Harald Hoyer 1ee1e3
-    esac
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [[ "$sysfs" =~ ^/sys/.*block/md[0-9]+$ ]]; then
Harald Hoyer 1ee1e3
-        local raid=${sysfs##*/}
Harald Hoyer 1ee1e3
-        vecho "Found MDRAID component $raid"
Harald Hoyer 1ee1e3
-        handleraid $raid
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    if [[ "$sysfs" =~ ^/sys/.*block/dm-[0-9]+$ ]]; then
Harald Hoyer 1ee1e3
-        vecho "Found DeviceMapper component ${sysfs##*/}"
Harald Hoyer 1ee1e3
-        handledm $(cat $sysfs/dev |cut -d : -f 1) $(cat $sysfs/dev |cut -d : -f 2)
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    for slave in $(ls -d "$sysfs"/slaves/* 2>/dev/null) ; do
Harald Hoyer 1ee1e3
-        findstoragedriverinsys "$slave"
Harald Hoyer 1ee1e3
-    done
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [ -L "$sysfs/device" ]; then
Harald Hoyer 1ee1e3
-        qpushd $(freadlink "$sysfs/device")
Harald Hoyer 1ee1e3
-        finddevicedriverinsys
Harald Hoyer 1ee1e3
-        qpopd
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-findstoragedriver () {
Harald Hoyer 1ee1e3
-    local device="$1"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [ ! -b "$device" ]; then
Harald Hoyer 1ee1e3
-        #error "WARNING: $device is a not a block device, skipping"
Harald Hoyer 1ee1e3
-        return
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    local majmin=$(get_numeric_dev dec "$device")
Harald Hoyer 1ee1e3
-    local sysfs=$(finddevnoinsys "$majmin")
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [ -z "$sysfs" ]; then
Harald Hoyer 1ee1e3
-        #error "WARNING: $device major:minor $majmin not found, skipping"
Harald Hoyer 1ee1e3
-        return
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    vecho "Looking for driver for $device in $sysfs"
Harald Hoyer 1ee1e3
-    findstoragedriverinsys "$sysfs"
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-iscsi_get_rec_val() {
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    # The open-iscsi 742 release changed to using flat files in
Harald Hoyer 1ee1e3
-    # /var/lib/iscsi.
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    result=$(grep "^${2} = " "$1" |  sed -e s'/.* = //')
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-iscsi_set_parameters() {
Harald Hoyer 1ee1e3
-    path=$1
Harald Hoyer 1ee1e3
-    vecho setting iscsi parameters
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    tmpfile=$(mktemp)
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    # Check once before getting explicit values, so we can output a decent
Harald Hoyer 1ee1e3
-    # error message.
Harald Hoyer 1ee1e3
-    /sbin/iscsiadm --show -m session -r $path > $tmpfile
Harald Hoyer 1ee1e3
-    if [ ! -s $tmpfile ]; then
Harald Hoyer 1ee1e3
-        echo Unable to find iscsi record for $path
Harald Hoyer 1ee1e3
-        exit 1
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    nit_name=$(grep "^InitiatorName=" /etc/iscsi/initiatorname.iscsi | \
Harald Hoyer 1ee1e3
-        sed -e "s/^InitiatorName=//")
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    iscsi_get_rec_val $tmpfile "node.name"
Harald Hoyer 1ee1e3
-    tgt_name=${result}
Harald Hoyer 1ee1e3
-    iscsi_get_rec_val $tmpfile "node.tpgt"
Harald Hoyer 1ee1e3
-    tpgt=${result}
Harald Hoyer 1ee1e3
-    # iscsistart wants node.conn[0].address / port
Harald Hoyer 1ee1e3
-    iscsi_get_rec_val $tmpfile 'node.conn\[0\].address'
Harald Hoyer 1ee1e3
-    tgt_ipaddr=${result}
Harald Hoyer 1ee1e3
-    iscsi_get_rec_val $tmpfile 'node.conn\[0\].port'
Harald Hoyer 1ee1e3
-    tgt_port=${result}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    # Note: we get chap secrets (passwords) in plaintext, and also store
Harald Hoyer 1ee1e3
-    # them in the initrd.
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    iscsi_get_rec_val $tmpfile "node.session.auth.username"
Harald Hoyer 1ee1e3
-    chap=${result}
Harald Hoyer 1ee1e3
-    if [ -n "${chap}" -a "${chap}" != "<empty>" ]; then
Harald Hoyer 1ee1e3
-        chap="-u ${chap}"
Harald Hoyer 1ee1e3
-        iscsi_get_rec_val $tmpfile "node.session.auth.password"
Harald Hoyer 1ee1e3
-        chap_pw="-w ${result}"
Harald Hoyer 1ee1e3
-    else
Harald Hoyer 1ee1e3
-        chap=""
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    iscsi_get_rec_val $tmpfile "node.session.auth.username_in"
Harald Hoyer 1ee1e3
-    chap_in=${result}
Harald Hoyer 1ee1e3
-    if [ -n "${chap_in}" -a "${chap_in}" != "<empty>" ]; then
Harald Hoyer 1ee1e3
-        chap_in="-U ${chap_in}"
Harald Hoyer 1ee1e3
-        iscsi_get_rec_val $tmpfile "node.session.auth.password_in"
Harald Hoyer 1ee1e3
-        chap_in_pw="-W ${result}"
Harald Hoyer 1ee1e3
-    else
Harald Hoyer 1ee1e3
-        chap_in=""
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    rm $tmpfile
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-emit_iscsi () {
Harald Hoyer 1ee1e3
-    if [ -n "${iscsi_devs}" ]; then
Harald Hoyer 1ee1e3
-        for dev in ${iscsi_devs}; do
Harald Hoyer 1ee1e3
-            iscsi_set_parameters $dev
Harald Hoyer 1ee1e3
-            # recid is not really used, just use 0 for it
Harald Hoyer 1ee1e3
-            echo "/bin/iscsistart -t ${tgt_name} -i ${nit_name} \
Harald Hoyer 1ee1e3
-                -g ${tpgt} -a ${tgt_ipaddr} ${chap} ${chap_pw} \
Harald Hoyer 1ee1e3
-                ${chap_in} ${chap_in_pw}"
Harald Hoyer 1ee1e3
-        done
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-is_iscsi() {
Harald Hoyer 1ee1e3
-    path=$1
Harald Hoyer 1ee1e3
-    if echo $path | grep -q "/platform/host[0-9]*/session[0-9]*/target[0-9]*:[0-9]*:[0-9]*/[0-9]*:[0-9]*:[0-9]*:[0-9]*"; then
Harald Hoyer 1ee1e3
-        return 0
Harald Hoyer 1ee1e3
-    else
Harald Hoyer 1ee1e3
-        return 1
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-handledm() {
Harald Hoyer 1ee1e3
-    major=$1
Harald Hoyer 1ee1e3
-    minor=$2
Harald Hoyer 1ee1e3
-    while read dmstart dmend dmtype r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 ; do
Harald Hoyer 1ee1e3
-        case "$dmtype" in
Harald Hoyer 1ee1e3
-            crypt)
Harald Hoyer 1ee1e3
-                # this device is encrypted; find the slave device and see
Harald Hoyer 1ee1e3
-                # whether the encryption is LUKS; if not, bail.
Harald Hoyer 1ee1e3
-                slavedev=$(finddevnoinsys $r3)
Harald Hoyer 1ee1e3
-                # get the basename, then s,!,/, in case it's a cciss device
Harald Hoyer 1ee1e3
-                slavedev=$(echo ${slavedev##*/} | tr '!' '/')
Harald Hoyer 1ee1e3
-                cryptsetup isLuks "/dev/$slavedev" 2>/dev/null || continue
Harald Hoyer 1ee1e3
-                find_base_dm_mods
Harald Hoyer 1ee1e3
-                dmname=$(dmsetup info -j $major -m $minor -c --noheadings -o name)
Harald Hoyer 1ee1e3
-                # do the device resolution dance to get /dev/mapper/foo
Harald Hoyer 1ee1e3
-                # since 'lvm lvs' doesn't like dm-X device nodes
Harald Hoyer 1ee1e3
-                if [[ "$slavedev" =~ ^dm- ]]; then
Harald Hoyer 1ee1e3
-                    majmin=$(get_numeric_dev dec "/dev/$slavedev")
Harald Hoyer 1ee1e3
-                    for dmdev in /dev/mapper/* ; do
Harald Hoyer 1ee1e3
-                        dmnum=$(get_numeric_dev dev $dmdev)
Harald Hoyer 1ee1e3
-                        if [ $dmnum = $majmin ]; then
Harald Hoyer 1ee1e3
-                            slavedev=${dmdev#/dev/}
Harald Hoyer 1ee1e3
-                            break
Harald Hoyer 1ee1e3
-                        fi
Harald Hoyer 1ee1e3
-                    done
Harald Hoyer 1ee1e3
-                fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-                # determine if $slavedev is an LV
Harald Hoyer 1ee1e3
-                #  if so, add the device to latecryptodevs
Harald Hoyer 1ee1e3
-                #  if not, add the device to cryptodevs
Harald Hoyer 1ee1e3
-                local vg=$(lvshow /dev/$slavedev)
Harald Hoyer 1ee1e3
-                if [ -n "$vg" ]; then
Harald Hoyer 1ee1e3
-                    eval cryptolv${ncryptolvs}='"'/dev/$slavedev $dmname'"'
Harald Hoyer 1ee1e3
-                    let ncryptolvs++
Harald Hoyer 1ee1e3
-                elif grep -q "^$slavedev :" /proc/mdstat ; then
Harald Hoyer 1ee1e3
-                    eval cryptoraid${ncryptoraids}='"'/dev/$slavedev $dmname'"'
Harald Hoyer 1ee1e3
-                    let ncryptoraids++
Harald Hoyer 1ee1e3
-                else
Harald Hoyer 1ee1e3
-                    eval cryptoparts${ncryptoparts}='"'/dev/$slavedev $dmname'"'
Harald Hoyer 1ee1e3
-                    let ncryptoparts++
Harald Hoyer 1ee1e3
-                fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-                let ncryptodevs++
Harald Hoyer 1ee1e3
-                findstoragedriver "/dev/$slavedev"
Harald Hoyer 1ee1e3
-                ;;
Harald Hoyer 1ee1e3
-        esac
Harald Hoyer 1ee1e3
-    done << EOF
Harald Hoyer 1ee1e3
-        $(dmsetup table -j $major -m $minor 2>/dev/null)
Harald Hoyer 1ee1e3
-EOF
Harald Hoyer 1ee1e3
-        local name=$(dmsetup info --noheadings -c -j $major -m $minor -o name)
Harald Hoyer 1ee1e3
-        local vg=$(lvshow "/dev/mapper/$name")
Harald Hoyer 1ee1e3
-        local raids=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks")
Harald Hoyer 1ee1e3
-        if [ -n "$vg" ]; then
Harald Hoyer 1ee1e3
-            vg=`echo $vg` # strip whitespace
Harald Hoyer 1ee1e3
-            case " $vg_list " in
Harald Hoyer 1ee1e3
-                *" $vg "*) ;;
Harald Hoyer 1ee1e3
-                *)  vg_list="$vg_list $vg"
Harald Hoyer 1ee1e3
-                    [ -z "$nolvm" ] && find_base_dm_mods
Harald Hoyer 1ee1e3
-                    ;;
Harald Hoyer 1ee1e3
-            esac
Harald Hoyer 1ee1e3
-        fi
Harald Hoyer 1ee1e3
-        for raid in $raids ; do
Harald Hoyer 1ee1e3
-            if [ "$raid" == "$name" ]; then
Harald Hoyer 1ee1e3
-                case " $DMRAIDS " in
Harald Hoyer 1ee1e3
-                    *" $raid "*) ;;
Harald Hoyer 1ee1e3
-                    *)  DMRAIDS="$DMRAIDS $raid"
Harald Hoyer 1ee1e3
-                        [ -z "$nodmraid" ] && find_base_dm_mods
Harald Hoyer 1ee1e3
-                        ;;
Harald Hoyer 1ee1e3
-                esac
Harald Hoyer 1ee1e3
-                break
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-        done
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-handleiscsi() {
Harald Hoyer 1ee1e3
-    vecho "Found iscsi component $1"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    # We call iscsi_set_parameters once here to figure out what network to
Harald Hoyer 1ee1e3
-    # use (it sets tgt_ipaddr), and once again to emit iscsi values,
Harald Hoyer 1ee1e3
-    # not very efficient.
Harald Hoyer 1ee1e3
-    iscsi_set_parameters $1
Harald Hoyer 1ee1e3
-    iscsi_devs="$iscsi_devs $1"
Harald Hoyer 1ee1e3
-    netdev=$(/sbin/ip route get to $tgt_ipaddr | \
Harald Hoyer 1ee1e3
-        sed 's|.*dev \(.*\).*|\1|g' | awk '{ print $1; exit }')
Harald Hoyer 1ee1e3
-    addnetdev $netdev
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-handleraid() {
Harald Hoyer 1ee1e3
-    local start=0
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    if [ -n "$noraid" -o ! -f /proc/mdstat ]; then
Harald Hoyer 1ee1e3
-        return 0
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    levels=$(awk "/^$1[  ]*:/ { print\$4 }" /proc/mdstat)
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    for level in $levels ; do
Harald Hoyer 1ee1e3
-        case $level in
Harald Hoyer 1ee1e3
-            linear)
Harald Hoyer 1ee1e3
-                start=1
Harald Hoyer 1ee1e3
-                ;;
Harald Hoyer 1ee1e3
-            multipath)
Harald Hoyer 1ee1e3
-                start=1
Harald Hoyer 1ee1e3
-                ;;
Harald Hoyer 1ee1e3
-            raid[01] | raid10)
Harald Hoyer 1ee1e3
-                start=1
Harald Hoyer 1ee1e3
-                ;;
Harald Hoyer 1ee1e3
-            raid[456])
Harald Hoyer 1ee1e3
-                start=1
Harald Hoyer 1ee1e3
-                ;;
Harald Hoyer 1ee1e3
-            *)
Harald Hoyer 1ee1e3
-                error "raid level $level (in /proc/mdstat) not recognized"
Harald Hoyer 1ee1e3
-                ;;
Harald Hoyer 1ee1e3
-        esac
Harald Hoyer 1ee1e3
-    done
Harald Hoyer 1ee1e3
-    if [ "$start" = 1 ]; then
Harald Hoyer 1ee1e3
-        raiddevices="$raiddevices $1"
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    return $start
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-lvshow() {
Harald Hoyer 1ee1e3
-    lvm lvs --ignorelockingfailure --noheadings -o vg_name \
Harald Hoyer 1ee1e3
-        $1 2>/dev/null | egrep -v '^ *(WARNING:|Volume Groups with)'
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-vgdisplay() {
Harald Hoyer 1ee1e3
-    lvm vgdisplay --ignorelockingfailure -v $1 2>/dev/null |
Harald Hoyer 1ee1e3
-    sed -n 's/PV Name//p'
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-dmmods_found="n"
Harald Hoyer 1ee1e3
-find_base_dm_mods()
Harald Hoyer 1ee1e3
-{
Harald Hoyer 1ee1e3
-    [ "$dmmods_found" == "n" ] || return
Harald Hoyer 1ee1e3
-    dmmods_found="y"
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-savedargs=$*
Harald Hoyer 1ee1e3
-while [ $# -gt 0 ]; do
Harald Hoyer 1ee1e3
-    case $1 in
Harald Hoyer 1ee1e3
-        --fstab*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--fstab=}" ]; then
Harald Hoyer 1ee1e3
-                fstab=${1##--fstab=}
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                fstab=$2
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-        -v|--verbose)
Harald Hoyer 1ee1e3
-            set_verbose true
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --net-dev*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--net-dev=}" ]; then
Harald Hoyer 1ee1e3
-                net_list="$net_list ${1##--net-dev=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                net_list="$net_list $2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --rootdev*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--rootdev=}" ]; then
Harald Hoyer 1ee1e3
-                rootdev="${1##--rootdev=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                rootdev="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --thawdev*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--thawdev=}" ]; then
Harald Hoyer 1ee1e3
-                thawdev="${1##--thawdev=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                thawdev="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --rootfs*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--rootfs=}" ]; then
Harald Hoyer 1ee1e3
-                rootfs="${1##--rootfs=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                rootfs="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --rootopts*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--rootopts=}" ]; then
Harald Hoyer 1ee1e3
-                rootopts="${1##--rootopts=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                rootopts="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --root*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--root=}" ]; then
Harald Hoyer 1ee1e3
-                root="${1##--root=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                root="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --loopdev*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--loopdev=}" ]; then
Harald Hoyer 1ee1e3
-                loopdev="${1##--loopdev=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                loopdev="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --loopfs*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--loopfs=}" ]; then
Harald Hoyer 1ee1e3
-                loopfs="${1##--loopfs=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                loopfs="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --loopopts*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--loopopts=}" ]; then
Harald Hoyer 1ee1e3
-                loopopts="${1##--loopopts=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                loopopts="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --looppath*)
Harald Hoyer 1ee1e3
-            if [ "$1" != "${1##--looppath=}" ]; then
Harald Hoyer 1ee1e3
-                looppath="${1##--looppath=}"
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                looppath="$2"
Harald Hoyer 1ee1e3
-                shift
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        --help)
Harald Hoyer 1ee1e3
-            usage -n
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-        *)
Harald Hoyer 1ee1e3
-            if [ -z "$target" ]; then
Harald Hoyer 1ee1e3
-                target=$1
Harald Hoyer 1ee1e3
-            elif [ -z "$kernel" ]; then
Harald Hoyer 1ee1e3
-                kernel=$1
Harald Hoyer 1ee1e3
-            else
Harald Hoyer 1ee1e3
-                usage
Harald Hoyer 1ee1e3
-            fi
Harald Hoyer 1ee1e3
-            ;;
Harald Hoyer 1ee1e3
-    esac
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    shift
Harald Hoyer 1ee1e3
-done
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-[ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
Harald Hoyer 1ee1e3
-[ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)
Harald Hoyer 1ee1e3
-[ -z "$rootopts" ] && rootopts="defaults"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-[ -z "$rootdev" ] && rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab)
Harald Hoyer 1ee1e3
-    # check if it's nfsroot
Harald Hoyer 1ee1e3
-physdev=""
Harald Hoyer 1ee1e3
-if [ "$rootfs" == "nfs" ]; then
Harald Hoyer 1ee1e3
-    if [ "x$net_list" == "x" ]; then
Harald Hoyer 1ee1e3
-        handlenfs $rootdev
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-else
Harald Hoyer 1ee1e3
-        # check if it's root by label
Harald Hoyer 1ee1e3
-    rdev=$rootdev
Harald Hoyer 1ee1e3
-    rdev=$(resolve_device_name "$rdev")
Harald Hoyer 1ee1e3
-    rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,_netdev//' -e 's/_netdev//' -e 's/,_rnetdev//' -e 's/_rnetdev//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
Harald Hoyer 1ee1e3
-    findstoragedriver "$rdev"
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-    # find the first swap dev which would get used for swsusp
Harald Hoyer 1ee1e3
-[ -z "$thawdev" ] && thawdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
Harald Hoyer 1ee1e3
-swsuspdev="$thawdev"
Harald Hoyer 1ee1e3
-if [ -n "$swsuspdev" ]; then
Harald Hoyer 1ee1e3
-    swsuspdev=$(resolve_device_name "$swsuspdev")
Harald Hoyer 1ee1e3
-    findstoragedriver "$swsuspdev"
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-cemit()
Harald Hoyer 1ee1e3
-{
Harald Hoyer 1ee1e3
-    cat
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-emit()
Harald Hoyer 1ee1e3
-{
Harald Hoyer 1ee1e3
-    NONL=""
Harald Hoyer 1ee1e3
-    if [ "$1" == "-n" ]; then
Harald Hoyer 1ee1e3
-        NONL="-n"
Harald Hoyer 1ee1e3
-        shift
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    echo $NONL "$@"
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-emitdmraids()
Harald Hoyer 1ee1e3
-{
Harald Hoyer 1ee1e3
-    if [ -z "$nodmraid" -a -n "$DMRAIDS" ]; then
Harald Hoyer 1ee1e3
-        for raid in $DMRAIDS; do
Harald Hoyer 1ee1e3
-            echo -n "rd_DM_UUID=$raid "
Harald Hoyer 1ee1e3
-        done
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-# HACK: module loading + device creation isn't necessarily synchronous...
Harald Hoyer 1ee1e3
-# this will make sure that we have all of our devices before trying
Harald Hoyer 1ee1e3
-# things like RAID or LVM
Harald Hoyer 1ee1e3
-emitdmraids
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-emitcrypto()
Harald Hoyer 1ee1e3
-{
Harald Hoyer 1ee1e3
-    local luksuuid=$(grep "^$2 " /etc/crypttab 2>/dev/null| awk '{ print $2 }')
Harald Hoyer 1ee1e3
-    if [ -z "$luksuuid" ]; then
Harald Hoyer 1ee1e3
-        luksuuid="$2"
Harald Hoyer 1ee1e3
-    fi
Harald Hoyer 1ee1e3
-    luksuuid=${luksuuid##UUID=}
Harald Hoyer 1ee1e3
-    echo -n "rd_LUKS_UUID=$luksuuid "
Harald Hoyer 1ee1e3
-}
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-if [ -n "$raiddevices" ]; then
Harald Hoyer 1ee1e3
-    for dev in $raiddevices; do
Harald Hoyer 1ee1e3
-        uid=$(udevadm info --query=env --name /dev/${dev}|grep MD_UUID)
Harald Hoyer 1ee1e3
-        uid=${uid##MD_UUID=}
Harald Hoyer 1ee1e3
-        [ -n "$uid" ] && echo -n "rd_MD_UUID=$uid "
Harald Hoyer 1ee1e3
-    done
Harald Hoyer 1ee1e3
-else
Harald Hoyer 1ee1e3
-    echo -n "rd_NO_MD "
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-if [ -z "$nolvm" -a -n "$vg_list" ]; then
Harald Hoyer 1ee1e3
-    for vg in $vg_list; do
Harald Hoyer 1ee1e3
-        echo -n "rd_LVM_VG=$vg "
Harald Hoyer 1ee1e3
-    done
Harald Hoyer 1ee1e3
-else
Harald Hoyer 1ee1e3
-    echo -n "rd_NO_LVM "
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-cryptdevs="$(echo ${!cryptoraid@} ${!cryptopart@} ${!cryptolv@})"
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-if [ -z "$cryptdevs" ]; then
Harald Hoyer 1ee1e3
-    echo -n "rd_NO_LUKS "
Harald Hoyer 1ee1e3
-else
Harald Hoyer 1ee1e3
-    for cryptdev in ${!cryptoraid@} ${!cryptopart@} ${!cryptolv@} ; do
Harald Hoyer 1ee1e3
-        emitcrypto `eval echo '$'$cryptdev`
Harald Hoyer 1ee1e3
-    done
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-# output local keyboard/18n settings
Harald Hoyer 1ee1e3
-[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
Harald Hoyer 1ee1e3
-[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do
Harald Hoyer 1ee1e3
-    val=$(eval echo \$$i)
Harald Hoyer 1ee1e3
-    [[ $val ]] && echo -n "$i=$val "
Harald Hoyer 1ee1e3
-done
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-if [ -n "$KEYBOARDTYPE" -a "$KEYBOARDTYPE" != "pc" ]; then
Harald Hoyer 1ee1e3
-    echo -n "KEYBOARDTYPE=$KEYBOARDTYPE "
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-if [ -n "$rootdev" ]; then
Harald Hoyer 1ee1e3
-    echo -n "root=$rootdev "
Harald Hoyer 1ee1e3
-fi
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
-echo
Harald Hoyer 1ee1e3
diff --git a/dracut.spec b/dracut.spec
Harald Hoyer 1ee1e3
index 0275af3..7a058ae 100644
Harald Hoyer 1ee1e3
--- a/dracut.spec
Harald Hoyer 1ee1e3
+++ b/dracut.spec
Harald Hoyer 1ee1e3
@@ -318,9 +318,7 @@ rm -rf $RPM_BUILD_ROOT
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
 %files tools
Harald Hoyer 1ee1e3
 %defattr(-,root,root,0755)
Harald Hoyer 1ee1e3
-%{_mandir}/man8/dracut-gencmdline.8*
Harald Hoyer 1ee1e3
 %{_mandir}/man8/dracut-catimages.8*
Harald Hoyer 1ee1e3
-%{_bindir}/dracut-gencmdline
Harald Hoyer 1ee1e3
 %{_bindir}/dracut-catimages
Harald Hoyer 1ee1e3
 %dir /boot/dracut
Harald Hoyer 1ee1e3
 %dir /var/lib/dracut