diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-01-16 01:47:12 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-01-16 01:47:12 +0100 |
| commit | b56020daf608422b109155794cbffd6302b594e6 (patch) | |
| tree | 8f389eb015d6d746ab360253c456ee5c138e7990 /defaults | |
| parent | Bring back --with-lvm1=internal and --with-snapshots=internal (appears more s... (diff) | |
| download | genkernel-b56020daf608422b109155794cbffd6302b594e6.tar.gz genkernel-b56020daf608422b109155794cbffd6302b594e6.tar.bz2 genkernel-b56020daf608422b109155794cbffd6302b594e6.zip | |
Propagate fix for ROOT_DEV from bug #303531 to RESUME_DEV and REAL_LUKS
Diffstat (limited to 'defaults')
| -rwxr-xr-x | defaults/initrd.scripts | 2 | ||||
| -rwxr-xr-x | defaults/linuxrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 2d5fb5d..d74ed84 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -777,7 +777,7 @@ openLUKS() { fi if [ "${retval}" -ne 0 ]; then - REAL_LUKS=`blkid -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null` + REAL_LUKS=`blkid -l -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null` retval=$? fi diff --git a/defaults/linuxrc b/defaults/linuxrc index 17a2f47..6ce8349 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -338,7 +338,7 @@ then fi if [ ${retval} -ne 0 ]; then - RESUME_DEV=`blkid -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null` + RESUME_DEV=`blkid -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null` retval=$? fi |