Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 310051 Details for
Bug 451670
mkinitrd does not support encrypted block devices
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
rough patch to support encrypted block devices in rhel5
mkinitrd-rhel5-crypto.patch (text/plain), 10.97 KB, created by
David Lehman
on 2008-06-23 18:09:38 UTC
(
hide
)
Description:
rough patch to support encrypted block devices in rhel5
Filename:
MIME Type:
Creator:
David Lehman
Created:
2008-06-23 18:09:38 UTC
Size:
10.97 KB
patch
obsolete
>--- mkinitrd 2008-05-19 16:19:52.000000000 -0500 >+++ /home/dave/Desktop/mkinitrd 2008-06-12 11:26:15.000000000 -0500 >@@ -46,6 +46,11 @@ > PREINTERFACES="" > NET_LIST="" > >+ncryptodevs=0 >+ncryptoparts=0 >+ncryptolvs=0 >+ncryptoraids=0 >+ > CFG_DIR=${MKINITRD_CONFIG_DIR:-/etc/sysconfig/mkinitrd} > cfgs="$CFG_DIR/*[^~]" > for cfg in $cfgs ; do >@@ -361,22 +366,23 @@ > echo nash-access "$@" | /sbin/nash --force --quiet > } > >+slavestried="" > findstoragedriverinsys () { >- if echo $PWD | grep -q "/sys/block/dm-[[:digit:]]$"; then >- while [ ! -L device ]; do >- if [ -L subsystem ]; then >- cd slaves >- for x in *;do >- if [ -L $x ]; then >- cd $x; >- break >- fi; >- done >- fi >- done >- fi >- > while [ ! -L device ]; do >+ for slave in $(ls -d slaves/* 2>/dev/null) ; do >+ slavename=${slave##*/} >+ case " $slavestried " in >+ *" $slavename "*) >+ continue >+ ;; >+ *) >+ slavestried="$slavestried $slavename" >+ pushd $slave >/dev/null 2>&1 >+ findstoragedriverinsys >+ popd >/dev/null 2>&1 >+ ;; >+ esac >+ done > [ "$PWD" = "/sys" ] && return > cd .. > done >@@ -385,15 +391,19 @@ > handleiscsi "$PWD" > return > fi >- while [ ! -f modalias ]; do >- [ "$PWD" = "/sys/devices" ] && return >+ while [ "$PWD" != "/sys/devices" ]; do >+ deps= >+ if [ -f modalias ]; then >+ moduledep $(cat modalias) >+ fi >+ >+ [ -z "$deps" -a -L driver/module ] && \ >+ deps=$(basename $(readlink driver/module)) >+ for driver in $deps ; do >+ findmodule $driver >+ done > cd .. > done >- moduledep $(cat modalias) >- [ -z "$deps" -a -L driver/module ] && deps=$(basename $(readlink driver/module)) >- for driver in $deps ; do >- findmodule $driver >- done > } > > findstoragedriver () { >@@ -403,21 +413,21 @@ > continue ;; > *) handleddevices="$handleddevices $device" ;; > esac >- if [[ "$device" =~ "md[0-9]+" ]]; then >+ if [[ "$device" =~ "^md[0-9]+" ]]; then > vecho "Found RAID component $device" > handleraid "$device" > continue > fi >- if [[ "$device" =~ "mapper" ]]; then >- mpath="/dev/"$device >- minorno="0x"`stat -c %T $mpath` >- minor=$(($minorno % 0x100)) >- dm="dm-"$minor >- device=$dm >- vecho "Found multipath component $device" >- fi > vecho "Looking for driver for device $device" >- sysfs=$(findone -type d /sys/block -name $device) >+ if [[ "$device" =~ ^(dm-|mapper/) ]]; then >+ device=$(resolve_dm $device) >+ vecho "Found DM device $device" >+ majmin=$(get_numeric_dev dec "/dev/$device") >+ sysfs=$(find_dm_in_sysblock /dev/$device) >+ handledm $(echo "$majmin" |cut -d : -f 1) $(echo "$majmin" |cut -d : -f 2) >+ else >+ sysfs=$(findone -type d /sys/block -name $device) >+ fi > [ -z "$sysfs" ] && return > pushd $sysfs >/dev/null 2>&1 > findstoragedriverinsys >@@ -595,7 +605,7 @@ > fi > > levels=$(awk "/^$1[ ]*:/ { print\$4 }" /proc/mdstat) >- devs=$(awk "/^$1[ ]*:/ { print gensub(\"[[0-9]*]\",\"\",\"g\",gensub(\"^md.*raid[0-9]*\",\"\",\"1\")) }" /proc/mdstat) >+ devs=$(gawk "/^$1[ ]*:/ { print gensub(\"\\\\[[0-9]*\\\\]\",\"\",\"g\",gensub(\"^md.*raid[0-9]*\",\"\",\"1\")) }" /proc/mdstat) > > for level in $levels ; do > case $level in >@@ -623,6 +633,85 @@ > return $start > } > >+resolve_dm() { >+ # resolve device mapper nodes to something of the form /dev/mapper/foo >+ if [[ ! "$1" =~ ^dm- ]]; then >+ echo $1 >+ return 0 >+ fi >+ majmin=$(cat /sys/block/$1/dev) >+ for dmdev in /dev/mapper/* ; do >+ dmnum=$(get_numeric_dev dec $dmdev) >+ if [ "$dmnum" = "$majmin" ]; then >+ echo ${dmdev#/dev/} >+ break >+ fi >+ done >+} >+ >+ >+handledm() { >+ major=$1 >+ minor=$2 >+ while read dmstart dmend dmtype r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 ; do >+ case "$dmtype" in >+ crypt) >+ slavedev=$(findall /sys/block -name dev \ >+ | while read device ; do \ >+ echo "$r3" \ >+ | cmp -s $device && echo $device ; \ >+ done \ >+ | sed -e 's,.*/\([^/]\+\)/dev,\1,' ) >+ slavedev=$(resolve_dm ${slavedev##*/}) >+ cryptsetup isLuks "/dev/$slavedev" 2>/dev/null || continue >+ vecho "device is LUKS, slave is $slavedev" >+ find_base_dm_mods >+ findmodule dm-crypt >+ for mod in $(echo $r0 | tr ':-' ' ') ; do >+ findmodule --skiperrors $mod >+ done >+ dmname=$(dmsetup info -j $major -m $minor -c --noheadings -o name) >+ slavedev=$(resolve_dm $slavedev) >+ >+ # determine if $slavedev is an LV >+ # if so, add the device to latecryptodevs >+ # if not, add the device to cryptodevs >+ local vg=$(lvm.static lvs --ignorelockingfailure --noheadings -o vg_name /dev/$slavedev 2>/dev/null) >+ >+ if [ -n "$vg" ]; then >+ eval cryptolv${ncryptolvs}='"'/dev/$slavedev $dmname'"' >+ let ncryptolvs++ >+ elif grep -q "^$slavedev :" /proc/mdstat ; then >+ eval cryptoraid${ncryptoraids}='"'/dev/$slavedev $dmname'"' >+ let ncryptoraids++ >+ else >+ eval cryptopart${ncryptoparts}='"'/dev/$slavedev $dmname'"' >+ let ncryptoparts++ >+ fi >+ >+ let ncryptodevs++ >+ handlelvordev "/dev/$slavedev" >+ ;; >+ esac >+ done << EOF >+ $(dmsetup table -j $major -m $minor 2>/dev/null) >+EOF >+} >+ >+dmmods_found="n" >+find_base_dm_mods() >+{ >+ [ "$dmmods_found" == "n" ] || return >+ findmodule -dm-mod >+ >+ # DM requires all of these to be there in case someone used the >+ # feature. broken. (#132001) >+ findmodule -dm-mirror >+ findmodule -dm-zero >+ findmodule -dm-snapshot >+ dmmods_found="y" >+} >+ > handlelvordev() { > local vg=`lvm.static lvs --ignorelockingfailure --noheadings -o vg_name $1 2>/dev/null` > if [ -n "$vg" ]; then >@@ -1009,7 +1098,10 @@ > -e 's/$/,ro/') > devname=$(resolve_device_name $rootdev) > majmin=$(get_numeric_dev dec $devname) >- if [ -n "$majmin" ]; then >+ if [[ "$devname" =~ ^/dev/mapper/ ]]; then >+ vecho "Found root device $devname for $rootdev" >+ rootdev=$devname >+ elif [ -n "$majmin" ]; then > dev=$(findall /sys/block -name dev | while read device ; do \ > echo "$majmin" | cmp -s $device && echo $device ; done \ > | sed -e 's,.*/\([^/]\+\)/dev,\1,' ) >@@ -1033,8 +1125,10 @@ > > # find the first swap dev which would get used for swsusp > swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab) >- if [ "$swsuspdev" = "${swsuspdev##LABEL=}" -o \ >- "$swsuspdev" = "${swsuspdev##UUID=}" ]; then >+ if [ -n "$swsuspdev" ]; then >+ if [[ "$swsuspdev" =~ ^(LABEL=|UUID=) ]]; then >+ swsuspdev=$(resolve_device_name $swsuspdev) >+ fi > handlelvordev $swsuspdev > fi > fi >@@ -1150,13 +1244,7 @@ > fi > fi > >- findmodule -dm-mod >- >- # DM requires all of these to be there in case someone used the >- # feature. broken. (#132001) >- findmodule -dm-mirror >- findmodule -dm-zero >- findmodule -dm-snapshot >+ find_base_dm_mods > > # If we use dm-multipath devices, include the needed modules > if [ "$use_multipath" == "1" ]; then >@@ -1308,12 +1396,87 @@ > inst /sbin/kpartx.static "$MNTIMAGE/bin/kpartx" > fi > >+findkeymap () { >+ local MAP=$1 >+ >+ if [ ! -f "$MAP" ]; then >+ MAP=$(find /lib/kbd/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1) >+ fi >+ >+ case " $KEYMAPS " in >+ *" $MAP "*) >+ return >+ esac >+ >+ KEYMAPS="$KEYMAPS $MAP" >+ >+ case $MAP in >+ *.gz) >+ cmd=zgrep >+ ;; >+ *.bz2) >+ cmd=bzgrep >+ ;; >+ *) >+ cmd=grep >+ ;; >+ esac >+ >+ for INCL in $($cmd "^include " $MAP | cut -d' ' -f2 | tr -d '"'); do >+ for FN in $(find /lib/kbd/keymaps -type f -name $INCL\*); do >+ findkeymap $FN >+ done >+ done >+} >+ >+if [ $ncryptodevs -ne 0 ]; then >+ inst /sbin/cryptsetup "$MNTIMAGE/sbin/cryptsetup" >+ >+ KEYTABLE= >+ KEYMAP= >+ if [ -f /etc/sysconfig/console/default.kmap ]; then >+ KEYMAP=/etc/sysconfig/console/default.kmap >+ else >+ if [ -f /etc/sysconfig/keyboard ]; then >+ . /etc/sysconfig/keyboard >+ fi >+ if [ -n "$KEYTABLE" -a -d "/lib/kbd/keymaps" ]; then >+ KEYMAP="$KEYTABLE.map" >+ fi >+ fi >+ >+ if [ -n "$KEYMAP" ]; then >+ LOADKEYS=loadkeys >+ if [ -f /etc/sysconfig/i18n ]; then >+ . /etc/sysconfig/i18n >+ fi >+ if [ "${LANG}" != "${LANG%%.UTF-8}" -o "${LANG}" != "${LANG%%.utf8}" ]; then >+ LOADKEYS="loadkeys -u" >+ fi >+ >+ inst /bin/loadkeys.static "$MNTIMAGE/bin/loadkeys" >+ findkeymap $KEYMAP >+ >+ for FN in $KEYMAPS; do >+ inst $FN "$MNTIMAGE$FN" >+ case "$FN" in >+ *.gz) >+ gzip -d "$MNTIMAGE$FN" >+ ;; >+ *.bz2) >+ bzip2 -d "$MNTIMAGE$FN" >+ ;; >+ esac >+ done >+ fi >+fi >+ > echo -n >| $RCFILE > cemit << EOF > #!/bin/nash > > mount -t proc /proc /proc >-setquiet >+#setquiet > echo Mounting proc filesystem > echo Mounting sysfs filesystem > mount -t sysfs /sys /sys >@@ -1468,6 +1631,21 @@ > done > fi > >+emitcrypto() >+{ >+ emit "echo Setting up disk encryption: $1" >+ emit "cryptsetup luksOpen $1 $2" >+} >+ >+#if [ -n "$KEYMAP" ]; then >+# emit "echo Loading keymap." >+# emit "$LOADKEYS $KEYMAP" >+#fi >+ >+for cryptdev in ${!cryptopart@} ; do >+ emitcrypto `eval echo '$'$cryptdev` >+done >+ > if [ -n "$raiddevices" ]; then > for dev in $raiddevices; do > cp -a /dev/${dev} $MNTIMAGE/dev >@@ -1475,6 +1653,10 @@ > done > fi > >+for cryptdev in ${!cryptoraid@} ; do >+ emitcrypto `eval echo '$'$cryptdev` >+done >+ > if [ -n "$vg_list" ]; then > emit "echo Scanning logical volumes" > emit "lvm vgscan --ignorelockingfailure" >@@ -1482,6 +1664,10 @@ > emit "lvm vgchange -ay --ignorelockingfailure $vg_list" > fi > >+for cryptdev in ${!cryptolv@} ; do >+ emitcrypto `eval echo '$'$cryptdev` >+done >+ > if [ -z "$noresume" -a -n "$swsuspdev" ]; then > emit "resume $swsuspdev" > fi
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 451670
: 310051