Hello community, here is the log from the commit of package linuxrc checked in at Mon Sep 17 17:25:42 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-09-11 17:15:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-09-17 17:05:38.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 17 17:05:34 CEST 2007 - snwint@suse.de + +- don't turn off swap (#308121) +- device was sometimes not written to install.inf (#305495) + +------------------------------------------------------------------- Old: ---- linuxrc-3.0.17.tar.bz2 New: ---- linuxrc-3.0.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.x25494/_old 2007-09-17 17:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.x25494/_new 2007-09-17 17:24:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.0.17) +# spec file for package linuxrc (Version 3.0.18) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,11 +14,11 @@ BuildRequires: e2fsprogs-devel hwinfo-devel libblkid-devel libcurl-devel License: GPL v2 or later Group: System/Boot -Autoreqprov: on +AutoReqProv: on Summary: SUSE Installation Program -Version: 3.0.17 +Version: 3.0.18 Release: 1 -Source: linuxrc-3.0.17.tar.bz2 +Source: linuxrc-3.0.18.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,9 @@ %doc linuxrc.html %changelog +* Mon Sep 17 2007 - snwint@suse.de +- don't turn off swap (#308121) +- device was sometimes not written to install.inf (#305495) * Tue Sep 11 2007 - snwint@suse.de - translations updated * Mon Sep 10 2007 - snwint@suse.de ++++++ linuxrc-3.0.17.tar.bz2 -> linuxrc-3.0.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.17/Changelog new/linuxrc-3.0.18/Changelog --- old/linuxrc-3.0.17/Changelog 2007-09-11 17:13:48.000000000 +0200 +++ new/linuxrc-3.0.18/Changelog 2007-09-17 16:13:46.000000000 +0200 @@ -1,3 +1,7 @@ +13/9/2007: v3.0.18 + - don't turn off swap (#308121) + - device was sometimes not written to install.inf (#305495) + 11/9/2007: v3.0.17 - translations updated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.17/fstype.c new/linuxrc-3.0.18/fstype.c --- old/linuxrc-3.0.17/fstype.c 2007-08-03 13:55:53.000000000 +0200 +++ new/linuxrc-3.0.18/fstype.c 2007-09-17 16:15:32.000000000 +0200 @@ -42,6 +42,8 @@ #include "linux_fs.h" #include "fstype.h" +#include "global.h" + #define ALL_TYPES #define SIZE(a) (sizeof(a)/sizeof(a[0])) @@ -192,8 +194,12 @@ return 0; fd = open(device, O_RDONLY | O_LARGEFILE); - if (fd < 0) + /* try harder */ + if (fd < 0 && errno == ENOMEDIUM) fd = open(device, O_RDONLY | O_LARGEFILE); + if (fd < 0) { + if(config.debug) perror(device); return 0; + } /* do seeks and reads in disk order, otherwise a very short partition may cause a failure because of read error */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.17/install.c new/linuxrc-3.0.18/install.c --- old/linuxrc-3.0.17/install.c 2007-08-30 17:09:24.000000000 +0200 +++ new/linuxrc-3.0.18/install.c 2007-09-17 16:30:04.000000000 +0200 @@ -70,7 +70,6 @@ static int inst_choose_source_cb (dia_item_t di); static int inst_menu_cb (dia_item_t di); static int choose_dud(char **dev); -static void inst_swapoff (void); static dia_item_t di_inst_menu_last = di_none; static dia_item_t di_inst_choose_source_last = di_none; @@ -937,7 +936,7 @@ } LXRC_WAIT - + if(config.rescue) { /* get rid of repo */ url_umount(config.url.install); @@ -1253,9 +1252,6 @@ mount(0, "/", 0, MS_MGC_VAL | MS_REMOUNT, 0); } - /* turn off swap */ - inst_swapoff(); - inst_yast_done(); if(config.aborted) { @@ -1547,19 +1543,3 @@ } -void inst_swapoff() -{ - slist_t *sl; - char buf[64]; - - util_update_swap_list(); - - if(config.test) return; - - for(sl = config.swaps; sl; sl = sl->next) { - sprintf(buf, "/dev/%s", sl->key); - fprintf(stderr, "swapoff %s\n", buf); - swapoff(buf); - } -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.17/url.c new/linuxrc-3.0.18/url.c --- old/linuxrc-3.0.17/url.c 2007-09-07 16:32:17.000000000 +0200 +++ new/linuxrc-3.0.18/url.c 2007-09-17 16:11:29.000000000 +0200 @@ -1226,16 +1226,17 @@ str_copy(&url->used.hwaddr, NULL); str_copy(&url->used.unique_id, NULL); err = url_mount_disk(url, dir, test_func) ? 0 : 1; + if(!err) found = 1; } - if(err) { + if(!found) { str_copy(&url->used.device, NULL); str_copy(&url->used.model, NULL); str_copy(&url->used.hwaddr, NULL); str_copy(&url->used.unique_id, NULL); } - return found ? 0 : err; + return found ? 0 : 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.17/util.c new/linuxrc-3.0.18/util.c --- old/linuxrc-3.0.17/util.c 2007-09-07 16:35:57.000000000 +0200 +++ new/linuxrc-3.0.18/util.c 2007-09-17 15:32:30.000000000 +0200 @@ -3042,11 +3042,13 @@ argv++; argc--; - if(argc != 1) return fprintf(stderr, "usage: fstype blockdevice\n"), 1; + if(!argc) return fprintf(stderr, "usage: fstype blockdevice\n"), 1; - s = fstype(*argv); - - printf("%s: %s\n", *argv, s ?: "unknown fs"); + while(argc--) { + s = fstype(*argv); + printf("%s: %s\n", *argv, s ?: "unknown fs"); + argv++; + } return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.17/VERSION new/linuxrc-3.0.18/VERSION --- old/linuxrc-3.0.17/VERSION 2007-09-11 17:13:31.000000000 +0200 +++ new/linuxrc-3.0.18/VERSION 2007-09-13 16:17:44.000000000 +0200 @@ -1 +1 @@ -3.0.17 +3.0.18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org