OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=4

boot.crypto

@@ -67,6 +67,9 @@ redirect ()
     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 @@ run_fsck()
     #
     # 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

cryptsetup.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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)
+
 -------------------------------------------------------------------
 Thu Jun 21 16:06:53 CEST 2007 - mkoenig@suse.de
 

cryptsetup.spec

@@ -15,12 +15,12 @@ URL:            http://luks.endorphin.org/dm-crypt
 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
+Release:        24
-Summary:        Set up dm-crypt based encrypted block devices
+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 @@ Obsoletes:      util-linux-crypto <= 2.12r
 Requires:       util-linux
 
 %description
-cryptsetup is used to conveniently setup up dm-crypt based
+cryptsetup is used to conveniently set up dm-crypt based device-mapper
-device-mapper targets. It can set up targets to read cryptoloop
+targets. It allows to set up targets to read cryptoloop compatible
-compatible volumes as well as LUKS formatted ones. The package
+volumes as well as LUKS formatted ones. The package additionally
-additionally includes support for automatically setting up encrypted
+includes support for automatically setting up encrypted volumes at boot
-volumes at boot time via the config file /etc/crypttab
+time via the config file /etc/crypttab.
 
 
 
@@ -62,17 +62,17 @@ Authors:
     Ben Slusky <sluskyb@paranoiacs.org>
 
 %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
+cryptsetup is used to conveniently set up dm-crypt based device-mapper
-device-mapper targets. It can set up targets to read cryptoloop
+targets. It allows to set up targets to read cryptoloop compatible
-compatible volumes as well as LUKS formatted ones. The package
+volumes as well as LUKS formatted ones. The package additionally
-additionally includes support for automatically setting up encrypted
+includes support for automatically setting up encrypted volumes at boot
-volumes at boot time via the config file /etc/crypttab
+time via the config file /etc/crypttab.
 
 
 
@@ -185,6 +185,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_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]