This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
8d060f5dee
commit
43e08ea55a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9780875034b5037cbcfde267472e85d5d7d2dd86f0517805001f0868e2827a07
|
||||
size 13290
|
||||
3
boot.crypto-0_200903031625.tar.bz2
Normal file
3
boot.crypto-0_200903031625.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a5261f0d9fbb4bd3ba8cebbb50acf34e057494f33dd3cd7fdafb58478fb9504c
|
||||
size 14275
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 3 16:27:23 CET 2009 - lnussel@suse.de
|
||||
|
||||
- fix boot.crypto doesn't care on tries flag in crypttab (bnc#480741)
|
||||
- mkinitrd scripts now included in boot.crypto git
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 26 15:34:06 CET 2009 - mhopf@suse.de
|
||||
|
||||
|
||||
@ -19,25 +19,23 @@
|
||||
|
||||
|
||||
Name: cryptsetup
|
||||
Url: http://luks.endorphin.org/dm-crypt
|
||||
Url: http://code.google.com/p/cryptsetup/
|
||||
BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel
|
||||
BuildRequires: libselinux-devel
|
||||
# hashalot version
|
||||
%define haver 0.3
|
||||
# boot.crypto version
|
||||
%define bcver 0_200811031303
|
||||
%define bcver 0_200903031625
|
||||
License: BSD 3-Clause; GPL v2 only; GPL v2 or later
|
||||
Group: System/Base
|
||||
AutoReqProv: on
|
||||
Version: 1.0.5_SVNr46
|
||||
Release: 60
|
||||
Release: 61
|
||||
Summary: Set Up dm-crypt Based Encrypted Block Devices
|
||||
Source: cryptsetup-%{version}.tar.bz2
|
||||
Source1: hashalot-%haver.tar.bz2
|
||||
# http://www.suse.de/~lnussel/boot.crypto.git
|
||||
Source2: boot.crypto-%{bcver}.tar.bz2
|
||||
Source3: mkinitrd-setup.sh
|
||||
Source4: mkinitrd-boot.sh
|
||||
# use this to create the tarball from svn
|
||||
Source99: cryptsetup-mktar
|
||||
Patch1: cryptsetup-1.0.5-udevadm.patch
|
||||
@ -160,10 +158,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
popd
|
||||
# remove unwanted symlinks
|
||||
rm -f $RPM_BUILD_ROOT/sbin/{rmd160,sha256,sha384,sha512}
|
||||
# mkinitrd scriptlets
|
||||
install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
|
||||
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-luks.sh
|
||||
install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-luks.sh
|
||||
#
|
||||
# boot.crypto
|
||||
make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT
|
||||
@ -227,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/libcryptsetup.so
|
||||
|
||||
%changelog
|
||||
* Tue Mar 03 2009 lnussel@suse.de
|
||||
- fix boot.crypto doesn't care on tries flag in crypttab (bnc#480741)
|
||||
- mkinitrd scripts now included in boot.crypto git
|
||||
* Thu Feb 26 2009 mhopf@suse.de
|
||||
- Fix segfault with oversized hashes (bnc #476290).
|
||||
* Wed Feb 25 2009 jsmeix@suse.de
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
#!/bin/bash
|
||||
#%stage: crypto
|
||||
#%programs: /sbin/cryptsetup
|
||||
#%udevmodules: dm-crypt $cryptmodules
|
||||
#%if: "$root_luks" -o "$luks"
|
||||
#
|
||||
##### LUKS (comfortable disk encryption)
|
||||
##
|
||||
## This activates a LUKS encrypted partition.
|
||||
##
|
||||
## Command line parameters
|
||||
## -----------------------
|
||||
##
|
||||
## luks a list of luks devices (e.g. xxx)
|
||||
## luks_xxx the luks device (e.g. /dev/sda)
|
||||
##
|
||||
|
||||
case $luks_lang in
|
||||
en*)
|
||||
# We only support english keyboard layout
|
||||
;;
|
||||
*)
|
||||
echo "Only english keyboard layout supported."
|
||||
echo "Please ensure that the password is typed correctly."
|
||||
;;
|
||||
esac
|
||||
|
||||
echo
|
||||
echo -n "Enter LUKS Passphrase:"
|
||||
read -s pass
|
||||
echo
|
||||
|
||||
for curluks in $luks; do
|
||||
echo $pass | /sbin/cryptsetup luksOpen $(eval echo \$luks_${curluks}) $curluks || \
|
||||
/sbin/cryptsetup luksOpen $(eval echo \$luks_${curluks}) $curluks
|
||||
done
|
||||
|
||||
pass='xxxxxxxxxxxxxxxxxxxx'
|
||||
unset pass
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
#%stage: crypto
|
||||
#
|
||||
|
||||
if [ -x /sbin/cryptsetup -a -x /sbin/dmsetup ] ; then
|
||||
luks_blockdev=
|
||||
luks_add_device="$blockdev $luks_add_device"
|
||||
# bd holds the device we see the decrypted LUKS partition as
|
||||
for bd in $luks_add_device ; do
|
||||
luks_name=
|
||||
update_blockdev $bd
|
||||
luks_blockmajor=$blockmajor
|
||||
luks_blockminor=$blockminor
|
||||
# luksbd holds the device, LUKS is running on
|
||||
for luksbd in $(dm_resolvedeps $bd); do # should only be one for luks
|
||||
[ $? -eq 0 ] || return 1
|
||||
update_blockdev $luksbd
|
||||
if /sbin/cryptsetup isLuks $luksbd 2>/dev/null; then
|
||||
root_luks=1
|
||||
tmp_root_dm=1 # luks needs dm
|
||||
|
||||
luks_name="$(dmsetup -c info -o name --noheadings -j $luks_blockmajor -m $luks_blockminor)"
|
||||
eval luks_${luks_name}=$(beautify_blockdev ${luksbd})
|
||||
save_var luks_${luks_name}
|
||||
|
||||
luks="$luks $luks_name"
|
||||
luks_blockdev="$luks_blockdev $luksbd"
|
||||
fi
|
||||
done
|
||||
if [ ! "$luks_name" ]; then # no luks found
|
||||
luks_blockdev="$luks_blockdev $bd"
|
||||
fi
|
||||
done
|
||||
blockdev="$luks_blockdev"
|
||||
fi
|
||||
|
||||
if [ "$root_luks" ]; then
|
||||
case $LANG in
|
||||
en*)
|
||||
# We only support english keyboard layout currently
|
||||
;;
|
||||
*)
|
||||
echo "Only english keyboard layout supported."
|
||||
echo "Please ensure that the password is typed correctly."
|
||||
luks_lang=$LANG
|
||||
;;
|
||||
esac
|
||||
for m in $(cat /proc/crypto | grep module | sed 's/^module .*: \(.*\)$/\1/'); do
|
||||
cryptmodules="$cryptmodules $m"
|
||||
done
|
||||
fi
|
||||
|
||||
save_var root_luks # do we have luks?
|
||||
save_var luks # which names do the luks devices have?
|
||||
save_var cryptmodules # required kernel modules for crypto setup
|
||||
save_var luks_lang # original language settings
|
||||
|
||||
Loading…
Reference in New Issue
Block a user