Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 257556 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-4 / +4 lines)
Line  Link Here
0
-- 1.0.6-r2-dm-crypt-start.sh  2008-10-05 23:01:33.000000000 +0200
0
++ /lib/rcscripts/addons/dm-crypt-start.sh     2009-03-04 12:15:13.000000000 +0100
Lines 161-167 Link Here
161
                       ret="$?"
161
                       ret="$?"
162
                       eend "${ret}" "failure running cryptsetup"
162
                       eend "${ret}" "failure running cryptsetup"
163
               else
163
               else
164
                       cryptsetup ${options} ${arg1} ${arg2} ${arg3}
164
                       cryptsetup ${options} ${arg1} ${arg2} ${arg3} < /dev/tty0
165
                       ret="$?"
165
                       ret="$?"
166
                       eend "${ret}" "failure running cryptsetup"
166
                       eend "${ret}" "failure running cryptsetup"
167
               fi
167
               fi
Lines 255-261 Link Here
255
       # Fix for baselayout-1.12.10 (bug 174256)
255
       # Fix for baselayout-1.12.10 (bug 174256)
256
       [ -z ${SVCNAME} ] && SVCNAME="${myservice}"
256
       [ -z ${SVCNAME} ] && SVCNAME="${myservice}"
257
       while read targetline ; do
257
       while read -u 4 targetline ; do
258
               # skip comments and blank lines
258
               # skip comments and blank lines
259
               [[ ${targetline}\# == \#* ]] && continue
259
               [[ ${targetline}\# == \#* ]] && continue
Lines 283-289 Link Here
283
               # Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
283
               # Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
284
               eval "${targetline}"
284
               eval "${targetline}"
285
       done < /etc/conf.d/dmcrypt
285
       done 4< /etc/conf.d/dmcrypt
286
       # If we have a target queued up, then execute it
286
       # If we have a target queued up, then execute it
287
       dm_crypt_execute_${SVCNAME}
287
       dm_crypt_execute_${SVCNAME}

Return to bug 257556