devel/mkinitrd mkinitrd-no-more-rtc.patch, NONE, 1.1 mkinitrd.spec, 1.242, 1.243

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/mkinitrd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28337

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-no-more-rtc.patch 
Log Message:
* Fri Feb  1 2008 Jeremy Katz <katzj at redhat.com> - 6.0.28-4
- Don't create the rtc nodes in the initrd anymore (#431274)


mkinitrd-no-more-rtc.patch:

--- NEW FILE mkinitrd-no-more-rtc.patch ---
diff -up mkinitrd-6.0.28/mkinitrd.cow mkinitrd-6.0.28/mkinitrd
--- mkinitrd-6.0.28/mkinitrd.cow	2008-02-01 16:54:36.000000000 -0500
+++ mkinitrd-6.0.28/mkinitrd	2008-02-01 16:54:55.000000000 -0500
@@ -1447,10 +1447,6 @@ done
 mknod $MNTIMAGE/dev/tty c 5 0
 mknod $MNTIMAGE/dev/console c 5 1
 mknod $MNTIMAGE/dev/ptmx c 5 2
-mknod $MNTIMAGE/dev/rtc c 10 135
-if [ "$(uname -m)" == "ia64" ]; then
-    mknod $MNTIMAGE/dev/efirtc c 10 136
-fi
 
 if [ -n "$raiddevices" ]; then
     inst /sbin/mdadm "$MNTIMAGE"
@@ -1494,11 +1490,7 @@ mknod /dev/systty c 4 0
 mknod /dev/tty c 5 0
 mknod /dev/console c 5 1
 mknod /dev/ptmx c 5 2
-mknod /dev/rtc c 10 135
 EOF
-if [ "$(uname -m)" == "ia64" ]; then
-    emit "mknod /dev/efirtc c 10 136"
-fi
 
 # XXX really we need to openvt too, in case someting changes the
 # color palette and then changes vts on fbcon before gettys start.


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/devel/mkinitrd/mkinitrd.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- mkinitrd.spec	20 Jan 2008 00:16:53 -0000	1.242
+++ mkinitrd.spec	1 Feb 2008 22:33:06 -0000	1.243
@@ -3,16 +3,17 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.28
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 Patch0: mkinitrd-no-more-lvm-static.patch
+Patch1: mkinitrd-no-more-rtc.patch
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
-Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
+Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
 Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol, coreutils
 Requires: mdadm 
 BuildRequires: popt-devel
@@ -67,6 +68,7 @@
 %prep
 %setup -q -n mkinitrd-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 make LIB=%{_lib}
@@ -114,6 +116,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Fri Feb  1 2008 Jeremy Katz <katzj at redhat.com> - 6.0.28-4
+- Don't create the rtc nodes in the initrd anymore (#431274)
+
 * Sat Jan 19 2008 Jeremy Katz <katzj at redhat.com> - 6.0.28-3
 - Don't call lvm.static -- it no longer exists