rpms/ldm/F-10 ldm-2.0.30-nbd-update.patch, NONE, 1.1 ldm.spec, 1.26, 1.27

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4309

Modified Files:
	ldm.spec 
Added Files:
	ldm-2.0.30-nbd-update.patch 
Log Message:
Fix nbd update checker


ldm-2.0.30-nbd-update.patch:

--- NEW FILE ldm-2.0.30-nbd-update.patch ---
diff -urN ldm-2.0.30.orig/rc.d/I00-nbd-checkupdate ldm-2.0.30/rc.d/I00-nbd-checkupdate
--- ldm-2.0.30.orig/rc.d/I00-nbd-checkupdate	2009-01-22 00:12:36.000000000 -0500
+++ ldm-2.0.30/rc.d/I00-nbd-checkupdate	2009-01-28 17:37:25.000000000 -0500
@@ -12,7 +12,7 @@
 
     #Connect and get the squashfs header (contains the creation date)
     nbd-client $nbd_server $nbd_port /dev/nbd9
-    NEW=$(dd if=/dev/nbd9 of=/dev/stdout bs=64 count=1 2> /dev/zero | file -)
+    NEW=$(dd if=/dev/nbd9 of=/dev/stdout bs=64 count=1 2> /dev/zero | sha1sum -)
     nbd-client -d /dev/nbd9
 else
     # It's NFS, so just exit
@@ -20,7 +20,7 @@
 fi
 
 #Get the current squashfs information
-CURRENT=$(dd if=$nbd_device of=/dev/stdout bs=64 count=1 2> /dev/zero | file -)
+CURRENT=$(dd if=$nbd_device of=/dev/stdout bs=64 count=1 2> /dev/zero | sha1sum -)
 
 #Exit if we're already running on the latest squashfs
 [ "$NEW" = "$CURRENT" ] && exit


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ldm.spec	22 Jan 2009 05:19:20 -0000	1.26
+++ ldm.spec	28 Jan 2009 22:43:11 -0000	1.27
@@ -1,14 +1,15 @@
 Name:           ldm
 Version:        2.0.30
-%define _datestamp .20081218.19
+%define _datestamp .20090127.13
 #Release:        2%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
+Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
 Source1:        k12linux-theme-%{theme_version}.tar.bz2
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -93,6 +95,9 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
+- Fix nbd update checker
+
 * Wed Jan 22 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-1
 - NBD update checker, reboots client automatically if needed