rpms/hercules/devel generic.prm, NONE, 1.1 README-rpm, 1.1, 1.2 hercules.spec, 1.20, 1.21

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30606

Modified Files:
	README-rpm hercules.spec 
Added Files:
	generic.prm 
Log Message:
* Thu Apr 10 2008 Jarod Wilson <jwilson at redhat.com> 3.05-5
- Point to new project URL
- Add a template generic.prm matching provided hercules.cnf



--- NEW FILE generic.prm ---
root=/dev/ram0 ro ip=off ramdisk_size=40000
DASD=0120
NETTYPE=ctc
SUBCHANNELS=0.0.0600,0.0.0601
IPADDR=192.168.200.3
NETWORK=192.168.200.0
GATEWAY=192.168.200.4
#DNS=ip.of.dns.1:ip.of.dns.2
#SEARCHDNS=example.com:sample.com
#HOSTNAME=s390.localdomain
#vnc


Index: README-rpm
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/README-rpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README-rpm	19 Jun 2007 15:05:25 -0000	1.1
+++ README-rpm	10 Apr 2008 15:21:47 -0000	1.2
@@ -11,6 +11,7 @@
   - ESA/390 for s390
   - ESAME for s390x
 - Create HD image : dasdinit -z /var/lib/hercules/linux.120 3390-3 lin000
+  (substitute -lpf or -0 for -z if you wish to use a non-compressed image)
 - Mount the first installation CD
 - Run : hercules-run
 - Start installation : ipl /media/cdrom/generic.ins
@@ -41,6 +42,13 @@
 Enter DASD range (e.g. 200-203   or  200,201,202,203):
 .000-200
 
+--
+Alternatively, you can copy initrd.img and kernel.img from your installation
+media into /etc/hercules and start the installation via 'ipl 00c', which uses
+the virtual punch card defined in hercules.cnf and auto-fills in most of the
+networking options for you, based on the contents of /etc/hercules/generic.prm.
+--
+
 Use "telnet 192.168.200.3" and log in as "root" with no password (press enter).
 The installation will start automatically.
 


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hercules.spec	10 Apr 2008 14:06:08 -0000	1.20
+++ hercules.spec	10 Apr 2008 15:21:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.05
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -9,6 +9,7 @@
 Source1: hercules.cnf
 Source2: hercules-run
 Source3: README-rpm
+Source4: generic.prm
 Patch0: hercules-3.05-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
@@ -52,6 +53,8 @@
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/hercules
 %{__cat} %{SOURCE1} | %{__sed} 's|@LIBDIR@|%{_libdir}|g' > \
     %{buildroot}%{_sysconfdir}/hercules/hercules.cnf
+# Install generic.prm with parameters matching hercules.cnf
+%{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/hercules/
 # Install our wrapper script (takes care of tunnel networking)
 %{__install} -D -p -m 0755 %{SOURCE2} \
     %{buildroot}%{_sbindir}/hercules-run
@@ -70,6 +73,7 @@
 %doc CHANGES README* RELEASE* hercules.cnf html/ util/
 %dir %{_sysconfdir}/hercules/
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm
 %{_bindir}/*
 %{_sbindir}/*
 %{_datadir}/hercules/
@@ -82,6 +86,10 @@
 
 
 %changelog
+* Thu Apr 10 2008 Jarod Wilson <jwilson at redhat.com> 3.05-5
+- Point to new project URL
+- Add a template generic.prm matching provided hercules.cnf
+
 * Sun Feb  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.05-4
 - Fix loading of plugins (bz 430805)