rpms/ris-linux/F-10 import.log, NONE, 1.1 ris-linux-0.4-basepath.patch, NONE, 1.1 ris-linux-0.4-locations.patch, NONE, 1.1 ris-linux-0.4-pidfile.patch, NONE, 1.1 ris-linux.spec, NONE, 1.1 ris-linuxd.README, NONE, 1.1 ris-linuxd.init, NONE, 1.1 ris-linuxd.sh, NONE, 1.1 ris-linuxd.smb.conf.sample, NONE, 1.1 ris-linuxd.sysconfig, NONE, 1.1 ris-linuxd.tftpd.rules, NONE, 1.1 ris-linuxd.tftpd.xinetd, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jeroen van Meeuwen]

Author: kanarip

Update of /cvs/pkgs/rpms/ris-linux/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10255/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ris-linux-0.4-basepath.patch 
	ris-linux-0.4-locations.patch ris-linux-0.4-pidfile.patch 
	ris-linux.spec ris-linuxd.README ris-linuxd.init ris-linuxd.sh 
	ris-linuxd.smb.conf.sample ris-linuxd.sysconfig 
	ris-linuxd.tftpd.rules ris-linuxd.tftpd.xinetd 
Log Message:
0.4-4


--- NEW FILE import.log ---
ris-linux-0_4-4_fc10:F-10:ris-linux-0.4-4.fc10.src.rpm:1232322698

ris-linux-0.4-basepath.patch:

--- NEW FILE ris-linux-0.4-basepath.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2007-09-28 17:29:12.000000000 +0200
+++ ris-linux-0.4/binlsrv.py	2008-09-01 20:12:43.000000000 +0200
@@ -59,7 +59,8 @@

 #############
 # Make sure there is the trailing / here
-BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+#BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+BASEPATH='/var/lib/tftpboot/winos/inf/'
 WELCOME  = 'welcome.osc'
 DUMPING  = False


ris-linux-0.4-locations.patch:

--- NEW FILE ris-linux-0.4-locations.patch ---
diff -ur ris-linux-0.4.orig/infparser.py ris-linux-0.4/infparser.py
--- ris-linux-0.4.orig/infparser.py	2008-04-27 04:35:04.000000000 +0200
+++ ris-linux-0.4/infparser.py	2008-12-05 14:04:35.000000000 +0100
@@ -17,7 +17,7 @@
 
 from codecs import utf_16_le_decode, BOM_LE, BOM_BE
 from sys import argv, exit as sys_exit
-from os.path import isfile
+import os
 from glob import glob
 from cPickle import dump
 from traceback import format_exc
@@ -293,14 +293,17 @@
         print 'Usage %s: directory_with_infs or inf file' % argv[0]
         sys_exit(-1)
 
-    if isfile(argv[1]):
+    if os.path.isfile(argv[1]):
         filelist = [ argv[1] ]
-    else:
+    elif os.path.isdir(argv[1]):
         filelist = glob(argv[1] + '/*.inf')
+    else:
+        print 'No such file or directory %s' % argv[1]
+        exit(1)
 
     devlist = {}
     for inffile in filelist:
-        if inffile.split('/').pop() not in exclude:
+        if os.path.basename(inffile) not in exclude:
             try:
                 devlist.update(scan_inf(inffile))
             except:
@@ -311,15 +314,17 @@
                 print '%s Version %s\n' % (argv[0], __version__)
                 print format_exc()
                 print '---- CUT HERE ----'
+        else:
+            print 'Excluding %s' % inffile
 
     print 'Compiled %d drivers' % len(devlist)
 
-    fd = open('devlist.cache', 'wb')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'devlist.cache'), 'wb')
     dump(devlist, fd)
     fd.close()
     print 'generated devlist.cache'
 
-    fd = open('nics.txt', 'w')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'nics.txt'), 'w')
     drvhash = {}
     for nic in devlist.items():
         entry = nic[0].split('&')

ris-linux-0.4-pidfile.patch:

--- NEW FILE ris-linux-0.4-pidfile.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2008-12-05 13:48:23.000000000 +0100
+++ ris-linux-0.4/binlsrv.py	2008-12-05 13:50:31.000000000 +0100
@@ -1024,7 +1024,7 @@
 
     ## Parse command line arguments
     shortopts = 'hdl:a:p:'
-    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=' ]
+    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=', "pid=" ]
 
     try:
         opts, args = getopt(argv[1:], shortopts, longopts)


--- NEW FILE ris-linux.spec ---
%define _tftpboot %{_var}/lib/tftpboot/
%define win_inf_dir %{_tftpboot}/winos/inf/

Name:           ris-linux
Version:        0.4
Release:        4%{?dist}
Summary:        RIS for Linux - Boot winpe from the net / Ris Windows Installation
Group:          Applications/System
License:        GPLv2+
URL:            http://oss.netfarm.it/guides/pxe.php
Source0:        http://oss.netfarm.it/guides/%{name}-%{version}.tar.gz
Source1:        ris-linuxd.init
Source2:        ris-linuxd.sysconfig
Source3:        ris-linuxd.smb.conf.sample
Source4:        ris-linuxd.README
Source5:        ris-linuxd.tftpd.rules
Source6:        ris-linuxd.tftpd.xinetd
Source7:        ris-linuxd.sh
Patch1:         ris-linux-0.4-basepath.patch
Patch2:         ris-linux-0.4-pidfile.patch
Patch3:         ris-linux-0.4-locations.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python(abi) >= 2.1

Requires:       python(abi) >= 2.1
Requires:       samba
Requires:       tftp-server

Requires(post): chkconfig, python
Requires(preun):chkconfig, initscripts
Requires(postun):initscripts

%description
Windows Remote Installation Services for Linux - Boot Windows Preinstallation
Environments from the net.

%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/%{name}/
mkdir -p %{buildroot}/%{_initrddir}/
mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}/%{_sbindir}/
install -pm 755 %{SOURCE7} %{buildroot}/%{_sbindir}/%{name}d
install -pm 755 *.py %{buildroot}/%{_datadir}/%{name}/.
install -pm 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}d
install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}d
cp -a %{SOURCE3} smb.conf.sample
cp -a %{SOURCE4} README
cp -a %{SOURCE5} tftpd.rules
cp -a %{SOURCE6} tftpd.xinetd

%clean
rm -rf %{buildroot}

%post
chkconfig --add %{name}d

if [ -d "%{win_inf_dir}" ]; then
    cd %{_datadir}/%{name}/
    python %{_datadir}/%{name}/infparser.py %{win_inf_dir}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
fi

%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name}d stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}d
fi

%files
%defattr(-,root,root,-)
%doc README contrib.txt smb.conf.sample tftpd.rules tftpd.xinetd winpe.sif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_initrddir}/%{name}d
%{_sbindir}/%{name}d
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}d

%changelog
* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 0.4-4
- Rebuild for review (#469052)

* Fri Dec 05 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-3
- Tune some of the init scripts and sysconfig settings

* Mon Nov 3 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-2
- Improve post, preun and postun scriptlets (#469052)
- Improve macro usage (#469052)
- Improve init script

* Mon Sep 1 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-1
- Initial package


--- NEW FILE ris-linuxd.README ---
For ris-linux to work, you need the following;

- Some Windows files
- A Samba server
- A TFTP server that is capable of rewriting RRQ's to
  actual filenames

For more information on how to set things up completely, let me
refer you to the following websites;

Upstream for ris-linux:
http://oss.netfarm.it/guides/pxe.php

My own little piece of documentation:
http://www.kanarip.com/courses/ClassRoomManual-WindowsInstallationsOverTheNetwork.html

Kind regards,

Jeroen van Meeuwen
-kanarip

--- NEW FILE ris-linuxd.init ---
#!/bin/sh
#
#   Startup/shutdown script for the Linux RIS daemon.
#
#   Linux chkconfig stuff:
#
#   chkconfig: - 98 10
#   description: Startup/shutdown script for the Linux RIS \
#                daemon.
#
### BEGIN INIT INFO
# Provides: ris-linuxd
# Required-Start: $syslog $local_fs
# Required-Stop: $syslog $local_fs
# Default-Stop: 0 1 6
# Short-Description: RIS for Linux
# Description: RIS for Linux
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -f /etc/sysconfig/ris-linuxd ] && source /etc/sysconfig/ris-linuxd

# Check if the directory exists
if [ -z "$BINLSRV_INFPATH" -o ! -d "$BINLSRV_INFPATH" ]; then
    echo "No such file or directory $BINLSRV_INFPATH"
    exit 1
fi

BINLSRV_DEVLISTCACHE="${BINLSRV_INFPATH}/devlist.cache"
if [ ! -f "$BINLSRV_DEVLISTCACHE" ]; then
    /usr/share/ris-linux/infparser.py $BINLSRV_INFPATH
fi

[ -z "$BINLSRV_LOGFILE" ] && LOG_OPT="-l /var/log/ris-linuxd.log" || LOG_OPT="-l $BINLSRV_LOGFILE"
[ -z "$BINLSRV_PIDFILE" ] && PID_OPT="--pid=/var/run/ris-linuxd.pid" || PID_OPT="--pid=$BINLSRV_PIDFILE"

DAEMON="ris-linuxd"

prog=ris-linuxd

start () {
    echo -n $"Starting $prog: "

    # start daemon
    daemon $DAEMON -d $BINLSRV_OPTS $LOG_OPT $PID_OPT $BINLSRV_DEVLISTCACHE

    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ris-linuxd
    return $RETVAL
}

stop () {
    # stop daemon
    echo -n $"Stopping $prog: "
    killproc $DAEMON
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ris-linuxd
    return $RETVAL
}

restart() {
    stop
    start
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case $1 in
    start)
        start
    ;;
    stop)
        stop
    ;;
    restart)
        restart
    ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
    ;;
    reload)
        restart
    ;;
    status)
        status $DAEMON
        RETVAL=$?
    ;;
    *)

    echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
    exit 3
esac

exit $RETVAL


--- NEW FILE ris-linuxd.sh ---
#!/bin/bash

python /usr/share/ris-linux/binlsrv.py $@


--- NEW FILE ris-linuxd.smb.conf.sample ---
[global]
    workgroup = OGD
    server string = L337 Samba Server
    netbios name = server
    security = share
    wins support = yes
    guest account = nobody
    null passwords = true

[REMINST]
    path = /var/lib/tftpboot
    guest ok = yes
    browseable = yes
    read only = Yes

[WINOS]
    path = /var/lib/tftpboot/winos
    guest ok = yes
    browseable = yes
    writeable = Yes


--- NEW FILE ris-linuxd.sysconfig ---
# This is the service configuration file for the
# ris-linuxd service.

# The location of the inf/ directory where all the drivers
# are
BINLSRV_INFPATH=/var/lib/tftpboot/winos/inf/

# Extra options for the daemon, like -a (address binding)
BINLSRV_OPTS=

# The log file to write to
BINLSRV_LOGFILE=/var/log/ris-linuxd.log

# The location of the PID file
BINLSRV_PIDFILE=/var/run/ris-linuxd.pid


--- NEW FILE ris-linuxd.tftpd.rules ---
# TFTP rules to:
# - Convert backslashes to forward slashes
# - Convert everything under /winos/*/* to upper-case
rg \\ / # Convert backslashes to slashes
r   (/winos/w2k/i386/)(.*)          \1\U\2
r   (/winos/wxp-x86/i386/)(.*)      \1\U\2
r   (/winos/w2k3-x86/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/amd64/)(.*)    \1\U\2


--- NEW FILE ris-linuxd.tftpd.xinetd ---
# description: The tftp server serves files using the trivial file transfer \
#   protocol.  The tftp protocol is often used to boot diskless \
#   workstations, download configuration files to network-aware printers, \
#   and to start the installation process for some operating systems.
service tftp
{
    socket_type     = dgram
    protocol        = udp
    wait            = yes
    user            = root
    server          = /usr/sbin/in.tftpd
# Use -vvv to debug rewriting rules
    server_args     = -s /tftpboot/ -m /etc/tftpd.rules -v
    disable         = no
    per_source      = 11
    cps             = 100 2
    flags           = IPv4
}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:32:36 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:51:58 -0000	1.2
@@ -0,0 +1 @@
+ris-linux-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:32:36 -0000	1.1
+++ sources	18 Jan 2009 23:51:58 -0000	1.2
@@ -0,0 +1 @@
+7315e1d02436668299f3d6aaf4efc87e  ris-linux-0.4.tar.gz