commit linuxrc

8 May 2006

Hello community,

here is the log from the commit of package linuxrc
checked in at Tue May 9 00:40:01 CEST 2006.

--------

--- linuxrc/linuxrc.changes	2006-04-27 15:59:00.000000000 +0200
+++ STABLE/linuxrc/linuxrc.changes	2006-05-08 17:30:30.000000000 +0200
@@ -1,0 +2,13 @@
+Mon May  8 17:30:23 CEST 2006 - snwint@suse.de
+
+- don't use broadcast flag for dhcp; make dhcpcd options
+  configurable (#166222)
+
+-------------------------------------------------------------------
+Mon May  8 16:56:06 CEST 2006 - snwint@suse.de
+
+- evaluate 'insmod' option earlier, so modules are loaded before
+  hardware detection starts (#164213)
+- keep udevd running (#171872)
+
+-------------------------------------------------------------------

Old:
----
  linuxrc-2.0.37.tar.bz2

New:
----
  linuxrc-2.0.39.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.SHYf7L/_old	2006-05-09 00:39:18.000000000 +0200
+++ /var/tmp/diff_new_pack.SHYf7L/_new	2006-05-09 00:39:18.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package linuxrc (Version 2.0.37)
+# spec file for package linuxrc (Version 2.0.39)
 #
 # Copyright (c) 2006 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.0.37
+Version:        2.0.39
 Release:        2
-Source:         linuxrc-2.0.37.tar.bz2
+Source:         linuxrc-2.0.39.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -53,6 +53,13 @@
 %doc linuxrc.html
 
 %changelog -n linuxrc
+* Mon May 08 2006 - snwint@suse.de
+- don't use broadcast flag for dhcp; make dhcpcd options
+  configurable (#166222)
+* Mon May 08 2006 - snwint@suse.de
+- evaluate 'insmod' option earlier, so modules are loaded before
+  hardware detection starts (#164213)
+- keep udevd running (#171872)
 * Thu Apr 27 2006 - snwint@suse.de
 - wait for usb-stor-scan to finish (#168983)
 * Tue Apr 25 2006 - uli@suse.de

++++++ linuxrc-2.0.37.tar.bz2 -> linuxrc-2.0.39.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/Changelog new/linuxrc-2.0.39/Changelog
--- old/linuxrc-2.0.37/Changelog	2006-04-27 15:34:36.000000000 +0200
+++ new/linuxrc-2.0.39/Changelog	2006-05-08 17:19:12.000000000 +0200
@@ -1,3 +1,12 @@
+8/5/2006:	v2.0.39
+	- don't use broadcast flag for dhcp; make dhcpcd options
+	  configurable (#166222)
+
+8/5/2006:	v2.0.38
+	- evaluate 'insmod' option earlier, so modules are loaded before
+	  hardware detection starts (#164213)
+	- keep udevd running (#171872)
+
 27/4/2006:	v2.0.37
 	- wait for usb-stor-scan to finish (#168983)
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/VERSION new/linuxrc-2.0.39/VERSION
--- old/linuxrc-2.0.37/VERSION	2006-04-27 15:34:40.000000000 +0200
+++ new/linuxrc-2.0.39/VERSION	2006-05-08 17:17:33.000000000 +0200
@@ -1 +1 @@
-2.0.37
+2.0.39
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/file.c new/linuxrc-2.0.39/file.c
--- old/linuxrc-2.0.37/file.c	2006-03-23 15:47:13.000000000 +0100
+++ new/linuxrc-2.0.39/file.c	2006-05-08 17:17:24.000000000 +0200
@@ -79,7 +79,7 @@
   { key_language,       "Language",       kf_cfg + kf_cmd + kf_yast      },
   { key_language,       "lang",           kf_cfg + kf_cmd                },
   { key_rebootmsg,      "RebootMsg",      kf_yast                        },
-  { key_insmod,         "Insmod",         kf_cfg + kf_cmd                },
+  { key_insmod,         "Insmod",         kf_cfg + kf_cmd1               },
   { key_display,        "Display",        kf_cfg + kf_cmd                },
   { key_ip,             "IP",             kf_none                        },
   { key_netmask,        "Netmask",        kf_cfg + kf_cmd + kf_dhcp      },
@@ -261,7 +261,8 @@
   { key_withiscsi,      "WithiSCSI",      kf_cfg + kf_cmd                },
   { key_ethtool,        "ethtool",        kf_cfg + kf_cmd_early          },
   { key_listen,         "listen",         kf_cfg + kf_cmd                },
-  { key_zombies,        "Zombies",        kf_cfg + kf_cmd                }
+  { key_zombies,        "Zombies",        kf_cfg + kf_cmd                },
+  { key_dhcpcd,         "DHCPCD",         kf_cfg + kf_cmd                }
 };
 
 static struct {
@@ -1401,6 +1402,10 @@
         if(f->is.numeric) config.zombies = f->nvalue;
         break;
 
+      case key_dhcpcd:
+        if(*f->value) str_copy(&config.net.dhcpcd, f->value);
+        break;
+
       default:
         break;
     }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/file.h new/linuxrc-2.0.39/file.h
--- old/linuxrc-2.0.37/file.h	2006-03-14 19:04:06.000000000 +0100
+++ new/linuxrc-2.0.39/file.h	2006-05-08 17:14:01.000000000 +0200
@@ -44,7 +44,8 @@
   key_zen, key_zenconfig, key_port, key_smbshare, key_rootimage2, key_xxx,
   key_instsys_id, key_initrd_id, key_instsys_complain, key_nfstcp,
   key_osamedium, key_osainterface, key_dud_complain, key_dud_expected,
-  key_staticdevices, key_withiscsi, key_ethtool, key_listen, key_zombies
+  key_staticdevices, key_withiscsi, key_ethtool, key_listen, key_zombies,
+  key_dhcpcd
 } file_key_t;
 
 typedef enum {
@@ -55,7 +56,8 @@
   kf_yast = 1 << 3,		/* /etc/yast.inf */
   kf_dhcp = 1 << 4,		/* dhcp info file */
   kf_mem = 1 << 5,		/* /proc/meminfo */
-  kf_boot = 1 << 6		/* things the boot loader used */
+  kf_boot = 1 << 6,		/* things the boot loader used */
+  kf_cmd1 = 1 << 7		/* between cmd_early and start of hw detection */
 } file_key_flag_t;
 
 typedef struct file_s {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/global.h new/linuxrc-2.0.39/global.h
--- old/linuxrc-2.0.37/global.h	2006-03-24 16:10:19.000000000 +0100
+++ new/linuxrc-2.0.39/global.h	2006-05-08 17:16:57.000000000 +0200
@@ -505,6 +505,7 @@
       char *binary;		/* cifs/smb mount binary */
       char *module;		/* cifs/smb kernel module */
     } cifs;
+    char *dhcpcd;		/* dhcpcd parameters (if any) */
   } net;
 
   struct {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/linuxrc.c new/linuxrc-2.0.39/linuxrc.c
--- old/linuxrc-2.0.37/linuxrc.c	2006-04-26 10:43:07.000000000 +0200
+++ new/linuxrc-2.0.39/linuxrc.c	2006-05-08 16:53:42.000000000 +0200
@@ -562,7 +562,7 @@
 int do_not_kill(char *name)
 {
   static char *progs[] = {
-    "portmap", "rpciod", "lockd", "lsh", "dhcpcd", "cifsd", "mount.smbfs"
+    "portmap", "rpciod", "lockd", "lsh", "dhcpcd", "cifsd", "mount.smbfs", "udevd"
   };
   int i;
 
@@ -940,6 +940,8 @@
     config.shell_started = 1;
   }
 
+  file_read_info_file("cmdline", kf_cmd1);
+
   if(config.had_segv) config.manual = 1;
 
   /* get usb keyboard working */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.37/net.c new/linuxrc-2.0.39/net.c
--- old/linuxrc-2.0.37/net.c	2006-03-23 14:50:38.000000000 +0100
+++ new/linuxrc-2.0.39/net.c	2006-05-08 17:16:34.000000000 +0200
@@ -1485,7 +1485,12 @@
 
   net_apply_ethtool(config.net.device, config.net.hwaddr);
 
-  strcpy(cmd, "dhcpcd -B");
+  strcpy(cmd, "dhcpcd");
+
+  if(config.net.dhcpcd) {
+    sprintf(cmd + strlen(cmd), " %s", config.net.dhcpcd);
+  }
+
   if(config.net.dhcp_timeout != 60) {
     sprintf(cmd + strlen(cmd), " -t %d", config.net.dhcp_timeout);
   }


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)