Hello community, here is the log from the commit of package linuxrc checked in at Fri May 25 17:20:26 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-05-24 12:37:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-05-25 16:18:07.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 25 16:18:04 CEST 2007 - snwint@suse.de + +- cleanup: removed MemYaSTText & MemModules options +- 'addswap' works again +- added warning before we format a paritition + +------------------------------------------------------------------- Old: ---- linuxrc-2.1.25.tar.bz2 New: ---- linuxrc-2.1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.f13114/_old 2007-05-25 17:20:19.000000000 +0200 +++ /var/tmp/diff_new_pack.f13114/_new 2007-05-25 17:20:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.1.25) +# spec file for package linuxrc (Version 2.1.26) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 2.1.25 +Version: 2.1.26 Release: 1 -Source: linuxrc-2.1.25.tar.bz2 +Source: linuxrc-2.1.26.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,10 @@ %doc linuxrc.html %changelog +* Fri May 25 2007 - snwint@suse.de +- cleanup: removed MemYaSTText & MemModules options +- 'addswap' works again +- added warning before we format a paritition * Thu May 24 2007 - snwint@suse.de - withiscsi=1 now implies netsetup=1 (#271420) - rewrote swap space dialog: it can create swap partitions ++++++ linuxrc-2.1.25.tar.bz2 -> linuxrc-2.1.26.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/Changelog new/linuxrc-2.1.26/Changelog --- old/linuxrc-2.1.25/Changelog 2007-05-23 17:27:31.000000000 +0200 +++ new/linuxrc-2.1.26/Changelog 2007-05-25 16:17:32.000000000 +0200 @@ -1,3 +1,8 @@ +25/5/2007: v2.1.26 + - cleanup: removed MemYaSTText & MemModules options + - 'addswap' works again + - added warning before we format a paritition + 23/5/2007: v2.1.25 - withiscsi=1 now implies netsetup=1 (#271420) - rewrote swap space dialog: it can create swap partitions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/file.c new/linuxrc-2.1.26/file.c --- old/linuxrc-2.1.25/file.c 2007-05-23 17:22:03.000000000 +0200 +++ new/linuxrc-2.1.26/file.c 2007-05-25 15:40:10.000000000 +0200 @@ -143,8 +143,6 @@ { key_swapfree, "SwapFree", kf_mem }, { key_memlimit, "MemLimit", kf_cfg + kf_cmd }, { key_memyast, "MemYaST", kf_cfg + kf_cmd }, - { key_memyasttext, "MemYaSTText", kf_cfg + kf_cmd }, - { key_memmodules, "MemModules", kf_cfg + kf_cmd }, { key_memloadimage, "MemLoadImage", kf_cfg + kf_cmd }, { key_info, "Info", kf_cmd_early }, { key_proxy, "Proxy", kf_cfg + kf_cmd }, @@ -807,14 +805,6 @@ if(f->is.numeric) config.memory.min_yast = f->nvalue; break; - case key_memyasttext: - if(f->is.numeric) config.memory.min_yast_text = f->nvalue; - break; - - case key_memmodules: - if(f->is.numeric) config.memory.min_modules = f->nvalue; - break; - case key_memloadimage: if(f->is.numeric) { config.memory.load_image = f->nvalue; @@ -962,7 +952,8 @@ case key_addswap: if(f->is.numeric) { if(f->nvalue <= 0) { - config.addswap = f->nvalue; + /* 0 -1 -2 > 0 2 1 */ + config.addswap = (3 + f->nvalue) % 3; } else { util_update_disk_list(NULL, 1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/file.h new/linuxrc-2.1.26/file.h --- old/linuxrc-2.1.25/file.h 2007-05-23 17:22:11.000000000 +0200 +++ new/linuxrc-2.1.26/file.h 2007-05-25 15:40:21.000000000 +0200 @@ -21,12 +21,12 @@ key_hostname, key_dns, key_dhcpsiaddr, key_rootpath, key_bootfile, key_install, key_instmode, key_memtotal, key_memfree, key_buffers, key_cached, key_swaptotal, key_swapfree, key_memlimit, key_memyast, - key_memmodules, key_memloadimage, key_info, key_proxy, key_proxyport, + key_memloadimage, key_info, key_proxy, key_proxyport, key_proxyproto, key_usedhcp, key_nfsport, key_dhcptimeout, key_tftptimeout, key_tmpfs, key_testmode, key_debugwait, key_expert, key_rescue, key_rootimage, key_rescueimage, key_installdir, key_nopcmcia, key_vnc, key_vncpassword, key_displayip, key_sshpassword, key_usepivotroot, key_term, - key_addswap, key_aborted, key_memyasttext, key_netstop, key_exec, + key_addswap, key_aborted, key_netstop, key_exec, key_usbwait, key_nfsrsize, key_nfswsize, key_setupcmd, key_setupnetif, key_netconfig, key_usessh, key_noshell, key_hwdetect, key_floppydevice, key_cdromdevice, key_consoledevice, key_product, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/global.h new/linuxrc-2.1.26/global.h --- old/linuxrc-2.1.25/global.h 2007-05-24 12:06:37.000000000 +0200 +++ new/linuxrc-2.1.26/global.h 2007-05-25 15:40:34.000000000 +0200 @@ -280,7 +280,7 @@ unsigned usessh:1; /* ssh mode */ unsigned pivotroot:1; /* use pivotroot system call */ unsigned testpivotroot:1; /* test pivotroot */ - unsigned addswap:1; /* offer to add swap if yast needs it */ + unsigned addswap:2; /* offer to add swap if yast needs it */ unsigned aborted:1; /* yast did abort the installation */ unsigned splash:1; /* splash active */ unsigned netstop:1; /* shut down network iface at end */ @@ -438,9 +438,7 @@ int free_swap; /* free swap */ int current; /* currently free memory */ int min_free; /* don't let it drop below this */ - int min_modules; /* remove modules before starting yast, if it drops below this */ int min_yast; /* minimum for yast */ - int min_yast_text; /* minimum for yast in text mode */ int load_image; /* _load_ rootimage, if we have at least that much */ int ram; /* ram size in MB */ int ram_min; /* min required memory (ram size) needed for install in MB */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/install.c new/linuxrc-2.1.26/install.c --- old/linuxrc-2.1.25/install.c 2007-05-24 12:35:37.000000000 +0200 +++ new/linuxrc-2.1.26/install.c 2007-05-25 16:11:19.000000000 +0200 @@ -638,21 +638,28 @@ if(i > 0 && values2[i - 1]) { str_copy(&last_part, values2[i - 1]); dev = long_dev(values2[i - 1]); - sprintf(buf, "/sbin/mkswap %s >/dev/null 2>&1", dev); - fprintf(stderr, "mkswap %s\n", dev); - if(!system(buf)) { - fprintf(stderr, "swapon %s\n", dev); - if(swapon(dev, 0)) { - fprintf(stderr, "swapon: "); - perror(dev); - dia_message(txt_get(TXT_ERROR_SWAP), MSGTYPE_ERROR); + sprintf(buf, "Warning: all data on %s will be deleted!", dev); + j = dia_contabort(buf, NO); + if(j == YES) { + sprintf(buf, "/sbin/mkswap %s >/dev/null 2>&1", dev); + fprintf(stderr, "mkswap %s\n", dev); + if(!system(buf)) { + fprintf(stderr, "swapon %s\n", dev); + if(swapon(dev, 0)) { + fprintf(stderr, "swapon: "); + perror(dev); + dia_message(txt_get(TXT_ERROR_SWAP), MSGTYPE_ERROR); + } + else { + rc = 0; + } } else { - rc = 0; + dia_message("mkswap failed", MSGTYPE_ERROR); } } else { - dia_message("mkswap failed", MSGTYPE_ERROR); + rc = 1; } } } @@ -1110,14 +1117,6 @@ mod_free_modules(); - util_free_mem(); - if(config.memory.current - config.memory.free_swap < config.memory.min_modules) { - putenv("REMOVE_MODULES=1"); - } - else { - unsetenv("REMOVE_MODULES"); - } - setenv("INSTSYS", config.instsys, 1); setenv("TERM", config.term ?: config.serial ? "screen" : "linux", 1); @@ -1289,7 +1288,10 @@ i = 0; util_free_mem(); if(config.addswap) { - i = ask_for_swap(-1, txt_get(TXT_LOW_MEMORY2)); + i = ask_for_swap( + config.addswap == 2 ? -1 : config.memory.min_yast - config.memory.min_free, + txt_get(TXT_LOW_MEMORY2) + ); } if(i == -1) { @@ -1298,15 +1300,6 @@ } util_free_mem(); - if(config.addswap && config.memory.current < config.memory.min_yast) { - config.textmode = 1; - file_write_install_inf(""); - } - - if(i) { - inst_yast_done(); - return -1; - } if(!config.test && config.usessh && config.net.sshpassword) { if((f = popen("/usr/sbin/chpasswd", "w"))) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/linuxrc.c new/linuxrc-2.1.26/linuxrc.c --- old/linuxrc-2.1.25/linuxrc.c 2007-05-24 12:36:33.000000000 +0200 +++ new/linuxrc-2.1.26/linuxrc.c 2007-05-25 16:16:31.000000000 +0200 @@ -795,12 +795,10 @@ config.scsi_before_usb = 1; config.activate_storage = 1; /* together with scsi_rename */ - // default memory limits for i386 version + // default memory limits config.memory.min_free = 12 * 1024; - config.memory.min_yast_text = 32 * 1024; - config.memory.min_yast = 40 * 1024; - config.memory.min_modules = 64 * 1024; - config.memory.load_image = 200 * 1024; + config.memory.min_yast = 224 * 1024; + config.memory.load_image = 350 * 1024; config.swap_file_size = 1024; /* 1024 MB */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/util.c new/linuxrc-2.1.26/util.c --- old/linuxrc-2.1.25/util.c 2007-05-23 17:20:27.000000000 +0200 +++ new/linuxrc-2.1.26/util.c 2007-05-25 15:41:24.000000000 +0200 @@ -918,9 +918,6 @@ if(!dir || !loc || !config.tmpfs || !config.update.dir) return 0; - /* never delete module dir */ - config.memory.min_modules = 0; - strprintf(&drv_src, "%s%s", dir, config.update.dir); if(util_check_exist(drv_src) == 'd') { @@ -1150,9 +1147,8 @@ slist_append_str(&sl0, buf); sprintf(buf, - "memory limits: min %d, yast %d/%d, modules %d, image %d", - config.memory.min_free, config.memory.min_yast, config.memory.min_yast_text, - config.memory.min_modules, config.memory.load_image + "memory limits: min %d, yast %d, image %d", + config.memory.min_free, config.memory.min_yast, config.memory.load_image ); slist_append_str(&sl0, buf); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.25/VERSION new/linuxrc-2.1.26/VERSION --- old/linuxrc-2.1.25/VERSION 2007-05-07 15:53:08.000000000 +0200 +++ new/linuxrc-2.1.26/VERSION 2007-05-25 15:33:32.000000000 +0200 @@ -1 +1 @@ -2.1.25 +2.1.26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org