Hello community, here is the log from the commit of package linuxrc checked in at Thu May 8 23:33:39 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-05-07 16:27:14.000000000 +0200 +++ linuxrc/linuxrc.changes 2008-05-08 18:31:26.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 8 18:31:23 CEST 2008 - snwint@suse.de + +- swap to videoram on PS3 + +------------------------------------------------------------------- +Thu May 8 13:05:26 CEST 2008 - snwint@suse.de + +- added 'nfsops' option to pass nfs mount options + +------------------------------------------------------------------- Old: ---- linuxrc-3.1.22.tar.bz2 New: ---- linuxrc-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.T16958/_old 2008-05-08 23:32:31.000000000 +0200 +++ /var/tmp/diff_new_pack.T16958/_new 2008-05-08 23:32:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.1.22) +# spec file for package linuxrc (Version 3.1.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.1.22 +Version: 3.1.24 Release: 1 -Source: linuxrc-3.1.22.tar.bz2 +Source: linuxrc-3.1.24.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,10 @@ %doc linuxrc.html %changelog +* Thu May 08 2008 snwint@suse.de +- swap to videoram on PS3 +* Thu May 08 2008 snwint@suse.de +- added 'nfsops' option to pass nfs mount options * Wed May 07 2008 snwint@suse.de - added option 'braille=1' to start braille support in linuxrc - fix media check (bnc#385885) ++++++ linuxrc-3.1.22.tar.bz2 -> linuxrc-3.1.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/Changelog new/linuxrc-3.1.24/Changelog --- old/linuxrc-3.1.22/Changelog 2008-05-07 16:25:04.000000000 +0200 +++ new/linuxrc-3.1.24/Changelog 2008-05-08 18:28:38.000000000 +0200 @@ -1,3 +1,9 @@ +8/5/2008: v3.1.24 + - swap to videoram on PS3 + +8/5/2008: v3.1.23 + - added 'nfsops' option to pass nfs mount options + 7/5/2008: v3.1.22 - added option 'braille=1' to start braille support in linuxrc - fix media check (bnc#385885) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/file.c new/linuxrc-3.1.24/file.c --- old/linuxrc-3.1.22/file.c 2008-05-07 16:22:42.000000000 +0200 +++ new/linuxrc-3.1.24/file.c 2008-05-08 11:33:08.000000000 +0200 @@ -285,6 +285,7 @@ { key_squash, "squash", kf_cfg + kf_cmd }, { key_devbyid, "devbyid", kf_cfg + kf_cmd_early }, { key_braille, "braille", kf_cfg + kf_cmd_early }, + { key_nfsopts, "nfs.opts", kf_cfg + kf_cmd }, }; static struct { @@ -911,11 +912,11 @@ break; case key_nfsrsize: - if(f->is.numeric) config.net.nfs_rsize = f->nvalue; + if(f->is.numeric) config.net.nfs.rsize = f->nvalue; break; case key_nfswsize: - if(f->is.numeric) config.net.nfs_wsize = f->nvalue; + if(f->is.numeric) config.net.nfs.wsize = f->nvalue; break; case key_setupcmd: @@ -1450,6 +1451,31 @@ if(f->is.numeric) config.braille.check = f->nvalue; break; + case key_nfsopts: + if(*f->value) { + str_copy(&config.net.nfs.opts, f->value); + sl0 = slist_split(',', f->value); + for(sl = sl0; sl; sl = sl->next) { + if(sscanf(sl->key, "rsize=%u", &u) == 1) { + config.net.nfs.rsize = u; + } + else if(sscanf(sl->key, "wsize=%u", &u) == 1) { + config.net.nfs.wsize = u; + } + else if(sscanf(sl->key, "vers=%u", &u) == 1) { + config.net.nfs.vers = u; + } + else if(!strcmp(sl->key, "udp")) { + config.net.nfs.udp = 1; + } + else if(!strcmp(sl->key, "tcp")) { + config.net.nfs.udp = 0; + } + } + slist_free(sl0); + } + break; + default: break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/file.h new/linuxrc-3.1.24/file.h --- old/linuxrc-3.1.22/file.h 2008-05-05 16:22:16.000000000 +0200 +++ new/linuxrc-3.1.24/file.h 2008-05-08 11:10:54.000000000 +0200 @@ -48,7 +48,7 @@ key_ibft_dns, key_net_retry, key_bootif, key_swap_size, key_ntfs_3g, key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe, key_device, key_nomdns, key_yepurl, key_yepcert, key_mediacheck, key_y2gdb, key_squash, - key_kexec_reboot, key_devbyid, key_braille + key_kexec_reboot, key_devbyid, key_braille, key_nfsopts } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/global.h new/linuxrc-3.1.24/global.h --- old/linuxrc-3.1.22/global.h 2008-05-05 16:39:24.000000000 +0200 +++ new/linuxrc-3.1.24/global.h 2008-05-08 11:32:49.000000000 +0200 @@ -504,8 +504,13 @@ int tftp_timeout; int bootp_wait; /* wait this time (in s) after network setup before starting bootp */ int ifup_wait; /* wait this time (in s) after network setup */ - int nfs_rsize; /* nfs rsize mount option */ - int nfs_wsize; /* nfs wsize mount option */ + struct { + char *opts; /* mount options string */ + unsigned rsize; /* nfs rsize mount option */ + unsigned wsize; /* nfs wsize mount option */ + unsigned udp:1; /* udp instead of tcp */ + unsigned vers; /* nfs version (2 or 3) */ + } nfs; int retry; /* max retry count for network connections */ inet_t netmask; inet_t network; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/linuxrc.c new/linuxrc-3.1.24/linuxrc.c --- old/linuxrc-3.1.22/linuxrc.c 2008-05-07 16:23:47.000000000 +0200 +++ new/linuxrc-3.1.24/linuxrc.c 2008-05-08 18:29:46.000000000 +0200 @@ -933,6 +933,22 @@ } #endif +#if defined(__powerpc__) +#warning ps3vram + /* enable swap to videoram on PS3 */ + { + char cmd[] = "s=/dev/mtdblock0;/sbin/swapoff $s;mkswap -L ps3_vram_swap $s&&swapon $s"; + + fprintf(stderr,"loading ps3vram and mtdblock\n"); + mod_modprobe("ps3vram",""); + mod_modprobe("mtdblock",""); + if(!config.test && util_check_exist("/sys/block/mtdblock0")) { + fprintf(stderr,"executing %s\n",cmd); + system(cmd); + } + } +#endif + if(config.memory.ram_min && !config.had_segv) { int window = config.win, ram; char *msg = NULL; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/net.c new/linuxrc-3.1.24/net.c --- old/linuxrc-3.1.22/net.c 2008-05-07 14:53:00.000000000 +0200 +++ new/linuxrc-3.1.24/net.c 2008-05-08 11:33:11.000000000 +0200 @@ -844,8 +844,7 @@ * server: server address * hostdir: directory on server * - * config.net.nfs_rsize: read size - * config.net.nfs_wsize: write size + * config.net.nfs: nfs options * * return: * 0: ok @@ -854,10 +853,13 @@ */ int net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, unsigned port) { - int err; + int err, flags = NFS_MOUNT_NONLM; + + if(!config.net.nfs.udp) flags |= NFS_MOUNT_TCP; + if(config.net.nfs.vers != 2) flags |= NFS_MOUNT_VER3; /* first, v3 with tcp */ - err = _net_mount_nfs(mountpoint, server, hostdir, port, NFS_MOUNT_TCP | NFS_MOUNT_VER3 | NFS_MOUNT_NONLM); + err = _net_mount_nfs(mountpoint, server, hostdir, port, flags); /* if that doesn't work, try v2, with udp */ if(err == EPROTONOSUPPORT) { @@ -878,8 +880,7 @@ * hostdir: directory on server * flags: NFS mount flags * - * config.net.nfs_rsize: read size - * config.net.nfs_wsize: write size + * config.net.nfs: nfs options * * return: * 0: ok @@ -907,8 +908,8 @@ memcpy(&mount_server_in, &server_in, sizeof mount_server_in); memset(&mount_data, 0, sizeof mount_data); mount_data.flags = flags; - mount_data.rsize = config.net.nfs_rsize; - mount_data.wsize = config.net.nfs_wsize; + mount_data.rsize = config.net.nfs.rsize; + mount_data.wsize = config.net.nfs.wsize; mount_data.retrans = 3; mount_data.acregmin = 3; mount_data.acregmax = 60; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.22/VERSION new/linuxrc-3.1.24/VERSION --- old/linuxrc-3.1.22/VERSION 2008-05-05 17:39:36.000000000 +0200 +++ new/linuxrc-3.1.24/VERSION 2008-05-08 18:27:22.000000000 +0200 @@ -1 +1 @@ -3.1.22 +3.1.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org