3695 2004-02-13 19:17:16 +0300 zeroconf support 2005-07-13 15:45:50 +0400 1 1 4 Development Sisyphus net-scripts unstable all Linux CLOSED FIXED P2 enhancement --- 1 sbolshakov pilot ldv qa-sisyphus oldest_to_newest 11780 0 sbolshakov 2004-02-13 19:17:16 +0300 attached patch adds zeroconf support using zcip utility 11781 1 346 sbolshakov 2004-02-13 19:17:54 +0300 Created attachment 346 zcip support 12303 2 pilot 2004-03-17 22:33:06 +0300 ага 12377 3 360 pilot 2004-03-22 00:07:09 +0300 Created attachment 360 zcip support patch (fixed) 12378 4 pilot 2004-03-22 00:08:14 +0300 Принято в 0.4.2-alt1 со следующими поправками: --- net-scripts-0.3-zcip.patch.orig 2004-03-22 02:26:09 +0200 +++ net-scripts-0.3-zcip-good.patch 2004-03-22 02:26:43 +0200 @@ -57,7 +57,7 @@ fi +ZCIP=/sbin/zcip -+ZCIP_ARGS"-s -i $DEVICE" ++ZCIP_ARGS="-s -i $DEVICE" + if [ -n "$DYNCONFIG" ]; then echo -n "Determining IP information for $DEVICE via ${DHCP_CLIENT##*/}..." @@ -77,7 +77,7 @@ exit 1 fi -else -+elif [ "BOOTPROTO" = zcip ]; then ++elif [ "$BOOTPROTO" = zcip ]; then + echo -n "Determining IP information for $DEVICE via ${ZCIP##*/}..." + if $ZCIP $ZCIP_ARGS; then + echo " done." 13831 5 pilot 2004-05-15 14:06:34 +0400 Нашёл ещё одну ошибку в патче, исправляется в 0.4.7. 346 2004-02-13 19:17:54 +0300 2004-03-22 00:05:47 +0300 zcip support net-scripts-0.3-zcip.patch text/plain 2885 sbolshakov ZGlmZiAtdU5yIG5ldC1zY3JpcHRzLTAuMy1vcmlnL1JFQURNRSBuZXQtc2NyaXB0cy0wLjMvUkVB RE1FCi0tLSBuZXQtc2NyaXB0cy0wLjMtb3JpZy9SRUFETUUJMjAwMy0wNS0yOSAxNjoyNToxNSAr MDMwMAorKysgbmV0LXNjcmlwdHMtMC4zL1JFQURNRQkyMDA0LTAyLTEzIDE4OjExOjQ4ICswMjAw CkBAIC0yMDIsNyArMjAyLDcgQEAKICAgICBHQVRFV0FZPQogICAgIE9OQk9PVD15ZXN8bm8KICAg ICBVU0VSQ1RMPXllc3xubwotICAgIEJPT1RQUk9UTz1ub25lfGJvb3RwfGRoY3AKKyAgICBCT09U UFJPVE89bm9uZXwoYm9vdHB8ZGhjcHx6Y2lwKVssemNpcF0KICAgICBESENQX0NMSUVOVD0KICAg ICBNVFU9CiAgICAgUEVFUkROUz15ZXN8bm8KQEAgLTIxMiw2ICsyMTIsOCBAQAogICAgICAgcHJv dmlkZSBETlMgYWRkcmVzc2VzIHRoYXQgYXJlIGRyb3BwZWQgaW50byB0aGUgcmVzb2x2LmNvbmYK ICAgICAgIGZpbGUgaWYgUEVFUkROUyBpcyBub3Qgc2V0IHRvICJubyIuCiAKKyAgQk9PVFBST1RP IGNhbiBjb250YWluIG1vcmUgdGhhbiBvbmUgY29tbWEtc2VwYXJhdGVkIHZhbHVlLAorICBpbiBs YXR0ZXIgY2FzZSBmaXJzdCBzdWNjZWVkZWQgbWV0aG9kIHN0b3BzIGZ1cnRoZXIgYXR0ZW1wdHMu CiAgIElmIEJPT1RQUk9UTyBpcyBub3QgIm5vbmUiLCB0aGVuIHRoZSBvbmx5IG90aGVyIGl0ZW0g dGhhdAogICBtdXN0IGJlIHNldCBpcyB0aGUgREVWSUNFIGl0ZW07IGFsbCB0aGUgcmVzdCB3aWxs IGJlIGRldGVybWluZWQKICAgYnkgdGhlIGJvb3QgcHJvdG9jb2wuICBObyAiZHVtbXkiIGVudHJp ZXMgbmVlZCB0byBiZSBjcmVhdGVkLgpkaWZmIC11TnIgbmV0LXNjcmlwdHMtMC4zLW9yaWcvc3lz Y29uZmlnL25ldHdvcmstc2NyaXB0cy9pZnVwIG5ldC1zY3JpcHRzLTAuMy9zeXNjb25maWcvbmV0 d29yay1zY3JpcHRzL2lmdXAKLS0tIG5ldC1zY3JpcHRzLTAuMy1vcmlnL3N5c2NvbmZpZy9uZXR3 b3JrLXNjcmlwdHMvaWZ1cAkyMDAzLTA1LTIwIDE1OjQ2OjA2ICswMzAwCisrKyBuZXQtc2NyaXB0 cy0wLjMvc3lzY29uZmlnL25ldHdvcmstc2NyaXB0cy9pZnVwCTIwMDQtMDItMTMgMTg6MTE6NDgg KzAyMDAKQEAgLTU4LDYgKzU4LDggQEAKIAkiJFNCSU5fSVdDT05GSUciICR7REVWSUNFfSBlbmMg IiRXSVJFTEVTU19FTkNfS0VZIiA+L2Rldi9udWxsIDI+JjEKIGZpCiAKK0lGUz0sIHJlYWQgQk9P VFBST1RPIEJPT1RQUk9UT19GQUxMQkFDSyA8PDwgIiRCT09UUFJPVE8iCisKIGlmIFsgIiRCT09U UFJPVE8iID0gZGhjcCBdOyB0aGVuCiAgICAgRFlOQ09ORklHPXRydWUKIGZpCkBAIC0yMTMsNyAr MjE1LDggQEAKIGlmIFsgLW4gIiRESENQX0NMSUVOVCIgXTsgdGhlbgogY2FzZSAiJHtESENQX0NM SUVOVCMjKi99IiBpbgogCWRoY3BjZCkKLQkJWyAteiAiJERIQ1BfSE9TVE5BTUUiIF0gfHwgREhD UF9BUkdTPSItaCAkREhDUF9IT1NUTkFNRSIKKwkJWyAteiAiQk9PVFBST1RPX0ZBTExCQUNLIiBd IHx8IERIQ1BfQVJHUz0iLXQgMzAiCisJCVsgLXogIiRESENQX0hPU1ROQU1FIiBdIHx8IERIQ1Bf QVJHUz0iJERIQ1BfQVJHUyAtaCAkREhDUF9IT1NUTkFNRSIKIAkJWyAteiAiJE5FRURIT1NUTkFN RSIgXSB8fCBESENQX0FSR1M9IiRESENQX0FSR1MgLUgiCiAJCWlzX3llcyAiJFBFRVJOVFAiIHx8 IERIQ1BfQVJHUz0iJERIQ1BfQVJHUyAtTiIKIAkJISBpc19ubyAiJFBFRVJETlMiIHx8IERIQ1Bf QVJHUz0iJERIQ1BfQVJHUyAtUiIKQEAgLTIzMiwyMiArMjM1LDQ1IEBACiAJCURIQ1BfQVJHUz0i JERIQ1BfQVJHUyAtdyAkREVWSUNFIgogCQk7OwogCWRoY2xpZW50KQorCQkjIFdlIHNob3VsZCBs aW1pdCBkaGNsaWVudCBhY3Rpdml0eSB0byBmaXJzdCB0cnkKKwkJIyBpZiB3ZSBoYXZlIGZhbGxi YWNrIG1ldGhvZAorCQlbIC16ICJCT09UUFJPVE9fRkFMTEJBQ0siIF0gfHwgREhDUF9BUkdTPSIt MSIKIAkJIyBDYW4ndCBzcGVjaWZ5IGEgaG9zdCB3aXRoIGRoY2xpZW50ID8gc2FtZSByZW1hcmsg Zm9yCiAJCSMgJE5FRURIT1NUTkFNRSB0aGlzIGNsaWVudCBzdWNrICEhIQotCQlESENQX0FSR1M9 IiRERVZJQ0UiCisJCURIQ1BfQVJHUz0iJERIQ1BfQVJHUyAkREVWSUNFIgogCQk7OwogZXNhYwog ZmkKIAorWkNJUD0vc2Jpbi96Y2lwCitaQ0lQX0FSR1MiLXMgLWkgJERFVklDRSIKKwogaWYgWyAt biAiJERZTkNPTkZJRyIgXTsgdGhlbgogICAgIGVjaG8gLW4gIkRldGVybWluaW5nIElQIGluZm9y bWF0aW9uIGZvciAkREVWSUNFIHZpYSAke0RIQ1BfQ0xJRU5UIyMqL30uLi4iCiAgICAgaWYgJERI Q1BfQ0xJRU5UICRESENQX0FSR1M7IHRoZW4KIAllY2hvICIgZG9uZS4iCisgICAgZWxpZiBbICIk Qk9PVFBST1RPX0ZBTExCQUNLIiA9IHpjaXAgXTsgdGhlbgorCWVjaG8gCisJZWNobyAtbiAiRGV0 ZXJtaW5pbmcgSVAgaW5mb3JtYXRpb24gZm9yICRERVZJQ0UgdmlhICR7WkNJUCMjKi99Li4uIgor CWlmICRaQ0lQICRaQ0lQX0FSR1M7IHRoZW4KKwkgICAgZWNobyAiIGRvbmUuIgorCWVsc2UKKwkg ICAgZWNobyAiIGZhaWxlZC4iCisJICAgIGV4aXQgMQorCWZpCiAgICAgZWxzZQogCWVjaG8gIiBm YWlsZWQuIgogCWV4aXQgMQogICAgIGZpCi1lbHNlIAorZWxpZiBbICJCT09UUFJPVE8iID0gemNp cCBdOyB0aGVuCisgICAgZWNobyAtbiAiRGV0ZXJtaW5pbmcgSVAgaW5mb3JtYXRpb24gZm9yICRE RVZJQ0UgdmlhICR7WkNJUCMjKi99Li4uIgorICAgIGlmICRaQ0lQICRaQ0lQX0FSR1M7IHRoZW4K KwllY2hvICIgZG9uZS4iCisgICAgZWxzZSAKKwllY2hvICIgZmFpbGVkLiIKKwlleGl0IDEKKyAg ICBmaQorZWxzZQogICAgIGlmIFsgLXogIiRORVRNQVNLIiBdOyB0aGVuCiAJZXZhbCBgL2Jpbi9p cGNhbGMgLS1uZXRtYXNrICIkSVBBRERSImAKICAgICBmaQo= 360 2004-03-22 00:07:09 +0300 2004-03-22 00:07:09 +0300 zcip support patch (fixed) net-scripts-0.3-zcip-good.patch text/plain 2887 pilot ZGlmZiAtdU5yIG5ldC1zY3JpcHRzLTAuMy1vcmlnL1JFQURNRSBuZXQtc2NyaXB0cy0wLjMvUkVB RE1FCi0tLSBuZXQtc2NyaXB0cy0wLjMtb3JpZy9SRUFETUUJMjAwMy0wNS0yOSAxNjoyNToxNSAr MDMwMAorKysgbmV0LXNjcmlwdHMtMC4zL1JFQURNRQkyMDA0LTAyLTEzIDE4OjExOjQ4ICswMjAw CkBAIC0yMDIsNyArMjAyLDcgQEAKICAgICBHQVRFV0FZPQogICAgIE9OQk9PVD15ZXN8bm8KICAg ICBVU0VSQ1RMPXllc3xubwotICAgIEJPT1RQUk9UTz1ub25lfGJvb3RwfGRoY3AKKyAgICBCT09U UFJPVE89bm9uZXwoYm9vdHB8ZGhjcHx6Y2lwKVssemNpcF0KICAgICBESENQX0NMSUVOVD0KICAg ICBNVFU9CiAgICAgUEVFUkROUz15ZXN8bm8KQEAgLTIxMiw2ICsyMTIsOCBAQAogICAgICAgcHJv dmlkZSBETlMgYWRkcmVzc2VzIHRoYXQgYXJlIGRyb3BwZWQgaW50byB0aGUgcmVzb2x2LmNvbmYK ICAgICAgIGZpbGUgaWYgUEVFUkROUyBpcyBub3Qgc2V0IHRvICJubyIuCiAKKyAgQk9PVFBST1RP IGNhbiBjb250YWluIG1vcmUgdGhhbiBvbmUgY29tbWEtc2VwYXJhdGVkIHZhbHVlLAorICBpbiBs YXR0ZXIgY2FzZSBmaXJzdCBzdWNjZWVkZWQgbWV0aG9kIHN0b3BzIGZ1cnRoZXIgYXR0ZW1wdHMu CiAgIElmIEJPT1RQUk9UTyBpcyBub3QgIm5vbmUiLCB0aGVuIHRoZSBvbmx5IG90aGVyIGl0ZW0g dGhhdAogICBtdXN0IGJlIHNldCBpcyB0aGUgREVWSUNFIGl0ZW07IGFsbCB0aGUgcmVzdCB3aWxs IGJlIGRldGVybWluZWQKICAgYnkgdGhlIGJvb3QgcHJvdG9jb2wuICBObyAiZHVtbXkiIGVudHJp ZXMgbmVlZCB0byBiZSBjcmVhdGVkLgpkaWZmIC11TnIgbmV0LXNjcmlwdHMtMC4zLW9yaWcvc3lz Y29uZmlnL25ldHdvcmstc2NyaXB0cy9pZnVwIG5ldC1zY3JpcHRzLTAuMy9zeXNjb25maWcvbmV0 d29yay1zY3JpcHRzL2lmdXAKLS0tIG5ldC1zY3JpcHRzLTAuMy1vcmlnL3N5c2NvbmZpZy9uZXR3 b3JrLXNjcmlwdHMvaWZ1cAkyMDAzLTA1LTIwIDE1OjQ2OjA2ICswMzAwCisrKyBuZXQtc2NyaXB0 cy0wLjMvc3lzY29uZmlnL25ldHdvcmstc2NyaXB0cy9pZnVwCTIwMDQtMDItMTMgMTg6MTE6NDgg KzAyMDAKQEAgLTU4LDYgKzU4LDggQEAKIAkiJFNCSU5fSVdDT05GSUciICR7REVWSUNFfSBlbmMg IiRXSVJFTEVTU19FTkNfS0VZIiA+L2Rldi9udWxsIDI+JjEKIGZpCiAKK0lGUz0sIHJlYWQgQk9P VFBST1RPIEJPT1RQUk9UT19GQUxMQkFDSyA8PDwgIiRCT09UUFJPVE8iCisKIGlmIFsgIiRCT09U UFJPVE8iID0gZGhjcCBdOyB0aGVuCiAgICAgRFlOQ09ORklHPXRydWUKIGZpCkBAIC0yMTMsNyAr MjE1LDggQEAKIGlmIFsgLW4gIiRESENQX0NMSUVOVCIgXTsgdGhlbgogY2FzZSAiJHtESENQX0NM SUVOVCMjKi99IiBpbgogCWRoY3BjZCkKLQkJWyAteiAiJERIQ1BfSE9TVE5BTUUiIF0gfHwgREhD UF9BUkdTPSItaCAkREhDUF9IT1NUTkFNRSIKKwkJWyAteiAiQk9PVFBST1RPX0ZBTExCQUNLIiBd IHx8IERIQ1BfQVJHUz0iLXQgMzAiCisJCVsgLXogIiRESENQX0hPU1ROQU1FIiBdIHx8IERIQ1Bf QVJHUz0iJERIQ1BfQVJHUyAtaCAkREhDUF9IT1NUTkFNRSIKIAkJWyAteiAiJE5FRURIT1NUTkFN RSIgXSB8fCBESENQX0FSR1M9IiRESENQX0FSR1MgLUgiCiAJCWlzX3llcyAiJFBFRVJOVFAiIHx8 IERIQ1BfQVJHUz0iJERIQ1BfQVJHUyAtTiIKIAkJISBpc19ubyAiJFBFRVJETlMiIHx8IERIQ1Bf QVJHUz0iJERIQ1BfQVJHUyAtUiIKQEAgLTIzMiwyMiArMjM1LDQ1IEBACiAJCURIQ1BfQVJHUz0i JERIQ1BfQVJHUyAtdyAkREVWSUNFIgogCQk7OwogCWRoY2xpZW50KQorCQkjIFdlIHNob3VsZCBs aW1pdCBkaGNsaWVudCBhY3Rpdml0eSB0byBmaXJzdCB0cnkKKwkJIyBpZiB3ZSBoYXZlIGZhbGxi YWNrIG1ldGhvZAorCQlbIC16ICJCT09UUFJPVE9fRkFMTEJBQ0siIF0gfHwgREhDUF9BUkdTPSIt MSIKIAkJIyBDYW4ndCBzcGVjaWZ5IGEgaG9zdCB3aXRoIGRoY2xpZW50ID8gc2FtZSByZW1hcmsg Zm9yCiAJCSMgJE5FRURIT1NUTkFNRSB0aGlzIGNsaWVudCBzdWNrICEhIQotCQlESENQX0FSR1M9 IiRERVZJQ0UiCisJCURIQ1BfQVJHUz0iJERIQ1BfQVJHUyAkREVWSUNFIgogCQk7OwogZXNhYwog ZmkKIAorWkNJUD0vc2Jpbi96Y2lwCitaQ0lQX0FSR1M9Ii1zIC1pICRERVZJQ0UiCisKIGlmIFsg LW4gIiREWU5DT05GSUciIF07IHRoZW4KICAgICBlY2hvIC1uICJEZXRlcm1pbmluZyBJUCBpbmZv cm1hdGlvbiBmb3IgJERFVklDRSB2aWEgJHtESENQX0NMSUVOVCMjKi99Li4uIgogICAgIGlmICRE SENQX0NMSUVOVCAkREhDUF9BUkdTOyB0aGVuCiAJZWNobyAiIGRvbmUuIgorICAgIGVsaWYgWyAi JEJPT1RQUk9UT19GQUxMQkFDSyIgPSB6Y2lwIF07IHRoZW4KKwllY2hvIAorCWVjaG8gLW4gIkRl dGVybWluaW5nIElQIGluZm9ybWF0aW9uIGZvciAkREVWSUNFIHZpYSAke1pDSVAjIyovfS4uLiIK KwlpZiAkWkNJUCAkWkNJUF9BUkdTOyB0aGVuCisJICAgIGVjaG8gIiBkb25lLiIKKwllbHNlCisJ ICAgIGVjaG8gIiBmYWlsZWQuIgorCSAgICBleGl0IDEKKwlmaQogICAgIGVsc2UKIAllY2hvICIg ZmFpbGVkLiIKIAlleGl0IDEKICAgICBmaQotZWxzZSAKK2VsaWYgWyAiJEJPT1RQUk9UTyIgPSB6 Y2lwIF07IHRoZW4KKyAgICBlY2hvIC1uICJEZXRlcm1pbmluZyBJUCBpbmZvcm1hdGlvbiBmb3Ig JERFVklDRSB2aWEgJHtaQ0lQIyMqL30uLi4iCisgICAgaWYgJFpDSVAgJFpDSVBfQVJHUzsgdGhl bgorCWVjaG8gIiBkb25lLiIKKyAgICBlbHNlIAorCWVjaG8gIiBmYWlsZWQuIgorCWV4aXQgMQor ICAgIGZpCitlbHNlCiAgICAgaWYgWyAteiAiJE5FVE1BU0siIF07IHRoZW4KIAlldmFsIGAvYmlu L2lwY2FsYyAtLW5ldG1hc2sgIiRJUEFERFIiYAogICAgIGZpCg==