Rev openSUSE:Factory/39 Md5 5c39de8ff473104b0728672f27c49c6a 2008-12-05 14:15:07 unknown None

This commit is contained in:
OBS User unknown 2008-12-05 14:15:07 +00:00 committed by Git OBS Bridge
parent 9b4a71bf79
commit f05571d833
3 changed files with 22 additions and 16 deletions

View File

@ -1,8 +1,8 @@
Index: e2fsprogs-1.41.1/e2fsck/splash.c Index: e2fsprogs-1.41.1/e2fsck/splash.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ e2fsprogs-1.41.1/e2fsck/splash.c 2008-10-07 12:52:34.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/splash.c 2008-12-04 17:51:32.000000000 +0100
@@ -0,0 +1,101 @@ @@ -0,0 +1,100 @@
+/* +/*
+ * add support for switching the splash screen on boot + * add support for switching the splash screen on boot
+ */ + */
@ -64,7 +64,6 @@ Index: e2fsprogs-1.41.1/e2fsck/splash.c
+ if (verbose) + if (verbose)
+ printf("size = %i, written = %i\n", size, written); + printf("size = %i, written = %i\n", size, written);
+ } + }
+ (void)write(fd, "\n", 1);
+ +
+ close(fd); + close(fd);
+} +}
@ -73,14 +72,14 @@ Index: e2fsprogs-1.41.1/e2fsck/splash.c
+{ +{
+ if (verbose) + if (verbose)
+ printf("setting bootsplash silent\n"); + printf("setting bootsplash silent\n");
+ bootsplash_msg("silent", 6); + bootsplash_msg("silent\n", 7);
+} +}
+ +
+static void bootsplash_off(void) +static void bootsplash_off(void)
+{ +{
+ if (verbose) + if (verbose)
+ printf("setting bootsplash verbose\n"); + printf("setting bootsplash verbose\n");
+ bootsplash_msg("verbose", 7); + bootsplash_msg("verbose\n", 8);
+} +}
+ +
+static struct splash_ops bootsplash_ops = { +static struct splash_ops bootsplash_ops = {
@ -107,7 +106,7 @@ Index: e2fsprogs-1.41.1/e2fsck/splash.c
Index: e2fsprogs-1.41.1/e2fsck/splash.h Index: e2fsprogs-1.41.1/e2fsck/splash.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ e2fsprogs-1.41.1/e2fsck/splash.h 2008-10-07 12:50:20.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/splash.h 2008-12-04 17:46:23.000000000 +0100
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef _SPLASH_H +#ifndef _SPLASH_H
+#define _SPLASH_H +#define _SPLASH_H
@ -124,8 +123,8 @@ Index: e2fsprogs-1.41.1/e2fsck/splash.h
+ +
Index: e2fsprogs-1.41.1/e2fsck/Makefile.in Index: e2fsprogs-1.41.1/e2fsck/Makefile.in
=================================================================== ===================================================================
--- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-10-07 12:50:20.000000000 +0200 --- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-12-04 17:46:23.000000000 +0100
+++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-10-07 12:50:39.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-12-04 17:46:36.000000000 +0100
@@ -63,7 +63,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil @@ -63,7 +63,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil
OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \ OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \
pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
@ -152,7 +151,7 @@ Index: e2fsprogs-1.41.1/e2fsck/Makefile.in
Index: e2fsprogs-1.41.1/e2fsck/unix.c Index: e2fsprogs-1.41.1/e2fsck/unix.c
=================================================================== ===================================================================
--- e2fsprogs-1.41.1.orig/e2fsck/unix.c 2008-09-01 17:34:28.000000000 +0200 --- e2fsprogs-1.41.1.orig/e2fsck/unix.c 2008-09-01 17:34:28.000000000 +0200
+++ e2fsprogs-1.41.1/e2fsck/unix.c 2008-10-07 12:50:39.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/unix.c 2008-12-04 17:46:36.000000000 +0100
@@ -53,6 +53,7 @@ extern int optind; @@ -53,6 +53,7 @@ extern int optind;
#include "e2p/e2p.h" #include "e2p/e2p.h"
#include "e2fsck.h" #include "e2fsck.h"

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 4 17:52:22 CET 2008 - mkoenig@suse.de
- send bootsplash messages in one write call
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 28 12:41:54 CET 2008 - mkoenig@suse.de Tue Oct 28 12:41:54 CET 2008 - mkoenig@suse.de

View File

@ -27,7 +27,7 @@ Supplements: filesystem(ext2) filesystem(ext3)
PreReq: %install_info_prereq PreReq: %install_info_prereq
AutoReqProv: on AutoReqProv: on
Version: 1.41.1 Version: 1.41.1
Release: 11 Release: 12
Summary: Utilities for the Second Extended File System Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -472,6 +472,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/com_err.3.gz %{_mandir}/man3/com_err.3.gz
%changelog %changelog
* Thu Dec 04 2008 mkoenig@suse.de
- send bootsplash messages in one write call
* Tue Oct 28 2008 mkoenig@suse.de * Tue Oct 28 2008 mkoenig@suse.de
- fix function signature to avoid compiler warning [bnc#439129] - fix function signature to avoid compiler warning [bnc#439129]
* Tue Oct 07 2008 mkoenig@suse.de * Tue Oct 07 2008 mkoenig@suse.de
@ -534,7 +536,7 @@ rm -rf $RPM_BUILD_ROOT
- remove patches - remove patches
e2fsprogs-1.41.0-fix_messages.patch e2fsprogs-1.41.0-fix_messages.patch
e2fsprogs-1.41.0-tst_link_fix.patch e2fsprogs-1.41.0-tst_link_fix.patch
* Sat Aug 30 2008 kay.sievers@novell.com * Fri Aug 29 2008 kay.sievers@novell.com
- update libvolume_id patch to work with libvolume_id.so.1 - update libvolume_id patch to work with libvolume_id.so.1
* Thu Aug 21 2008 pth@suse.de * Thu Aug 21 2008 pth@suse.de
- Add current german messages. - Add current german messages.
@ -576,7 +578,7 @@ rm -rf $RPM_BUILD_ROOT
e2fsprogs-1.40.8-e2fsck_recovery_fix.patch e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch
e2fsprogs-1.40.8-missing_init.patch e2fsprogs-1.40.8-missing_init.patch
* Wed May 28 2008 ro@suse.de * Tue May 27 2008 ro@suse.de
- fix baselibs.conf to not generate unresolvable deps - fix baselibs.conf to not generate unresolvable deps
* Wed May 21 2008 cthiel@suse.de * Wed May 21 2008 cthiel@suse.de
- fix baselibs.conf - fix baselibs.conf
@ -1074,7 +1076,7 @@ rm -rf $RPM_BUILD_ROOT
subpackage. subpackage.
* Mon Nov 06 2000 pthomas@suse.de * Mon Nov 06 2000 pthomas@suse.de
- use _mandir and _infodir more consistently in spec file. - use _mandir and _infodir more consistently in spec file.
* Mon Nov 06 2000 ro@suse.de * Sun Nov 05 2000 ro@suse.de
- renamed packages to e2fsprogs/e2fsprogs-devel - renamed packages to e2fsprogs/e2fsprogs-devel
* Fri Jun 09 2000 kasal@suse.cz * Fri Jun 09 2000 kasal@suse.cz
- Build dynamic libraries. Partition Surprise requires them. - Build dynamic libraries. Partition Surprise requires them.
@ -1087,7 +1089,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 22 2000 garloff@suse.de * Tue Feb 22 2000 garloff@suse.de
- Bugfix for the change ... - Bugfix for the change ...
- ... and change version no of fsck to 1.18a to reflect the change. - ... and change version no of fsck to 1.18a to reflect the change.
* Mon Feb 21 2000 garloff@suse.de * Sun Feb 20 2000 garloff@suse.de
- Patch to be more clever WRT to basenames (used to find out wheter - Patch to be more clever WRT to basenames (used to find out wheter
a fsck for this device is already running). a fsck for this device is already running).
- Give better message in case fsck fails, to tell the user what to - Give better message in case fsck fails, to tell the user what to
@ -1105,7 +1107,7 @@ rm -rf $RPM_BUILD_ROOT
-fixed coredump in e2fsck -fixed coredump in e2fsck
* Fri Oct 29 1999 ro@suse.de * Fri Oct 29 1999 ro@suse.de
-e2fsprogs: 1.17 vital bugfix in e2fsck -e2fsprogs: 1.17 vital bugfix in e2fsck
* Mon Oct 25 1999 ro@suse.de * Sun Oct 24 1999 ro@suse.de
- e2fsprogs: update to 1.16, sparse_super is default on when - e2fsprogs: update to 1.16, sparse_super is default on when
called on a > 2.2 kernel, can be overridden with -O none called on a > 2.2 kernel, can be overridden with -O none
* Fri Oct 15 1999 garloff@suse.de * Fri Oct 15 1999 garloff@suse.de
@ -1131,7 +1133,7 @@ rm -rf $RPM_BUILD_ROOT
- update to 1.12 - update to 1.12
* Sat Apr 26 1997 florian@suse.de * Sat Apr 26 1997 florian@suse.de
- update to new version 1.10 - update to new version 1.10
* Mon Apr 14 1997 florian@suse.de * Sun Apr 13 1997 florian@suse.de
- update to new version 1.08 - update to new version 1.08
- do not include ext2 libs and include files as they are only used by dump - do not include ext2 libs and include files as they are only used by dump
* Thu Jan 02 1997 florian@suse.de * Thu Jan 02 1997 florian@suse.de