Mailinglist Archive: opensuse-commit (754 mails)
| < Previous | Next > |
commit linuxrc for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 16 May 2009 00:29:06 +0200
- Message-id: <20090515222907.2D90667816B@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory
checked in at Sat May 16 00:29:06 CEST 2009.
--------
--- linuxrc/linuxrc.changes 2009-02-13 14:48:15.000000000 +0100
+++ linuxrc/linuxrc.changes 2009-05-14 18:03:00.000000000 +0200
@@ -1,0 +2,12 @@
+Thu May 14 18:02:32 CEST 2009 - snwint@xxxxxxx
+
+- s390: falling back to manual mode in network setup has nasty side
+ effects and is not really necessary to begin with; do away with it
+ (bnc#471452)
+- s390: merge OSAHWAddr feature from SLES10 (bnc#479481)
+- s390: ask for relative port number even when device parameters
+ have been entered manually (bnc#477918)
+- netsetup option is not used when doing network install (bnc #495525)
+- reintegrate zenworks imaging options
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
linuxrc-3.3.32.tar.bz2
New:
----
linuxrc-3.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.BY9528/_old 2009-05-16 00:28:23.000000000 +0200
+++ /var/tmp/diff_new_pack.BY9528/_new 2009-05-16 00:28:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package linuxrc (Version 3.3.32)
+# spec file for package linuxrc (Version 3.4.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,9 +24,9 @@
Group: System/Boot
AutoReqProv: on
Summary: SUSE Installation Program
-Version: 3.3.32
+Version: 3.4.0
Release: 1
-Source: linuxrc-3.3.32.tar.bz2
+Source: linuxrc-3.4.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -59,6 +59,15 @@
%doc linuxrc.html
%changelog
+* Thu May 14 2009 snwint@xxxxxxx
+- s390: falling back to manual mode in network setup has nasty side
+ effects and is not really necessary to begin with; do away with it
+ (bnc#471452)
+- s390: merge OSAHWAddr feature from SLES10 (bnc#479481)
+- s390: ask for relative port number even when device parameters
+ have been entered manually (bnc#477918)
+- netsetup option is not used when doing network install (bnc #495525)
+- reintegrate zenworks imaging options
* Fri Feb 13 2009 snwint@xxxxxxx
- call gpg with '--ignore-valid-from --ignore-time-conflict' to avoid
failing on systems with broken date/time (bnc #456755)
@@ -435,7 +444,7 @@
- set min vnc password length to 8 (#184204)
- changed tftp to bind to different port for each connection (#187745)
- remove libsysfs but for s390
-* Tue Aug 29 2006 ro@xxxxxxx
+* Wed Aug 30 2006 ro@xxxxxxx
- added sysfsutils to BuildRequires and -lsysfs to LDFLAGS
* Thu Jul 13 2006 trenn@xxxxxxx
- activate dynamic cpufreq on supported machines (#176791)
@@ -874,7 +883,7 @@
- remove more items from cmdline (#30164)
* Mon Aug 25 2003 snwint@xxxxxxx
- allow more net devices in selection list (#28659)
-* Tue Aug 19 2003 ro@xxxxxxx
+* Wed Aug 20 2003 ro@xxxxxxx
- reduce number of warnings: include stdlib.h for exit
- rename "int log" to "int err_log" in insmod stuff
- use tmpfs instead of shmfs (will be deprecated soon)
++++++ linuxrc-3.3.32.tar.bz2 -> linuxrc-3.4.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/auto2.c new/linuxrc-3.4.0/auto2.c
--- old/linuxrc-3.3.32/auto2.c 2008-11-25 17:49:24.000000000 +0100
+++ new/linuxrc-3.4.0/auto2.c 2009-05-14 17:56:34.000000000 +0200
@@ -36,7 +36,6 @@
#include "url.h"
#include "checkmd5.h"
-static void auto2_user_netconfig(void);
static int driver_is_active(hd_t *hd);
static void auto2_progress(char *pos, char *msg);
static void auto2_read_repo_files(url_t *url);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/auto2.h new/linuxrc-3.4.0/auto2.h
--- old/linuxrc-3.3.32/auto2.h 2008-07-23 15:40:21.000000000 +0200
+++ new/linuxrc-3.4.0/auto2.h 2009-05-14 17:56:34.000000000 +0200
@@ -9,3 +9,4 @@
int auto2_add_extension(char *extension);
int auto2_remove_extension(char *extension);
void load_drivers(hd_data_t *hd_data, hd_hw_item_t hw_item);
+void auto2_user_netconfig(void);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/Changelog new/linuxrc-3.4.0/Changelog
--- old/linuxrc-3.3.32/Changelog 2009-02-13 14:47:45.000000000 +0100
+++ new/linuxrc-3.4.0/Changelog 2009-05-14 17:57:38.000000000 +0200
@@ -1,3 +1,15 @@
+14/5/2009: v3.4.0
+ - s390: merge OSAHWAddr feature from SLES10 (bnc#479481)
+ - s390: ask for relative port number even when device parameters
+ have been entered manually (bnc#477918)
+ - netsetup option is not used when doing network install (bnc #495525)
+ - reintegrate zenworks imaging options
+
+19/2/2009: v3.3.33
+ - s390: falling back to manual mode in network setup has nasty side
+ effects and is not really necessary to begin with; do away with it
+ (bnc#471452)
+
13/2/2009: v3.3.32
- call gpg with '--ignore-valid-from --ignore-time-conflict' to avoid
failing on systems with broken date/time (bnc #456755)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/file.c new/linuxrc-3.4.0/file.c
--- old/linuxrc-3.3.32/file.c 2009-01-19 13:50:16.000000000 +0100
+++ new/linuxrc-3.4.0/file.c 2009-05-14 17:56:34.000000000 +0200
@@ -238,10 +238,13 @@
{ key_osainterface, "OSAInterface", kf_cfg + kf_cmd },
{ key_layer2, "Layer2", kf_cfg + kf_cmd
},
{ key_portno, "PortNo", kf_cfg + kf_cmd },
+ { key_osahwaddr, "OSAHWAddr", kf_cfg + kf_cmd },
#endif
{ key_netwait, "NetWait", kf_cfg + kf_cmd },
{ key_newid, "NewID", kf_cfg + kf_cmd_early },
{ key_moduledisks, "ModuleDisks", kf_cfg + kf_cmd },
+ { key_zen, "Zen", kf_cfg + kf_cmd + kf_cmd_early },
+ { key_zenconfig, "ZenConfig", kf_cfg + kf_cmd + kf_cmd_early },
{ key_port, "Port", kf_none },
{ key_smbshare, "Share", kf_none },
{ key_rootimage2, "RootImage2", kf_cfg + kf_cmd },
@@ -1192,6 +1195,9 @@
case key_portno:
if(f->is.numeric) config.hwp.portno = f->nvalue + 1;
break;
+ case key_osahwaddr:
+ if(*f->value) str_copy(&config.hwp.osahwaddr, f->value);
+ break;
#endif
case key_netwait:
@@ -1206,6 +1212,14 @@
if(f->is.numeric) config.module.disks = f->nvalue;
break;
+ case key_zen:
+ if(f->is.numeric) config.zen = f->nvalue;
+ break;
+
+ case key_zenconfig:
+ if(*f->value) str_copy(&config.zenconfig, f->value);
+ break;
+
case key_rootimage2:
if(*f->value) str_copy(&config.rootimage2, f->value);
break;
@@ -1761,6 +1775,10 @@
file_write_str(f, key_netid, config.net.unique_id);
file_write_str(f, key_nethwaddr, config.net.hwaddr);
file_write_str(f, key_netcardname, config.net.cardname);
+#if defined(__s390__) || defined(__s390x__)
+ if(config.hwp.osahwaddr) file_write_str(f, key_osahwaddr,
config.hwp.osahwaddr);
+ if(config.hwp.layer2) file_write_num(f, key_layer2, config.hwp.layer2 - 1);
+#endif
file_write_str(f, key_ethtool, config.net.ethtool_used);
file_write_inet2(f, key_ip, &config.net.hostname, INET_WRITE_IP_BOTH +
INET_WRITE_PREFIX);
if(config.net.realhostname) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/file.h new/linuxrc-3.4.0/file.h
--- old/linuxrc-3.3.32/file.h 2008-11-11 16:19:00.000000000 +0100
+++ new/linuxrc-3.4.0/file.h 2009-05-14 17:56:34.000000000 +0200
@@ -49,7 +49,8 @@
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_efi, key_supporturl, key_portno
+ key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno,
+ key_osahwaddr, key_zen, key_zenconfig
} file_key_t;
typedef enum {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/global.h new/linuxrc-3.4.0/global.h
--- old/linuxrc-3.3.32/global.h 2008-11-11 17:43:40.000000000 +0100
+++ new/linuxrc-3.4.0/global.h 2009-05-14 17:56:34.000000000 +0200
@@ -325,6 +325,8 @@
unsigned forceip:1; /* do not check for duplicate IP address */
unsigned mediacheck:1; /* check media */
unsigned installfilesread:1; /* already got install files */
+ unsigned zen; /* zenworks mode */
+ char *zenconfig; /* zenworks config file */
unsigned has_pcmcia:1; /* we've seen a pcmcia chip */
unsigned ntfs_3g:1; /* use ntfs-3g */
unsigned secure:1; /* secure mode (check sha1 of all downloaded
files) */
@@ -588,6 +590,7 @@
int medium;
int layer2;
int portno;
+ char* osahwaddr;
} hwp;
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/linuxrc.c new/linuxrc-3.4.0/linuxrc.c
--- old/linuxrc-3.3.32/linuxrc.c 2009-01-20 15:59:56.000000000 +0100
+++ new/linuxrc-3.4.0/linuxrc.c 2009-05-14 17:56:34.000000000 +0200
@@ -744,6 +744,8 @@
config.update.map = calloc(1, MAX_UPDATES);
+ config.zenconfig = strdup("settings.txt");
+
util_set_product_dir("suse");
config.net.bootp_timeout = 10;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/net.c new/linuxrc-3.4.0/net.c
--- old/linuxrc-3.3.32/net.c 2009-02-11 15:53:45.000000000 +0100
+++ new/linuxrc-3.4.0/net.c 2009-05-14 17:51:13.000000000 +0200
@@ -32,6 +32,7 @@
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
+#include <netinet/ether.h>
#include <nfs/nfs.h>
#include "nfs_mount4.h"
@@ -2152,12 +2153,11 @@
#if defined(__s390__) || defined(__s390x__)
-/* switch to manual mode if expr is false, execute following statement if in
manual mode */
-#define IFNOTAUTO(expr) if(!config.manual && !(expr)) { \
- config.manual=1; \
- if(!config.win) util_disp_init(); \
+/* turn on display and execute if expr is false */
+#define IFNOTAUTO(expr) if(!(expr) && !config.win) { \
+ util_disp_init(); \
} \
- if(config.manual)
+ if(config.manual || !(expr))
#include <dirent.h>
@@ -2398,7 +2398,7 @@
else
rc=config.hwp.medium;
- if(hd && hd->is.dualport)
+ if(!hd || hd->is.dualport)
{
IFNOTAUTO(config.hwp.portno)
{
@@ -2436,6 +2436,11 @@
{
config.hwp.layer2 = dia_yesno(txt_get(TXT_ENABLE_LAYER2), YES) ==
YES ? 2 : 1;
}
+ if(config.hwp.layer2 == 2) {
+ IFNOTAUTO(config.hwp.osahwaddr) {
+ dia_input2(txt_get(TXT_HWADDR), &config.hwp.osahwaddr, 17, 1);
+ }
+ }
}
}
@@ -2513,6 +2518,41 @@
return -1;
}
+ if(config.hwp.osahwaddr && strlen(config.hwp.osahwaddr) > 0) {
+ struct ifreq ifr;
+ struct ether_addr* ea;
+ int skfd;
+ DIR* d;
+ struct dirent* de;
+ char* ifname;
+
+ net_s390_get_ifname(config.hwp.readchan, &ifname);
+ strcpy(ifr.ifr_name, ifname);
+ free(ifname);
+
+ if((skfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
+ perror("socket");
+ return 1;
+ }
+
+ /* convert MAC address to binary */
+ if((ea = ether_aton(config.hwp.osahwaddr)) == NULL) {
+ fprintf(stderr,"MAC address invalid: %s\n", config.hwp.osahwaddr);
+ return 1;
+ }
+ memcpy((void*) &ifr.ifr_hwaddr.sa_data[0], ea, ETHER_ADDR_LEN);
+
+ //ifr.ifr_hwaddr.sa_len = ETHER_ADDR_LEN
+ ifr.ifr_hwaddr.sa_family = AF_UNIX;
+
+ if(ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
+ fprintf(stderr, "SIOCSIFHWADDR: %s\n", strerror(errno));
+ close(skfd);
+ return 1;
+ }
+ close(skfd);
+ }
+
if (device) {
if (config.hwp.type == di_390net_iucv)
strprintf(device, "iucv0"); /* bold assumption */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/af.po new/linuxrc-3.4.0/po/af.po
--- old/linuxrc-3.3.32/po/af.po 2009-01-12 16:11:32.000000000 +0100
+++ new/linuxrc-3.4.0/po/af.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/bg.po new/linuxrc-3.4.0/po/bg.po
--- old/linuxrc-3.3.32/po/bg.po 2009-01-12 16:11:32.000000000 +0100
+++ new/linuxrc-3.4.0/po/bg.po 2009-05-14 17:51:13.000000000 +0200
@@ -1242,3 +1242,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/ca.po new/linuxrc-3.4.0/po/ca.po
--- old/linuxrc-3.3.32/po/ca.po 2009-01-12 16:11:32.000000000 +0100
+++ new/linuxrc-3.4.0/po/ca.po 2009-05-14 17:51:13.000000000 +0200
@@ -1239,3 +1239,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/cs.po new/linuxrc-3.4.0/po/cs.po
--- old/linuxrc-3.3.32/po/cs.po 2009-01-12 16:11:32.000000000 +0100
+++ new/linuxrc-3.4.0/po/cs.po 2009-05-14 17:51:13.000000000 +0200
@@ -1241,3 +1241,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Neplatný podpis"
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/da.po new/linuxrc-3.4.0/po/da.po
--- old/linuxrc-3.3.32/po/da.po 2009-01-12 16:11:33.000000000 +0100
+++ new/linuxrc-3.4.0/po/da.po 2009-05-14 17:51:13.000000000 +0200
@@ -1241,3 +1241,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/de.po new/linuxrc-3.4.0/po/de.po
--- old/linuxrc-3.3.32/po/de.po 2009-01-12 16:11:33.000000000 +0100
+++ new/linuxrc-3.4.0/po/de.po 2009-05-14 17:51:13.000000000 +0200
@@ -1240,3 +1240,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Ungültige Signatur."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/el.po new/linuxrc-3.4.0/po/el.po
--- old/linuxrc-3.3.32/po/el.po 2009-01-12 16:11:33.000000000 +0100
+++ new/linuxrc-3.4.0/po/el.po 2009-05-14 17:51:13.000000000 +0200
@@ -1245,3 +1245,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/es.po new/linuxrc-3.4.0/po/es.po
--- old/linuxrc-3.3.32/po/es.po 2009-01-12 16:11:33.000000000 +0100
+++ new/linuxrc-3.4.0/po/es.po 2009-05-14 17:51:13.000000000 +0200
@@ -1242,3 +1242,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Firma no válida."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/fi.po new/linuxrc-3.4.0/po/fi.po
--- old/linuxrc-3.3.32/po/fi.po 2009-01-12 16:11:33.000000000 +0100
+++ new/linuxrc-3.4.0/po/fi.po 2009-05-14 17:51:13.000000000 +0200
@@ -1240,3 +1240,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/fr.po new/linuxrc-3.4.0/po/fr.po
--- old/linuxrc-3.3.32/po/fr.po 2009-01-12 16:11:33.000000000 +0100
+++ new/linuxrc-3.4.0/po/fr.po 2009-05-14 17:51:13.000000000 +0200
@@ -1410,3 +1410,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Signature non valide."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/hu.po new/linuxrc-3.4.0/po/hu.po
--- old/linuxrc-3.3.32/po/hu.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/hu.po 2009-05-14 17:51:13.000000000 +0200
@@ -1246,3 +1246,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Érvénytelen aláírás."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/it.po new/linuxrc-3.4.0/po/it.po
--- old/linuxrc-3.3.32/po/it.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/it.po 2009-05-14 17:51:13.000000000 +0200
@@ -1235,3 +1235,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Firma non valida."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/ja.po new/linuxrc-3.4.0/po/ja.po
--- old/linuxrc-3.3.32/po/ja.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/ja.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "無効な署名です。"
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/linuxrc.pot
new/linuxrc-3.4.0/po/linuxrc.pot
--- old/linuxrc-3.3.32/po/linuxrc.pot 2008-10-31 12:58:39.000000000 +0100
+++ new/linuxrc-3.4.0/po/linuxrc.pot 2009-05-14 17:51:13.000000000 +0200
@@ -1188,3 +1188,7 @@
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/nb.po new/linuxrc-3.4.0/po/nb.po
--- old/linuxrc-3.3.32/po/nb.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/nb.po 2009-05-14 17:51:13.000000000 +0200
@@ -1242,3 +1242,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/nl.po new/linuxrc-3.4.0/po/nl.po
--- old/linuxrc-3.3.32/po/nl.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/nl.po 2009-05-14 17:51:13.000000000 +0200
@@ -1238,3 +1238,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Ongeldige ondertekening."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/pl.po new/linuxrc-3.4.0/po/pl.po
--- old/linuxrc-3.3.32/po/pl.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/pl.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Nieprawidłowy podpis."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/pt_BR.po
new/linuxrc-3.4.0/po/pt_BR.po
--- old/linuxrc-3.3.32/po/pt_BR.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/pt_BR.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Assinatura inválida."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/pt.po new/linuxrc-3.4.0/po/pt.po
--- old/linuxrc-3.3.32/po/pt.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/pt.po 2009-05-14 17:51:13.000000000 +0200
@@ -1241,3 +1241,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/ru.po new/linuxrc-3.4.0/po/ru.po
--- old/linuxrc-3.3.32/po/ru.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/ru.po 2009-05-14 17:51:13.000000000 +0200
@@ -1232,3 +1232,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Недействительная подпись."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/sk.po new/linuxrc-3.4.0/po/sk.po
--- old/linuxrc-3.3.32/po/sk.po 2009-01-12 16:11:34.000000000 +0100
+++ new/linuxrc-3.4.0/po/sk.po 2009-05-14 17:51:13.000000000 +0200
@@ -1243,3 +1243,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/sl.po new/linuxrc-3.4.0/po/sl.po
--- old/linuxrc-3.3.32/po/sl.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/sl.po 2009-05-14 17:51:13.000000000 +0200
@@ -1237,3 +1237,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/sv.po new/linuxrc-3.4.0/po/sv.po
--- old/linuxrc-3.3.32/po/sv.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/sv.po 2009-05-14 17:51:13.000000000 +0200
@@ -1239,3 +1239,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "Ogiltig signatur."
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/uk.po new/linuxrc-3.4.0/po/uk.po
--- old/linuxrc-3.3.32/po/uk.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/uk.po 2009-05-14 17:51:13.000000000 +0200
@@ -1241,3 +1241,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/xh.po new/linuxrc-3.4.0/po/xh.po
--- old/linuxrc-3.3.32/po/xh.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/xh.po 2009-05-14 17:51:13.000000000 +0200
@@ -1233,3 +1233,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/zh_CN.po
new/linuxrc-3.4.0/po/zh_CN.po
--- old/linuxrc-3.3.32/po/zh_CN.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/zh_CN.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "无效签名。"
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/zh_TW.po
new/linuxrc-3.4.0/po/zh_TW.po
--- old/linuxrc-3.3.32/po/zh_TW.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/zh_TW.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr "無效的簽章。"
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/po/zu.po new/linuxrc-3.4.0/po/zu.po
--- old/linuxrc-3.3.32/po/zu.po 2009-01-12 16:11:35.000000000 +0100
+++ new/linuxrc-3.4.0/po/zu.po 2009-05-14 17:51:13.000000000 +0200
@@ -1236,3 +1236,7 @@
#. TXT_INVALID_SIGNATURE
msgid "Invalid signature."
msgstr ""
+#. TXT_HWADDR
+msgid "MAC address"
+msgstr ""
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/url.c new/linuxrc-3.4.0/url.c
--- old/linuxrc-3.3.32/url.c 2009-02-13 14:46:29.000000000 +0100
+++ new/linuxrc-3.4.0/url.c 2009-05-14 17:59:41.000000000 +0200
@@ -30,6 +30,7 @@
#include "slp.h"
#include "dialog.h"
#include "display.h"
+#include "auto2.h"
#include "url.h"
#define CRAMFS_SUPER_MAGIC 0x28cd3d45
@@ -1836,15 +1837,21 @@
config.sha1 = slist_free(config.sha1);
config.sha1_failed = 0;
+ strprintf(&buf, "/%s", config.zen ? config.zenconfig : "content");
+ strprintf(&buf2, "file:%s", buf);
+
if(
- url_read_file(url, NULL, "/content", "/content", NULL,
+ url_read_file(url, NULL, buf, buf, NULL,
URL_FLAG_NOSHA1 + (config.secure ? URL_FLAG_CHECK_SIG : 0)
)
) return 0;
if(!config.sig_failed) {
- file_read_info_file("file:/content", kf_cont);
+ file_read_info_file(buf2, config.zen ? kf_cont + kf_cfg : kf_cont);
}
+
+ str_copy(&buf, NULL);
+ str_copy(&buf2, NULL);
}
if(config.url.instsys->scheme != inst_rel || config.kexec) return 1;
@@ -2259,7 +2266,9 @@
if(url->is.wlan && wlan_setup()) return 0;
- config.net.configured = nc_static;
+ if((config.net.do_setup & DS_SETUP)) auto2_user_netconfig();
+
+ if(config.net.configured == nc_none) config.net.configured = nc_static;
/* we need at least ip & netmask for static network config */
if((net_config_mask() & 3) != 3) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/linuxrc-3.3.32/VERSION new/linuxrc-3.4.0/VERSION
--- old/linuxrc-3.3.32/VERSION 2009-02-13 14:47:07.000000000 +0100
+++ new/linuxrc-3.4.0/VERSION 2009-05-14 17:57:56.000000000 +0200
@@ -1 +1 @@
-3.3.32
+3.4.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |