[ltsp/el6] - Added README and SERVERIP config var for ltsp-server.conf - Added modules for nbd.ko for nbdro
Joshua Trimm
enslaver at fedoraproject.org
Sun Mar 24 01:13:43 UTC 2013
commit 26bc5967d20ba9b05d3ad3148400fecc61d861c3
Author: Joshua Trimm <enslaver at enslaver.com>
Date: Sat Mar 23 19:11:08 2013 -0500
- Added README and SERVERIP config var for ltsp-server.conf
- Added modules for nbd.ko for nbdroot support in client, changed the way mock works.
- Updated to use easybashgui to create dialogs, modified name to avoid file
conflicts. Also fixed progress bar issues.
ltsp.spec | 51 ++++++++++++++++++++++++++++++++++++++++-----------
sources | 2 +-
2 files changed, 41 insertions(+), 12 deletions(-)
---
diff --git a/ltsp.spec b/ltsp.spec
index f4f6cba..7bf2a80 100644
--- a/ltsp.spec
+++ b/ltsp.spec
@@ -1,8 +1,8 @@
Name: ltsp
Version: 5.4.5
-%define _datestamp .20130320.04
-#Release: 1%{_datestamp}%{?dist}
-Release: 4%{?dist}
+%define _datestamp .20130323.17
+#Release: 5%{_datestamp}%{?dist}
+Release: 8%{?dist}
Summary: Linux Terminal Server Project Server and Client
Group: User Interface/Desktops
@@ -23,7 +23,7 @@ BuildRequires: libX11-devel
# Need pxelinux.0 from syslinux if server is x86
BuildRequires: syslinux
%endif
-BuildRequires: tftp-server
+Requires: tftp-server
%define _tftpdir /var/lib/tftpboot
%define with_serverpkg 1
%if 0%{?fedora} == 11
@@ -47,6 +47,10 @@ Requires: fuse-unionfs
Requires: lsb
Requires(post): initscripts
BuildRequires: glib2-devel
+%{!?kernel: %define kernel %(uname -r)}
+%define kversion %(echo "%{kernel}" | sed -e 's|-.*||')
+%define krelease %(echo "%{kernel}" | sed -e 's|.*-||')
+%define moduledir /lib/modules/%{kversion}-%{krelease}/extra
%description client
LTSP client package
@@ -64,13 +68,12 @@ Requires: dhcp
Requires: gettext
Requires: xinetd
Requires: bridge-utils
-Requires: nbd
Requires: ldm >= 2.2.11
Requires: ldminfod >= 2.2.11
Requires: lsb
Requires: fuse fuse-libs fuse-devel
Requires: xorg-x11-xdm
-Requires: cdialog
+Requires: dialog
#Requires: dnsmasq
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -119,7 +122,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{base_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/dracut/
@@ -136,6 +139,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/
%if %{with_serverpkg}
# server
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/kickstart/
@@ -144,6 +148,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mock/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_lib}/modules/`uname -r`/extra/
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/ltspbashgui/
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/
@@ -154,7 +160,6 @@ 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/
mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/
@@ -207,6 +212,12 @@ cp -av client/share/ltsp/xinitrc.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
cp -av client/RHEL/template/* $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
cp -av client/share/ltsp/init-ltsp.d $RPM_BUILD_ROOT%{_datadir}/ltsp/
cp -av client/RHEL/share/ltsp/init-ltsp.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/init-ltsp.d
+mkdir -p $RPM_BUILD_ROOT%{moduledir}
+%ifarch %{ix86} x86_64
+cp -av client/RHEL/nbd/nbd.ko.x86_64 $RPM_BUILD_ROOT%{moduledir}/nbd.ko
+%else
+cp -av client/RHEL/nbd/nbd.ko.i386 $RPM_BUILD_ROOT%{moduledir}/nbd.ko
+%endif
touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
# We need these files in both in client and server, but it ends up in the same place.
@@ -217,7 +228,7 @@ install -m 0644 server/RHEL/configs/dracut/sysconfig-dracut $RPM_BUILD_ROOT%{_sy
%if %{with_serverpkg}
### server install
-install -m 0755 client/localapps/ltsp-localapps $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 client/localapps/ltsp-localapps $RPM_BUILD_ROOT/%{_bindir}
install -m 0755 server/nbdrootd $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 server/nbdswapd $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 server/ltsp-update-sshkeys $RPM_BUILD_ROOT%{_sbindir}
@@ -226,7 +237,9 @@ cp -prL server/share/ltsp/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/
install -m 0755 server/ltsp-update-kernels $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 server/ltsp-update-image $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 server/ltsp-chroot $RPM_BUILD_ROOT%{_sbindir}
-#install -m 0755 server/RHEL/scripts/chroot-creator $RPM_BUILD_ROOT%{_sbindir}
+install -m 0755 server/RHEL/scripts/ltspbashgui $RPM_BUILD_ROOT/%{_bindir}
+install -m 0755 server/RHEL/scripts/ltspbashlib $RPM_BUILD_ROOT/%{_libexecdir}/ltspbashgui/
+install -m 0755 server/RHEL/scripts/ltspbashgui_7.0.0.lib $RPM_BUILD_ROOT/%{_libexecdir}/ltspbashgui/
install -m 0755 server/RHEL/scripts/ltsp-server-tweaks $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 server/ltsp-swapfile-delete $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
install -m 0644 common/ltsp-common-functions $RPM_BUILD_ROOT/%{_datadir}/ltsp/ltsp-server-common-functions
@@ -269,6 +282,11 @@ install -m 0644 server/RHEL/configs/ltsp-build-client.conf $RPM_BUILD_ROOT%{_sys
install -m 0644 server/RHEL/configs/ltsp-server.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/
install -m 0644 server/RHEL/configs/fat-client-groups $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/
+#docs
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_mandir}/man5 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -av server/doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -av server/doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -av server/doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
for arch in i386 x86_64 ppc ppc64; do
install -m 0644 server/RHEL/configs/lts.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/$arch/
@@ -330,11 +348,14 @@ rm -rf $RPM_BUILD_ROOT
if [ $1 -gt 1 ]; then
/usr/share/ltsp/ltsp-chroot-setup
fi
+depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null
/sbin/chkconfig --add ltsp-core
%if %{with_serverpkg}
%post server
/sbin/chkconfig --add ltsp-dhcpd
+/sbin/chkconfig ltsp-dhcpd on
+[ ! `chkconfig --list iptables|grep on` ] && echo You are running iptables, you may want to run ltsp-server-tweaks to allow clients to connect.
#/sbin/chkconfig dnsmasq on
# During upgrades fix up config files
@@ -414,6 +435,7 @@ fi
%{_sysconfdir}/dracut.conf.d/ltsp-dracut.conf
%dir %{_localstatedir}/cache/ltsp-localapps/
%dir %{_localstatedir}/cache/ltsp/
+%{moduledir}/nbd.ko
# readonly-root related files
%{_localstatedir}/lib/random-seed
@@ -422,7 +444,7 @@ fi
%if %{with_serverpkg}
%files server
%defattr(-,root,root,-)
-%doc COPYING TODO server/doc/Upgrading_4.2 server/doc/plugins server/doc/workstation server/doc/swap server/doc/QuickInstall server/doc/FAQ server/doc/*.8
+%doc COPYING TODO server/doc/Upgrading_4.2 server/doc/plugins server/doc/workstation server/doc/swap server/doc/QuickInstall server/doc/FAQ server/doc/*.1 server/doc/*.5 server/doc/*.8
%dir %{_localstatedir}/lib/ltsp/
%attr(700,nobody,nobody) %dir %{_localstatedir}/lib/ltsp/swapfiles/
%dir %{_tftpdir}/
@@ -444,6 +466,13 @@ fi
%dir /opt/ltsp
%dir /opt/ltsp/images
+%dir %{_libexecdir}/ltspbashgui/
+%{_libexecdir}/ltspbashgui/ltspbashlib
+%{_libexecdir}/ltspbashgui/ltspbashgui_7.0.0.lib
+%{_bindir}/ltspbashgui
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
%{_sbindir}/ltsp-build-client
%{_datadir}/ltsp/plugins/
%{_sbindir}/ltsp-prepare-kernel
diff --git a/sources b/sources
index 7fa8080..4e49699 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3700ad6c243850d77ff0fbd486bef609 ltsp-5.4.5.tar.bz2
+a1acc94c433296fc6ec3787ff1a67bbb ltsp-5.4.5.tar.bz2
More information about the scm-commits
mailing list