rpms/ltsp/F-9 ltsp.spec,1.25,1.26

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12646

Modified Files:
	ltsp.spec 
Log Message:
- Prep for NBD root boot (requires mkinitrd changes)
- Fix nbdrootd and nbdswapd launch path
- nbdswap detects an unused nbd device before using it
- nbdrootd and nbdswapd uses KEEPALIVE, should die after default 7200 seconds
- ltsp-update-image script to create NBD root images in /opt/ltsp/images
- Cleanup old netboot images from chroot during kernel upgrade
- xrexecd waits for xatom changes instead of polling
- Disable nbdswap if server is running Live
- Initial x86_64 client chroot support (John Ellson)
- Fix chroot-creator so NBI and ELF images are created during client install.
- Use wraplinux to create NBI image.



Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ltsp.spec	13 Aug 2008 18:12:29 -0000	1.25
+++ ltsp.spec	24 Aug 2008 17:28:46 -0000	1.26
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.18
-%define _datestamp .20080813.12
-#Release:        1%{_datestamp}%{?dist}
+Version:        5.1.20
+%define _datestamp .20080824.12
+#Release:        8%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -115,6 +115,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
 %endif
 
 # server
@@ -134,6 +137,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
 mkdir -p $RPM_BUILD_ROOT/opt/ltsp
+mkdir -p $RPM_BUILD_ROOT/opt/ltsp/images
 
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/
@@ -161,6 +165,7 @@
 install -m 0644 client/screen-x-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/jetpipe/jetpipe $RPM_BUILD_ROOT/%{_sbindir}
 install -m 0644 client/jetpipe/jetpipe.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
+install -m 0755 client/scripts/k12linux/ltsp-rewrap-latest-kernel $RPM_BUILD_ROOT/%{_sbindir}
 install -m 0700 client/chroot-setup/ltsp-chroot-setup $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/xrexecd/ldm-rc.d/S01-localapps $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 cp -av client/chroot-setup/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
@@ -168,6 +173,12 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
 %endif
+# We need these files in both in client and server, but it ends up in the same place.
+# client copy is to ensure that it gets upgraded with ltsp-client package upgrades.
+# server copy is so chroot-creator can copy it into the chroot before mkinitrd runs the first time.
+install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mkinitrd
+install -m 0755 server/configs/k12linux/mkinitrd/ltsp-postinst.d $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/ltsp
+install -m 0755 server/configs/k12linux/mkinitrd/ltsp-prerm.d    $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/ltsp
 
 ### server install
 install -m 0755 client/xrexecd/xrexec  $RPM_BUILD_ROOT/%{_bindir}/
@@ -180,6 +191,7 @@
 cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/
 %endif
 install -m 0755 server/ltsp-update-kernels $RPM_BUILD_ROOT%{_sbindir}
+install -m 0755 server/scripts/k12linux/ltsp-update-image $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/scripts/k12linux/chroot-creator $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/ltsp-swapfile-delete $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
 install -m 0644 server/xinetd.d/nbdrootd $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
@@ -200,6 +212,7 @@
 cp -p server/scripts/k12linux/scripts.d/*   $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
 cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/
 cp -a server/configs/k12linux/live-config/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
+install -m 0644 server/scripts/k12linux/mksquashfs-exclude $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 
 # configs
 install -m 0644 server/configs/k12linux/ifcfg-ltspbr0 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
@@ -242,6 +255,25 @@
 %post server
 /sbin/chkconfig --add ltsp-dhcpd
 
+# If initial install, start the ltspbr0 bridge
+# it would come up automatically in the next reboot.
+if [ "$1" == "1" ]; then
+    ifup ltspbr0 > /dev/null 2>&1 || : 
+fi
+
+# During upgrades fix up config files
+if [ $1 -gt 1 ]; then
+    grep -q "flags" /etc/xinetd.d/nbdrootd
+    [ $? -eq 1 ] && sed -i -e '/type  /a \\tflags\t\t= KEEPALIVE' /etc/xinetd.d/nbdrootd
+    grep -q "flags" /etc/xinetd.d/nbdswapd
+    [ $? -eq 1 ] && sed -i -e '/type  /a \\tflags\t\t= KEEPALIVE' /etc/xinetd.d/nbdswapd
+    # Add server_args if missing from nbdrootd
+    grep -q "server_args" /etc/xinetd.d/nbdrootd
+    [ $? -eq 1 ] && sed -i -e '/server  /a \\tserver_args\t= /opt/ltsp/images/i386.img' /etc/xinetd.d/nbdrootd
+    # Restart xinetd
+    /sbin/service xinetd condrestart > /dev/null 2>&1
+fi
+
 %preun server
 if [ $1 = 0 ]; then
     /sbin/service ltsp-dhcpd status >/dev/null 2>&1
@@ -263,7 +295,7 @@
 %defattr(-,root,root,-)
 %{_mandir}/man1/getltscfg.1.gz
 %{_bindir}/getltscfg
-%{_bindir}/xrexecd
+%{_bindir}/xatomwait
 %{_sbindir}/ltsp-client-launch
 %dir %{_datadir}/ltsp
 %{_datadir}/ltsp/configure-x.sh
@@ -275,10 +307,14 @@
 %{_datadir}/ltsp/screen.d/
 %{_datadir}/ldm/rc.d/
 %{_sbindir}/jetpipe
+%{_sbindir}/ltsp-rewrap-latest-kernel
 %{_mandir}/man8/jetpipe.8.gz
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
 %{_bindir}/xrexecd.sh
+%{_sysconfdir}/sysconfig/mkinitrd
+%{_sysconfdir}/kernel/postinst.d/ltsp
+%{_sysconfdir}/kernel/prerm.d/ltsp
 
 # readonly-root related files
 %{_sysconfdir}/rwtab.d/*
@@ -309,6 +345,7 @@
 %{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
+%dir /opt/ltsp/images
 
 %if 0%{?fedora}
 %{_sbindir}/ltsp-build-client
@@ -317,9 +354,11 @@
 %{_sbindir}/ltsp-prepare-kernel
 %{_sbindir}/ltsp-server-initialize
 %{_sbindir}/ltsp-update-kernels
+%{_sbindir}/ltsp-update-image
 %{_datadir}/ltsp/scripts/
 %{_datadir}/ltsp/scripts.d/
 %{_datadir}/ltsp/chkconfig.d/
+%{_datadir}/ltsp/mksquashfs-exclude
 %{_sbindir}/ldminfod
 %{_sbindir}/ltsp-update-sshkeys
 %{_sbindir}/nbdrootd
@@ -343,6 +382,9 @@
 %dir %{_sysconfdir}/ltsp/kickstart/
 %dir %{_sysconfdir}/ltsp/kickstart/Fedora/
 %{_sysconfdir}/ltsp/kickstart/Fedora/common.ks
+%{_sysconfdir}/ltsp/kickstart/Fedora/common-i386.ks
+%{_sysconfdir}/ltsp/kickstart/Fedora/common-i686.ks
+%{_sysconfdir}/ltsp/kickstart/Fedora/common-x86_64.ks
 %dir %{_sysconfdir}/ltsp/kickstart/Fedora/8/
 %dir %{_sysconfdir}/ltsp/kickstart/Fedora/9/
 %{_sysconfdir}/ltsp/kickstart/*/*/*.ks
@@ -361,6 +403,21 @@
 %endif
 
 %changelog
+* Sun Aug 24 2008 Warren Togami <wtogami at redhat.com> - 5.1.20-1
+- Prep for NBD root boot (requires mkinitrd changes)
+- Fix nbdrootd and nbdswapd launch path
+- nbdswap detects an unused nbd device before using it
+- nbdrootd and nbdswapd uses KEEPALIVE, should die after default 7200 seconds
+- ltsp-update-image script to create NBD root images in /opt/ltsp/images
+- Cleanup old netboot images from chroot during kernel upgrade
+- xrexecd waits for xatom changes instead of polling
+- Disable nbdswap if server is running Live
+
+* Thu Aug 14 2008 Warren Togami <wtogami at redhat.com> - 5.1.19-1
+- Initial x86_64 client chroot support (John Ellson)
+- Fix chroot-creator so NBI and ELF images are created during client install.
+- Use wraplinux to create NBI image.
+
 * Wed Aug 13 2008 Warren Togami <wtogami at redhat.com> - 5.1.18-1
 - cleanups to localapps scripts
 - moved localapp stuff from ldm into this package