Hello community, here is the log from the commit of package linuxrc checked in at Mon Sep 1 18:37:04 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-08-18 17:32:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-09-01 18:12:06.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 1 18:12:03 CEST 2008 - snwint@suse.de + +- load 'efivars' module +- added 'efi' option +- added 'udev' & 'udev.mods' debug flags + +------------------------------------------------------------------- Old: ---- linuxrc-3.3.1.tar.bz2 New: ---- linuxrc-3.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.z15360/_old 2008-09-01 18:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.z15360/_new 2008-09-01 18:36:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.3.1) +# spec file for package linuxrc (Version 3.3.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.3.1 +Version: 3.3.2 Release: 1 -Source: linuxrc-3.3.1.tar.bz2 +Source: linuxrc-3.3.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +61,10 @@ %doc linuxrc.html %changelog +* Mon Sep 01 2008 snwint@suse.de +- load 'efivars' module +- added 'efi' option +- added 'udev' & 'udev.mods' debug flags * Mon Aug 18 2008 snwint@suse.de - 'boot installed system' no longer crashes * Mon Aug 18 2008 snwint@suse.de ++++++ linuxrc-3.3.1.tar.bz2 -> linuxrc-3.3.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/Changelog new/linuxrc-3.3.2/Changelog --- old/linuxrc-3.3.1/Changelog 2008-08-18 17:32:14.000000000 +0200 +++ new/linuxrc-3.3.2/Changelog 2008-09-01 18:11:10.000000000 +0200 @@ -1,3 +1,8 @@ +1/9/2008: v3.3.2 + - load 'efivars' module + - added 'efi' option + - added 'udev' & 'udev.mods' debug flags + 18/8/2008: v3.3.1 - 'boot installed system' no longer crashes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/file.c new/linuxrc-3.3.2/file.c --- old/linuxrc-3.3.1/file.c 2008-07-24 12:26:14.000000000 +0200 +++ new/linuxrc-3.3.2/file.c 2008-09-01 15:15:25.000000000 +0200 @@ -296,6 +296,7 @@ { key_ipv6only, "ipv6only", kf_cfg + kf_cmd + kf_cmd_early }, { key_usesax2, "UseSax2", kf_cfg + kf_cmd }, { key_usesax2, "Sax2", kf_cfg + kf_cmd }, + { key_efi, "EFI", kf_cfg + kf_cmd }, }; static struct { @@ -972,6 +973,12 @@ } fclose(w); } + if((w = fopen("/etc/modprobe.d/noload", "w"))) { + for(sl = config.module.broken; sl; sl = sl->next) { + if(sl->key) fprintf(w, "install %s /bin/true\n", sl->key); + } + fclose(w); + } } break; @@ -1013,9 +1020,21 @@ for(sl = sl0; sl; sl = sl->next) { if(*sl->key) { u = strtoul(sl->key, &t, 0); - if(!*t) config.debug = u; + if(!*t) { + config.debug = u; + } + else { + s = sl->key; + i = 1; + if(*s == '+' || *s == '-') { + if(*s == '-') i = 0; + s++; + } + if(!strcmp(s, "wait")) config.debugwait = i; + else if(!strcmp(s, "udev")) config.staticdevices = i ^ 1; + else if(!strcmp(s, "udev.mods")) config.udev_mods = i; + } } - if(!strcmp(sl->key, "wait")) config.debugwait = 1; } slist_free(sl0); break; @@ -1507,6 +1526,10 @@ if(f->is.numeric) config.usesax2 = f->nvalue; break; + case key_efi: + if(f->is.numeric) config.efi = f->nvalue; + break; + default: break; } @@ -1813,6 +1836,7 @@ file_write_num(f, key_y2gdb, config.y2gdb); file_write_num(f, key_kexec_reboot, config.kexec_reboot); file_write_num(f, key_usesax2, config.usesax2); + file_write_num(f, key_efi, config.efi >= 0 ? config.efi : config.efi_vars); if( config.rootpassword && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/file.h new/linuxrc-3.3.2/file.h --- old/linuxrc-3.3.1/file.h 2008-07-24 12:24:03.000000000 +0200 +++ new/linuxrc-3.3.2/file.h 2008-09-01 14:30:12.000000000 +0200 @@ -49,7 +49,7 @@ 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_nfsopts, key_ipv4, key_ipv4only, - key_ipv6, key_ipv6only, key_usesax2 + key_ipv6, key_ipv6only, key_usesax2, key_efi } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/global.h new/linuxrc-3.3.2/global.h --- old/linuxrc-3.3.1/global.h 2008-07-24 12:26:50.000000000 +0200 +++ new/linuxrc-3.3.2/global.h 2008-09-01 15:07:41.000000000 +0200 @@ -340,6 +340,9 @@ unsigned usesax2:1; /* just passed to yast */ unsigned withiscsi; /* iSCSI parameter */ unsigned restart_method; /* 0: start new root fs, 1: reboot, 2: halt, 3: kexec */ + unsigned efi_vars:1; /* efi vars exist */ + int efi; /* use efi; -1 = auto */ + unsigned udev_mods:1; /* let udev load modules */ struct { unsigned check:1; /* check for braille displays and start brld if found */ char *dev; /* braille device */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/linuxrc.c new/linuxrc-3.3.2/linuxrc.c --- old/linuxrc-3.3.1/linuxrc.c 2008-08-18 11:28:56.000000000 +0200 +++ new/linuxrc-3.3.2/linuxrc.c 2008-09-01 17:52:17.000000000 +0200 @@ -757,6 +757,8 @@ config.secure = 1; config.squash = 1; config.kexec_reboot = 1; + config.efi = -1; + config.udev_mods = 1; config.scsi_rename = 0; config.scsi_before_usb = 1; @@ -806,6 +808,10 @@ util_redirect_kmsg(); + if(!config.udev_mods) { + system("cp /lib/udev/80-drivers.rules.no_modprobe /lib/udev/rules.d/80-drivers.rules"); + } + if(config.staticdevices) { util_mkdevs(); } @@ -896,6 +902,11 @@ if(config.had_segv) config.manual = 1; + /* check efi status */ + if(util_check_exist("/sys/firmware/efi/vars") == 'd') { + config.efi_vars = 1; + } + /* get usb keyboard working */ if(config.manual == 1 && !config.had_segv) util_load_usb(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/util.c new/linuxrc-3.3.2/util.c --- old/linuxrc-3.3.1/util.c 2008-08-18 17:11:24.000000000 +0200 +++ new/linuxrc-3.3.2/util.c 2008-09-01 15:13:53.000000000 +0200 @@ -1081,7 +1081,7 @@ { int l; - if(!value) return; + if(value <= 0) return; if(!*buf) strcpy(buf, " "); l = strlen(buf); @@ -1189,6 +1189,10 @@ add_flag(&sl0, buf, config.mediacheck, "mediacheck"); add_flag(&sl0, buf, config.net.ipv4, "ipv4"); add_flag(&sl0, buf, config.net.ipv6, "ipv6"); + add_flag(&sl0, buf, config.efi, "efi"); + add_flag(&sl0, buf, config.efi_vars, "efivars"); + add_flag(&sl0, buf, config.staticdevices ^ 1, "udev"); + add_flag(&sl0, buf, config.udev_mods, "udev.mods"); if(*buf) slist_append_str(&sl0, buf); sprintf(buf, "net_config_mask = 0x%x", net_config_mask()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.1/VERSION new/linuxrc-3.3.2/VERSION --- old/linuxrc-3.3.1/VERSION 2008-08-18 17:31:52.000000000 +0200 +++ new/linuxrc-3.3.2/VERSION 2008-09-01 14:44:40.000000000 +0200 @@ -1 +1 @@ -3.3.1 +3.3.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org