Hello community,
here is the log from the commit of package cryptsetup
checked in at Mon Aug 27 17:34:36 CEST 2007.
--------
--- cryptsetup/cryptsetup.changes 2007-06-21 16:07:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2007-08-27 16:26:34.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Aug 27 16:25:54 CEST 2007 - lnussel@suse.de
+
+- remove /var/run/keymap from previous boot to make /etc/init.d/kbd
+ work (#296409)
+
+-------------------------------------------------------------------
+Mon Aug 27 10:42:32 CEST 2007 - lnussel@suse.de
+
+- run fsck with progressbar (#304750)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cryptsetup.spec ++++++
--- /var/tmp/diff_new_pack.E17608/_old 2007-08-27 17:34:22.000000000 +0200
+++ /var/tmp/diff_new_pack.E17608/_new 2007-08-27 17:34:23.000000000 +0200
@@ -15,12 +15,12 @@
BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel
# hashalot version
%define haver 0.3
-License: BSD License and BSD-like, GNU General Public License (GPL)
+License: BSD 3-Clause, GPL v2 or later
Group: System/Base
Autoreqprov: on
Version: 1.0.5
-Release: 8
-Summary: Set up dm-crypt based encrypted block devices
+Release: 24
+Summary: Set Up dm-crypt Based Encrypted Block Devices
Source: cryptsetup-1.0.5.tar.bz2
Source1: hashalot-%haver.tar.bz2
Source50: boot.crypto
@@ -47,11 +47,11 @@
Requires: util-linux
%description
-cryptsetup is used to conveniently setup up dm-crypt based
-device-mapper targets. It can set up targets to read cryptoloop
-compatible volumes as well as LUKS formatted ones. The package
-additionally includes support for automatically setting up encrypted
-volumes at boot time via the config file /etc/crypttab
+cryptsetup is used to conveniently set up dm-crypt based device-mapper
+targets. It allows to set up targets to read cryptoloop compatible
+volumes as well as LUKS formatted ones. The package additionally
+includes support for automatically setting up encrypted volumes at boot
+time via the config file /etc/crypttab.
@@ -62,17 +62,17 @@
Ben Slusky
%package devel
-Summary: Set up dm-crypt based encrypted block devices
+Summary: Set Up dm-crypt Based Encrypted Block Devices
Group: System/Base
Requires: %name = %version
Requires: device-mapper-devel libgcrypt-devel libgpg-error-devel e2fsprogs-devel glibc-devel
%description devel
-cryptsetup is used to conveniently setup up dm-crypt based
-device-mapper targets. It can set up targets to read cryptoloop
-compatible volumes as well as LUKS formatted ones. The package
-additionally includes support for automatically setting up encrypted
-volumes at boot time via the config file /etc/crypttab
+cryptsetup is used to conveniently set up dm-crypt based device-mapper
+targets. It allows to set up targets to read cryptoloop compatible
+volumes as well as LUKS formatted ones. The package additionally
+includes support for automatically setting up encrypted volumes at boot
+time via the config file /etc/crypttab.
@@ -185,6 +185,11 @@
%{_libdir}/libcryptsetup.so
%changelog
+* Mon Aug 27 2007 - lnussel@suse.de
+- remove /var/run/keymap from previous boot to make /etc/init.d/kbd
+ work (#296409)
+* Mon Aug 27 2007 - lnussel@suse.de
+- run fsck with progressbar (#304750)
* Thu Jun 21 2007 - mkoenig@suse.de
- run udevsettle to avoid problems with busy temporary
device mapper devices [#285478]
++++++ boot.crypto ++++++
--- cryptsetup/boot.crypto 2007-06-11 09:27:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/cryptsetup/boot.crypto 2007-08-27 16:24:26.000000000 +0200
@@ -67,6 +67,9 @@
test -z "$otty" || stty "$otty" < $REDIRECT;
stty -nl -ixon ignbrk -brkint < $REDIRECT
if test -x /etc/init.d/kbd -a -n "$RUNLEVEL" ; then
+ # boot.cleanup runs after us and presence of this file prevents kbd
+ # from running
+ /bin/rm -f /var/run/keymap
/etc/init.d/kbd start
fi
}
@@ -200,8 +203,12 @@
#
# Checking the structure on the loop device
#
+ # If we use a serial console, don't use the fsck progress bar
+ #
+ FSCK_PROGRESSBAR="-V"
+ [ -x /sbin/showconsole ] && [ "`/sbin/showconsole`" = "/dev/tty1" ] && FSCK_PROGRESSBAR="-C"
if test -x /sbin/fsck.$filesys; then
- fsck -T -a -t $filesys $device
+ fsck $FSCK_PROGRESSBAR -T -a -t $filesys $device
else
true
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org