From d6c4eb0b12b6f09e27bd2463c0dfd291fd518121 Mon Sep 17 00:00:00 2001 From: memotype Date: Fri, 27 Jun 2008 15:25:42 +0000 Subject: [PATCH] added autoyast file for installing sles to a xen host git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1803 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- build-debs | 2 +- perl-xCAT/debian/changelog | 6 + perl-xCAT/debian/files | 1 - xCAT-client/debian/changelog | 6 + xCAT-client/debian/control | 2 +- xCAT-client/debian/files | 2 - xCAT-server/lib/xcat/plugins/copycds.pm | 10 +- xCAT-server/share/xcat/install/sles/xen.tmpl | 143 +++++++++++++++++++ 8 files changed, 163 insertions(+), 9 deletions(-) create mode 100644 xCAT-server/share/xcat/install/sles/xen.tmpl diff --git a/build-debs b/build-debs index 9ac9b9c41..cfdac36cf 100755 --- a/build-debs +++ b/build-debs @@ -2,7 +2,7 @@ # Accepts directories to build packages from on the commandline, but defaults # to building: perl-xCAT-2.0 and xCAT-client-2.0 -packages="${@:-perl-xCAT-2.0 xCAT-client-2.0}" +packages="${@:-perl-xCAT xCAT-client}" for pkg in $packages; do mkdir -p debs/$pkg diff --git a/perl-xCAT/debian/changelog b/perl-xCAT/debian/changelog index 3aeca09fd..57876297f 100644 --- a/perl-xCAT/debian/changelog +++ b/perl-xCAT/debian/changelog @@ -1,3 +1,9 @@ +perl-xcat (2.0-2) testing; urgency=low + + * post-release snap + + -- Isaac Freeman Mon, 16 Jun 2008 15:35:15 -0400 + perl-xcat (2.0-1) lenny; urgency=low * Initial release diff --git a/perl-xCAT/debian/files b/perl-xCAT/debian/files index 7acd7de11..e69de29bb 100644 --- a/perl-xCAT/debian/files +++ b/perl-xCAT/debian/files @@ -1 +0,0 @@ -perl-xcat_2.0-1_all.deb admin extra diff --git a/xCAT-client/debian/changelog b/xCAT-client/debian/changelog index a69a7de7f..d350ef1b2 100644 --- a/xCAT-client/debian/changelog +++ b/xCAT-client/debian/changelog @@ -1,3 +1,9 @@ +xcat-client (2.0-2) testing; urgency=low + + * post-release snap + + -- Isaac Freeman Mon, 16 Jun 2008 15:35:47 -0400 + xcat-client (2.0-1) lenny; urgency=low * Initial release diff --git a/xCAT-client/debian/control b/xCAT-client/debian/control index 93d83371b..000b8d1c9 100644 --- a/xCAT-client/debian/control +++ b/xCAT-client/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: xcat-client Architecture: any -Depends: ${perl:Depends}, perl-xcat, libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl +Depends: ${perl:Depends}, perl-xcat (>= 2.0-2), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl Description: Core executables and data of the xCAT management project xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, etc) helpful in administrating systems at scale, with particular attention paid to large HPC clusters. diff --git a/xCAT-client/debian/files b/xCAT-client/debian/files index 6cef6ec05..e69de29bb 100644 --- a/xCAT-client/debian/files +++ b/xCAT-client/debian/files @@ -1,2 +0,0 @@ -xcat-client_2.0-2_i386.deb admin extra -xcat-client_2.0-2_i386.deb admin extra diff --git a/xCAT-server/lib/xcat/plugins/copycds.pm b/xCAT-server/lib/xcat/plugins/copycds.pm index 042924b0c..d16af1724 100644 --- a/xCAT-server/lib/xcat/plugins/copycds.pm +++ b/xCAT-server/lib/xcat/plugins/copycds.pm @@ -53,21 +53,23 @@ sub process_request { s/^/$request->{cwd}->[0]\//; } - # /dev/cdrom is a symlink on some systems, we need to see if it points to a - # block device. + # /dev/cdrom is a symlink on some systems. We need to be able to determine + # if the arg points to a block device. if (-l $_) { my $link = readlink($_); + + # Symlinks can be relative, i.e., "../../foo" if ($link =~ m{^/}) { $file = $link; } else - { $file = dirname($_) . "/" . $link; } + { $file = dirname($_) . "/" . $link; } # Unix can handle "/foo/../bar" } else { $file = $_; } my $mntopts; if (-r $file and -b $file) # Block device? { $mntopts = "-o ro"; } - elsif (-r $file and -f $file) + elsif (-r $file and -f $file) # Assume ISO file { $mntopts = "-o ro,loop"; } else { $callback->({error=>"The management server was unable to find/read $file. Ensure that file exists on the server at the specified location."}); diff --git a/xCAT-server/share/xcat/install/sles/xen.tmpl b/xCAT-server/share/xcat/install/sles/xen.tmpl new file mode 100644 index 000000000..01599a689 --- /dev/null +++ b/xCAT-server/share/xcat/install/sles/xen.tmpl @@ -0,0 +1,143 @@ + + + + + true + true + + false + false + mbr + + + true + true + XEN + 8 + + grub + +
+ resume=/dev/sda2 xencons=ttyS console=ttyS0,19200 splash=silent showopts + /boot/vmlinuz-xen + /boot/initrd-xen + 0 + XEN + xen + /dev/sda2 + xen + /boot/xen.gz + console=com1 com1=19200 +
+
+ resume=/dev/hda1 console=ttyS0,19200 console=tty0 splash=silent showopts + /boot/vmlinuz + 1 + /boot/initrd + /boot/vmlinuz + 1 + SUSE Linux Enterprise Server 10 + linux + /dev/hda2 + image +
+
+ showopts ide=nodma apm=off acpi=off noresume edd=off 3 + /boot/vmlinuz + /boot/initrd + 3 + Failsafe -- SUSE Linux Enterprise Server 10 + failsafe + /dev/hda2 + image + normal +
+ + + + + GMT + #TABLE:site:key=timezone:value# + + + english-us + + en_US + + false + false + false + true + + + non + + + + + /dev/sda + true + all + + + + + base + x11 + xen_server + xen_server-32bit + 32bit + + + stunnel + xntp + rsync + xen + xen-libs + xen-tools + xen-tools-ioemu + kernel-xen + virt-manager + xen-kmp-kdump + xen-kmp-smp + + + + + + root + #CRYPT:passwd:key=system,username=root:password# + true + + + + + + + AUTO + + + true + true + local + linux + + + + dhcp + eth0 + onboot + + + + false + + + + + #INCLUDE:../scripts/pre.sles# + #INCLUDE:../scripts/chroot.sles# + #INCLUDE:../scripts/post.sles# + + +