[yast-commit] r65608 - in /branches/SuSE-Code-11-SP2-Branch/dhcp-server: ./ package/ src/ testsuite/tests/
Author: locilka Date: Thu Sep 8 15:12:36 2011 New Revision: 65608 URL: http://svn.opensuse.org/viewcvs/yast?rev=65608&view=rev Log: - Including SSL certificate in chrooted system (bnc #715473 comment #15) - Filling up also IPv6-related entries in sysconfig (bnc #715473 comment #20) - 2.17.5 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/VERSION branches/SuSE-Code-11-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes branches/SuSE-Code-11-SP2-Branch/dhcp-server/src/DhcpServer.pm branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/Write.out branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIAddDeclaration.out branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/VERSION?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/VERSION Thu Sep 8 15:12:36 2011 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes Thu Sep 8 15:12:36 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Sep 8 15:08:09 CEST 2011 - locilka@suse.cz + +- Including SSL certificate in chrooted system (bnc #715473 + comment #15) +- Filling up also IPv6-related entries in sysconfig (bnc #715473 + comment #20) +- 2.17.5 + +------------------------------------------------------------------- Tue Sep 6 16:35:43 CEST 2011 - locilka@suse.cz - Fixed detection of default exemplary config file (bnc #715473) Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/src/DhcpServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/src/DhcpServer.pm?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/src/DhcpServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/src/DhcpServer.pm Thu Sep 8 15:12:36 2011 @@ -8,6 +8,7 @@ use strict; use YaST::YCP qw(:LOGGING Boolean sformat); +YaST::YCP::Import ("FileUtils"); #YaST::YCP::debug (1); @@ -275,9 +276,18 @@ } } + my $yast_cert = '/etc/ssl/certs/YaST-CA.pem'; + if (FileUtils->Exists ($yast_cert)) { + if (! exists ($includes{$yast_cert})) { + y2warning ("Adding file $yast_cert to copy to chroot"); + $includes{$yast_cert} = 1; + } + } + @includes = sort (keys (%includes)); $includes = join (" ", @includes); SCR->Write (".sysconfig.dhcpd.DHCPD_CONF_INCLUDE_FILES", $includes); + SCR->Write (".sysconfig.dhcpd.DHCPD6_CONF_INCLUDE_FILES", $includes); SCR->Write (".sysconfig.dhcpd", undef); if ($adapt_ddns_settings) @@ -1711,16 +1721,17 @@ Progress->NextStage (); SCR->Write (".sysconfig.dhcpd.DHCPD_RUN_CHROOTED", $chroot ? "yes" : "no"); + SCR->Write (".sysconfig.dhcpd.DHCPD6_RUN_CHROOTED", $chroot ? "yes" : "no"); my $ifaces_list = join (" ", @allowed_interfaces); # in (auto)installation only if ((Mode->autoinst() || Mode->installation()) && scalar(@allowed_interfaces) == 0) { - # bug #173861 - # " " means ANY interface - y2warning("Activating \" \" for DHCPD_INTERFACE"); - $ifaces_list = " "; + # "ANY" means ANY interface + y2warning("Activating \"ANY\" for DHCPD_INTERFACE and DHCPD6_INTERFACE"); + $ifaces_list = "ANY"; } SCR->Write (".sysconfig.dhcpd.DHCPD_INTERFACE", $ifaces_list); + SCR->Write (".sysconfig.dhcpd.DHCPD6_INTERFACE", $ifaces_list); SCR->Write (".sysconfig.dhcpd.DHCPD_OTHER_ARGS", $other_options); SCR->Write (".sysconfig.dhcpd", undef); Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/Write.out?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/Write.out (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/Write.out Thu Sep 8 15:12:36 2011 @@ -1,6 +1,8 @@ Write .etc.dhcpd_conf [$["key":"ddns-update-style", "type":"directive", "value":"none"]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 0 @@ -10,7 +12,9 @@ Dump =============================== Write .etc.dhcpd_conf [$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"], $["key":"ddns-update-style", "type":"directive", "value":"none"]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "yes" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "yes" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 0 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIAddDeclaration.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIAddDeclaration.out?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIAddDeclaration.out (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIAddDeclaration.out Thu Sep 8 15:12:36 2011 @@ -10,7 +10,9 @@ Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]], $["comment_after":"", "comment_before":"", "key":"192.168.5.1 netmask 255.255.255.0", "type":"subnet", "value":[]]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 1 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out Thu Sep 8 15:12:36 2011 @@ -10,7 +10,9 @@ Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 1 @@ -27,7 +29,9 @@ Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 1 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out Thu Sep 8 15:12:36 2011 @@ -10,7 +10,9 @@ Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"max-lease-time", "type":"directive", "value":"123456"], $["key":"range", "type":"directive", "value":"192.168.0.110 192.168.0.220"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 1 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out Thu Sep 8 15:12:36 2011 @@ -10,7 +10,9 @@ Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"domain-name", "type":"directive", "value":"\"example.net\""], $["key":"wins-server", "type":"directive", "value":"wins.example.net"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 1 Modified: branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out?rev=65608&r1=65607&r2=65608&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out (original) +++ branches/SuSE-Code-11-SP2-Branch/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out Thu Sep 8 15:12:36 2011 @@ -10,7 +10,9 @@ Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]]] true Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true +Write .sysconfig.dhcpd.DHCPD6_RUN_CHROOTED "no" true Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true +Write .sysconfig.dhcpd.DHCPD6_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true Execute .target.bash "/etc/init.d/dhcpd stop" 1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
locilka＠svn2.opensuse.org