Hello community, here is the log from the commit of package linuxrc checked in at Mon Feb 4 17:38:56 CET 2008. -------- --- linuxrc/linuxrc.changes 2008-01-30 12:34:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-02-04 17:23:11.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Feb 4 17:22:57 CET 2008 - snwint@suse.de + +- pass 'yepurl'& 'yepcert' options to yast (fate #303335) +- when doing a network install, check if the IP address of the machine + to be installed is already in use by another machine (#fate 302027). + This check can be suppressed with parameter "forceip=1" either on + the command line or in the configuration file +- when parameter "mediacheck" is set to 1, perform check of the installation + media (fate #302993). When problems are found, fall into manual mode. +- allow media check to be interrupted by pressing the ESC key + +------------------------------------------------------------------- Old: ---- linuxrc-3.1.1.tar.bz2 New: ---- linuxrc-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.kj4552/_old 2008-02-04 17:38:24.000000000 +0100 +++ /var/tmp/diff_new_pack.kj4552/_new 2008-02-04 17:38:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.1.1) +# spec file for package linuxrc (Version 3.1.4) # # Copyright (c) 2008 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: 3.1.1 +Version: 3.1.4 Release: 1 -Source: linuxrc-3.1.1.tar.bz2 +Source: linuxrc-3.1.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,15 @@ %doc linuxrc.html %changelog +* Mon Feb 04 2008 snwint@suse.de +- pass 'yepurl'& 'yepcert' options to yast (fate #303335) +- when doing a network install, check if the IP address of the machine + to be installed is already in use by another machine (#fate 302027). + This check can be suppressed with parameter "forceip=1" either on + the command line or in the configuration file +- when parameter "mediacheck" is set to 1, perform check of the installation + media (fate #302993). When problems are found, fall into manual mode. +- allow media check to be interrupted by pressing the ESC key * Wed Jan 30 2008 snwint@suse.de - support root/rescue to be split into several separate images - add 'nomdns' option to turn off MDNS usage (#349467) ++++++ linuxrc-3.1.1.tar.bz2 -> linuxrc-3.1.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/Changelog new/linuxrc-3.1.4/Changelog --- old/linuxrc-3.1.1/Changelog 2008-01-30 12:21:41.000000000 +0100 +++ new/linuxrc-3.1.4/Changelog 2008-02-04 17:19:16.000000000 +0100 @@ -1,3 +1,17 @@ +4/2/2008: v3.1.4 + - when parameter "mediacheck" is set to 1, perform check of the installation + media (fate #302993). When problems are found, fall into manual mode. + - allow media check to be interrupted by pressing the ESC key + +4/2/2008: v3.1.3 + - when doing a network install, check if the IP address of the machine + to be installed is already in use by another machine (#fate 302027). + This check can be suppressed with parameter "forceip=1" either on + the command line or in the configuration file + +1/2/2008: v3.1.2 + - pass 'yepurl'& 'yepcert' options to yast (fate #303335) + 30/1/2008: v3.1.1 - support root/rescue to be split into several separate images - add 'nomdns' option to turn off MDNS usage (#349467) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/checkmd5.c new/linuxrc-3.1.4/checkmd5.c --- old/linuxrc-3.1.1/checkmd5.c 2007-09-07 16:51:49.000000000 +0200 +++ new/linuxrc-3.1.4/checkmd5.c 2008-02-04 17:19:16.000000000 +0100 @@ -11,6 +11,7 @@ #include "dialog.h" #include "util.h" #include "md5.h" +#include "keyboard.h" static void do_md5(char *file); static void get_info(char *file); @@ -64,6 +65,7 @@ if(iso.err) { dia_message(txt_get(TXT_NO_CD_DVD), MSGTYPE_ERROR); + config.manual=1; return; } @@ -83,6 +85,7 @@ if(!*iso.app_id || !iso.got_old_md5 || iso.pad >= iso.size) { sprintf(buf, txt_get(TXT_WRONG_CD), config.product); dia_message(buf, MSGTYPE_ERROR); + config.manual=1; return; } @@ -123,6 +126,7 @@ } sprintf(buf + strlen(buf), txt_get(TXT_CD_BROKEN), *iso.media_type == 'C' ? "CD-ROM" : iso.media_type); dia_message(buf, MSGTYPE_ERROR); + config.manual=1; } } @@ -172,6 +176,18 @@ md5_process_block(buffer, sizeof buffer, &ctx); update_progress((chunk + 1) * (sizeof buffer >> 10)); + + if (kbd_getch_old (FALSE) == KEY_ESC) { + md5_finish_ctx(&ctx, iso.md5); + md5_finish_ctx(&full_ctx, iso.full_md5); + dia_status_off(&win); + iso.got_md5 = 0; + iso.got_old_md5 = 0; + iso.md5_ok = 0; + iso.err_ofs = 0; + close(fd); + return; + } } if(!err && last_size) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/file.c new/linuxrc-3.1.4/file.c --- old/linuxrc-3.1.1/file.c 2008-01-30 12:17:35.000000000 +0100 +++ new/linuxrc-3.1.4/file.c 2008-02-04 17:19:16.000000000 +0100 @@ -247,6 +247,7 @@ { key_ethtool, "ethtool", kf_cfg + kf_cmd_early }, { key_listen, "listen", kf_cfg + kf_cmd }, { key_zombies, "Zombies", kf_cfg + kf_cmd }, + { key_forceip, "forceip", kf_cfg + kf_cmd }, { key_dhcpcd, "DHCPCD", kf_cfg + kf_cmd }, { key_wlan_essid, "WlanESSID", kf_cfg + kf_cmd }, { key_wlan_auth, "WlanAuth", kf_cfg + kf_cmd }, @@ -271,6 +272,9 @@ { key_nomodprobe, "nomodprobe", kf_cfg + kf_cmd_early }, { key_device, "Device", kf_cfg + kf_cmd }, { key_nomdns, "NoMDNS", kf_cfg + kf_cmd }, + { key_yepurl, "yepurl", kf_cfg + kf_cmd }, + { key_yepcert, "yepcert", kf_cfg + kf_cmd }, + { key_mediacheck, "mediacheck", kf_cfg + kf_cmd }, }; static struct { @@ -1261,6 +1265,14 @@ if(f->is.numeric) config.zombies = f->nvalue; break; + case key_mediacheck: + if(f->is.numeric) config.mediacheck = f->nvalue; + break; + + case key_forceip: + if(f->is.numeric) config.forceip = f->nvalue; + break; + case key_dhcpcd: if(*f->value) str_copy(&config.net.dhcpcd, f->value); break; @@ -1358,6 +1370,14 @@ } break; + case key_yepurl: + str_copy(&config.yepurl, f->value); + break; + + case key_yepcert: + str_copy(&config.yepcert, f->value); + break; + default: break; } @@ -1705,6 +1725,9 @@ } } + file_write_str(f, key_yepurl, config.yepurl); + file_write_str(f, key_yepcert, config.yepcert); + file_free_file(ft0); /* resolve module deps for initrd module list */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/file.h new/linuxrc-3.1.4/file.h --- old/linuxrc-3.1.1/file.h 2008-01-25 14:41:41.000000000 +0100 +++ new/linuxrc-3.1.4/file.h 2008-02-04 17:19:16.000000000 +0100 @@ -41,13 +41,13 @@ key_port, key_smbshare, key_rootimage2, key_instsys_id, key_initrd_id, key_instsys_complain, key_osamedium, key_osainterface, key_dud_complain, key_dud_expected, key_staticdevices, - key_withiscsi, key_ethtool, key_listen, key_zombies, key_dhcpcd, + key_withiscsi, key_ethtool, key_listen, key_zombies, key_dhcpcd, key_forceip, key_layer2, key_wlan_essid, key_wlan_auth, key_wlan_key_ascii, key_wlan_key_hex, key_wlan_key_pass, key_wlan_key_len, key_netcardname, key_ibft_hwaddr, key_ibft_ipaddr, key_ibft_netmask, key_ibft_gateway, key_ibft_dns, key_net_retry, key_bootif, key_swap_size, key_ntfs_3g, key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe, key_device, - key_nomdns + key_nomdns, key_yepurl, key_yepcert, key_mediacheck } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/global.h new/linuxrc-3.1.4/global.h --- old/linuxrc-3.1.1/global.h 2008-01-30 11:52:30.000000000 +0100 +++ new/linuxrc-3.1.4/global.h 2008-02-04 17:19:16.000000000 +0100 @@ -314,6 +314,8 @@ unsigned startshell:1; /* start shell before & after yast */ unsigned listen:1; /* listen on port */ unsigned zombies:1; /* keep zombies around */ + unsigned forceip:1; /* do not check for duplicate IP address */ + unsigned mediacheck:1; /* check media */ unsigned installfilesread:1; /* already got install files */ unsigned has_pcmcia:1; /* we've seen a pcmcia chip */ unsigned ntfs_3g:1; /* use ntfs-3g */ @@ -337,6 +339,8 @@ unsigned add_cmdline:1; /* parse cmdline, too */ } info; char *autoyast; /* yast autoinstall parameter */ + char *yepurl; /* just pass it to yast */ + char *yepcert; /* just pass it to yast */ slist_t *linuxrc; /* 'linuxrc' parameters */ char *stderr_name; /* stderr device name */ int color; /* color scheme: 0-3: undef, mono, color, alternate */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/keyboard.c new/linuxrc-3.1.4/keyboard.c --- old/linuxrc-3.1.1/keyboard.c 2007-07-27 14:32:28.000000000 +0200 +++ new/linuxrc-3.1.4/keyboard.c 2008-02-04 17:19:16.000000000 +0100 @@ -2,7 +2,7 @@ * * keyboard.c Keyboard handling * - * Copyright (c) 1996-2002 Hubert Mantel, SuSE Linux AG (mantel@suse.de) + * Copyright (c) 1996-2008 Hubert Mantel, SuSE Linux AG (mantel@suse.de) * */ @@ -370,6 +370,70 @@ tcsetattr (config.kbd_fd, TCSAFLUSH, &tios); } +int kbd_getch_old (int wait_iv) + { +#define KBD_ESC_DELAY 25000 +#define KEY_FUNC 0x0800 + char keypress_ci; + char tmp_ci; + int i_ii; + + + keypress_ci = 0; + do + { + kbd_set_timeout (KBD_TIMEOUT); + read (config.kbd_fd, &keypress_ci, 1); + kbd_del_timeout (); + } + while (!keypress_ci && wait_iv); + + if (!keypress_ci) + return (0); + + if (keypress_ci != KEY_ESC) + return ((int) keypress_ci); + + kbd_set_timeout (KBD_ESC_DELAY); + + read (config.kbd_fd, &keypress_ci, 1); + if (kbd_timeout_im) + return ((int) KEY_ESC); + else + kbd_del_timeout (); + + if (keypress_ci != 91) + return (0); + + read (config.kbd_fd, &keypress_ci, 1); + if (keypress_ci == (KEY_UP & 0xff) || + keypress_ci == (KEY_DOWN & 0xff) || + keypress_ci == (KEY_RIGHT & 0xff) || + keypress_ci == (KEY_LEFT & 0xff)) + return (((int) keypress_ci) | KEY_SPECIAL); + + i_ii = 0; + kbd_set_timeout (KBD_ESC_DELAY); + + do + { + tmp_ci = keypress_ci; + read (config.kbd_fd, &keypress_ci, 1); + i_ii++; + } + while (!kbd_timeout_im && keypress_ci != 126); + + kbd_del_timeout (); + + if (keypress_ci != 126) + return (0); + + if (i_ii == 2) + return (((int) tmp_ci) | KEY_SPECIAL | KEY_FUNC); + else + return (((int) tmp_ci) | KEY_SPECIAL); + } + /* * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/keyboard.h new/linuxrc-3.1.4/keyboard.h --- old/linuxrc-3.1.1/keyboard.h 2005-10-24 16:48:50.000000000 +0200 +++ new/linuxrc-3.1.4/keyboard.h 2008-02-04 17:19:16.000000000 +0100 @@ -2,7 +2,7 @@ * * keyboard.h Header file for keyboard.c * - * Copyright (c) 1996-2002 Hubert Mantel, SuSE Linux AG (mantel@suse.de) + * Copyright (c) 1996-2008 Hubert Mantel, SuSE Linux AG (mantel@suse.de) * */ @@ -65,4 +65,5 @@ extern void kbd_clear_buffer (void); extern void kbd_switch_tty (int tty_iv); extern void kbd_echo_off (void); +extern int kbd_getch_old (int); void kbd_unimode(void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/linuxrc.c new/linuxrc-3.1.4/linuxrc.c --- old/linuxrc-3.1.1/linuxrc.c 2008-01-29 18:14:44.000000000 +0100 +++ new/linuxrc-3.1.4/linuxrc.c 2008-02-04 17:19:16.000000000 +0100 @@ -2,7 +2,7 @@ * * linuxrc.c Load modules and rootimage to ramdisk * - * Copyright (c) 1996-2004 Hubert Mantel, SuSE Linux AG (mantel@suse.de) + * Copyright (c) 1996-2008 Hubert Mantel, SuSE Linux AG (mantel@suse.de) * */ @@ -227,6 +227,9 @@ if(!win_old) util_disp_done(); } + if(config.mediacheck) + md5_verify(); + if(!config.manual) { if(config.rescue && !config.serial) { int win_old = 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/net.c new/linuxrc-3.1.4/net.c --- old/linuxrc-3.1.1/net.c 2007-11-07 15:44:40.000000000 +0100 +++ new/linuxrc-3.1.4/net.c 2008-02-04 14:01:48.000000000 +0100 @@ -391,6 +391,8 @@ struct rtentry route_ri; struct sockaddr_in sockaddr_ri; int error_ii = FALSE; + char command[1000]; + int rc; if(!config.net.ifconfig || config.net.dhcp_active || config.net.keep) return 0; @@ -409,6 +411,33 @@ net_apply_ethtool(config.net.device, config.net.hwaddr); + if (!config.forceip) { + sprintf(command, "ifconfig %s up", config.net.device); + fprintf(stderr, "net_activate: %s\n", command); + rc = system(command); + if (rc) { + fprintf(stderr, "net_activate: ifconfig %s up failed!\n", config.net.device); + return 1; + } + + sleep(config.net.ifup_wait + 2); + + sprintf(command, "arping -c 1 -I %s -D %s 1>&2", config.net.device, inet_ntoa(config.net.hostname.ip)); + fprintf(stderr, "net_activate: %s\n", command); + rc = system(command); + + sprintf(command, "ifconfig %s down", config.net.device); + (void)system (command); + fprintf(stderr, "net_activate: %s\n", command); + + if (rc) { + fprintf(stderr, "net_activate: address %s in use by another machine!\n", inet_ntoa(config.net.hostname.ip)); + sprintf(command, txt_get(TXT_IP_ADDRESS_IN_USE), inet_ntoa(config.net.hostname.ip)); + dia_message(command, MSGTYPE_ERROR); + return 1; + } + } + socket_ii = socket (AF_INET, SOCK_DGRAM, 0); if (socket_ii == -1) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/af.po new/linuxrc-3.1.4/po/af.po --- old/linuxrc-3.1.1/po/af.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/af.po 2008-02-04 14:01:48.000000000 +0100 @@ -1159,3 +1159,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/bg.po new/linuxrc-3.1.4/po/bg.po --- old/linuxrc-3.1.1/po/bg.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/bg.po 2008-02-04 14:01:48.000000000 +0100 @@ -1165,3 +1165,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/ca.po new/linuxrc-3.1.4/po/ca.po --- old/linuxrc-3.1.1/po/ca.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/ca.po 2008-02-04 14:01:48.000000000 +0100 @@ -1162,3 +1162,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/cs.po new/linuxrc-3.1.4/po/cs.po --- old/linuxrc-3.1.1/po/cs.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/cs.po 2008-02-04 14:01:48.000000000 +0100 @@ -1169,3 +1169,8 @@ "Kontrolní součet repozitáře nebyl úspěšný.\n" "\n" "Pokud repozitáři skutečně důvěřujete, můžete pokračovat v nezabezpečeném režimu." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/da.po new/linuxrc-3.1.4/po/da.po --- old/linuxrc-3.1.1/po/da.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/da.po 2008-02-04 14:01:48.000000000 +0100 @@ -1166,3 +1166,8 @@ "Beklager, softwarekilden fejlede checksum-test.\n" "\n" "Hvis du virkelig har tillid til softwarekilden kan du fortsætte i usikker tilstand." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/de.po new/linuxrc-3.1.4/po/de.po --- old/linuxrc-3.1.1/po/de.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/de.po 2008-02-04 14:01:48.000000000 +0100 @@ -1170,3 +1170,8 @@ "Leider ist der Prüfsummentest der Installationsquelle Fehlgeschlagen.\n" "\n" "Falls Sie der Installationsquelle wirklich vertrauen, können Sie in einem unsicheren Modus fortfahren." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/el.po new/linuxrc-3.1.4/po/el.po --- old/linuxrc-3.1.1/po/el.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/el.po 2008-02-04 14:01:48.000000000 +0100 @@ -1168,3 +1168,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/es.po new/linuxrc-3.1.4/po/es.po --- old/linuxrc-3.1.1/po/es.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/es.po 2008-02-04 14:01:48.000000000 +0100 @@ -1166,3 +1166,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/fi.po new/linuxrc-3.1.4/po/fi.po --- old/linuxrc-3.1.1/po/fi.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/fi.po 2008-02-04 14:01:48.000000000 +0100 @@ -1165,3 +1165,8 @@ "Asennuslähteen tarkistussumman testaus epäonnistui.\n" "\n" "Jos luotat asennuslähteeseen, voit jatkaa turvaamattomassa tilassa.." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/fr.po new/linuxrc-3.1.4/po/fr.po --- old/linuxrc-3.1.1/po/fr.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/fr.po 2008-02-04 14:01:48.000000000 +0100 @@ -1337,3 +1337,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/hu.po new/linuxrc-3.1.4/po/hu.po --- old/linuxrc-3.1.1/po/hu.po 2007-09-11 17:11:30.000000000 +0200 +++ new/linuxrc-3.1.4/po/hu.po 2008-02-04 14:01:48.000000000 +0100 @@ -1172,3 +1172,8 @@ "A telepítési forrás ellenőrzőösszegének ellenőrzése sikertelen.\n" "\n" "Amennyiben a telepítési forrást valóban megbízhatónak tartja, folytathatja a munkát nem megbízható módban." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/it.po new/linuxrc-3.1.4/po/it.po --- old/linuxrc-3.1.1/po/it.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/it.po 2008-02-04 14:01:48.000000000 +0100 @@ -1163,3 +1163,8 @@ "Spiacente, la verifica del checksum della sorgente di installazione è falliton.\n" "\n" "Se si è sicuri dell'affidabilità della sorgente di installazione, è possibile continuare in modalità non sicura." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/ja.po new/linuxrc-3.1.4/po/ja.po --- old/linuxrc-3.1.1/po/ja.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/ja.po 2008-02-04 14:01:48.000000000 +0100 @@ -1162,3 +1162,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/linuxrc.pot new/linuxrc-3.1.4/po/linuxrc.pot --- old/linuxrc-3.1.1/po/linuxrc.pot 2007-08-09 17:51:24.000000000 +0200 +++ new/linuxrc-3.1.4/po/linuxrc.pot 2008-02-04 14:01:48.000000000 +0100 @@ -1111,3 +1111,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/nb.po new/linuxrc-3.1.4/po/nb.po --- old/linuxrc-3.1.1/po/nb.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/nb.po 2008-02-04 14:01:48.000000000 +0100 @@ -1168,3 +1168,8 @@ "Kontrollsumtesten for arkivet mislyktes.\n" "\n" "Hvis du stoler på dette arkivet, kan du fortsette i usikker modus." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/nl.po new/linuxrc-3.1.4/po/nl.po --- old/linuxrc-3.1.1/po/nl.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/nl.po 2008-02-04 14:01:48.000000000 +0100 @@ -1166,3 +1166,8 @@ "Helaas, installatiebron kwam niet door de controlesomtest.\n" "\n" "Als u deze bron echt vertrouwd, dan kunt u doorgaan in een onveilige modus." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/pl.po new/linuxrc-3.1.4/po/pl.po --- old/linuxrc-3.1.1/po/pl.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/pl.po 2008-02-04 14:01:48.000000000 +0100 @@ -1164,3 +1164,8 @@ "Test sumy kontrolnej repozytorium nie powiódł się.\n" "\n" "Jeśli repozytorium jest godne zaufania, istnieje możliwość kontynuowania pracy w trybie obniżonego bezpieczeństwa." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/pt_BR.po new/linuxrc-3.1.4/po/pt_BR.po --- old/linuxrc-3.1.1/po/pt_BR.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/pt_BR.po 2008-02-04 14:01:48.000000000 +0100 @@ -1163,3 +1163,8 @@ "Desculpe, o repositório falhou no teste do checksum.\n" "\n" "Se você realmente acredita neste repositório, você deve continuar em um modo inseguro." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/pt.po new/linuxrc-3.1.4/po/pt.po --- old/linuxrc-3.1.1/po/pt.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/pt.po 2008-02-04 14:01:48.000000000 +0100 @@ -1166,3 +1166,8 @@ "Desculpe, o teste de checksum do repositório falhou.\n" "\n" "Se realmente confiar no repositório, poderá continuar em um modo inseguro." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/ru.po new/linuxrc-3.1.4/po/ru.po --- old/linuxrc-3.1.1/po/ru.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/ru.po 2008-02-04 14:01:48.000000000 +0100 @@ -1159,3 +1159,8 @@ "Извините, неудалось проверить контрольную сумму репозаитария.\n" "\n" "Если вы действительно доверяете этому репозитарию, вы можете продолжить в небезопасном режиме." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/sk.po new/linuxrc-3.1.4/po/sk.po --- old/linuxrc-3.1.1/po/sk.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/sk.po 2008-02-04 14:01:48.000000000 +0100 @@ -1169,3 +1169,8 @@ "Ľutujeme, ale zlyhala kontrola kontrolného súčtu repozitára.\n" "\n" "Ak naozaj dôverujete repozitáru, môžete pokračovať, ale nie je to bezpečné." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/sl.po new/linuxrc-3.1.4/po/sl.po --- old/linuxrc-3.1.1/po/sl.po 2007-09-11 17:11:31.000000000 +0200 +++ new/linuxrc-3.1.4/po/sl.po 2008-02-04 14:01:48.000000000 +0100 @@ -1160,3 +1160,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/sv.po new/linuxrc-3.1.4/po/sv.po --- old/linuxrc-3.1.1/po/sv.po 2007-09-11 17:11:32.000000000 +0200 +++ new/linuxrc-3.1.4/po/sv.po 2008-02-04 14:01:48.000000000 +0100 @@ -1166,3 +1166,8 @@ "Misslyckades med att testa arkivets kontrollsumma.\n" "\n" "Om du litar på arkivet kan du fortsätta i osäkert läge." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/uk.po new/linuxrc-3.1.4/po/uk.po --- old/linuxrc-3.1.1/po/uk.po 2007-09-11 17:11:32.000000000 +0200 +++ new/linuxrc-3.1.4/po/uk.po 2008-02-04 14:01:48.000000000 +0100 @@ -1167,3 +1167,8 @@ "Вибачте, сховище не пройшло перевірку контрольної суми.\n" "\n" "Якщо ви дійсно довіряєте цьому сховищу, можете продовжити в незабезпеченому режимі." +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/xh.po new/linuxrc-3.1.4/po/xh.po --- old/linuxrc-3.1.1/po/xh.po 2007-09-11 17:11:32.000000000 +0200 +++ new/linuxrc-3.1.4/po/xh.po 2008-02-04 14:01:48.000000000 +0100 @@ -1156,3 +1156,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/zh_CN.po new/linuxrc-3.1.4/po/zh_CN.po --- old/linuxrc-3.1.1/po/zh_CN.po 2007-09-11 17:11:32.000000000 +0200 +++ new/linuxrc-3.1.4/po/zh_CN.po 2008-02-04 14:01:48.000000000 +0100 @@ -1165,3 +1165,8 @@ "抱歉,安装源完整性测试失败。\n" "\n" "如果您确信您的安装源可靠,可以在不安全模式下继续。" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/zh_TW.po new/linuxrc-3.1.4/po/zh_TW.po --- old/linuxrc-3.1.1/po/zh_TW.po 2007-09-11 17:11:32.000000000 +0200 +++ new/linuxrc-3.1.4/po/zh_TW.po 2008-02-04 14:01:48.000000000 +0100 @@ -1161,3 +1161,8 @@ "抱歉,套件庫無法通過 ckecksum 測試。\n" "\n" "如果您確實相信您的套件庫,您可以使用不安全模式繼續。" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/po/zu.po new/linuxrc-3.1.4/po/zu.po --- old/linuxrc-3.1.1/po/zu.po 2007-09-11 17:11:32.000000000 +0200 +++ new/linuxrc-3.1.4/po/zu.po 2008-02-04 14:01:48.000000000 +0100 @@ -1159,3 +1159,8 @@ "\n" "If you really trust your repository, you may continue in an insecure mode." msgstr "" +#. TXT_IP_ADDRESS_IN_USE +#, c-format +msgid "IP address %s is already in use by another machine!" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.1/VERSION new/linuxrc-3.1.4/VERSION --- old/linuxrc-3.1.1/VERSION 2008-01-15 11:39:32.000000000 +0100 +++ new/linuxrc-3.1.4/VERSION 2008-02-04 17:19:16.000000000 +0100 @@ -1 +1 @@ -3.1.1 +3.1.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org