aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/node/includecss.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-04-25 18:54:40 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-04-25 18:54:40 +0200
commitd7c3cf4700d602a94c7da62806ea0280ed0e6918 (patch)
tree40de4325ea85a30353636c55ed017b849331073f /phpBB/phpbb/template/twig/node/includecss.php
parentb305ec5611f8f1ad16f4fa55699059c658370ecd (diff)
parentd5ea4906ca3a85a278518cc91189176174422bde (diff)
downloadforums-d7c3cf4700d602a94c7da62806ea0280ed0e6918.tar
forums-d7c3cf4700d602a94c7da62806ea0280ed0e6918.tar.gz
forums-d7c3cf4700d602a94c7da62806ea0280ed0e6918.tar.bz2
forums-d7c3cf4700d602a94c7da62806ea0280ed0e6918.tar.xz
forums-d7c3cf4700d602a94c7da62806ea0280ed0e6918.zip
Merge pull request #2288 from nickvergessen/ticket/12012
[ticket/12012] Correctly drop default value constraints * nickvergessen/ticket/12012: [ticket/12012] Move property to the top [ticket/12012] Move MS SQL server comparison into a method [ticket/12012] Fix docs in connection manager [ticket/12012] Remove duplicated code (only the $sql are different) [ticket/12012] Handle begin and commit transactions in tests [ticket/12012] Drop and recreate indexes when removing columns [ticket/12012] Add a unit test for removing a column with indexes [ticket/12012] Add a unit test for changing the column type [ticket/12012] Return SQL statements for index drop/create [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000 [ticket/12012] Drop and recreate indexes when changing a column on MSSQL [ticket/12012] Fix query layout [ticket/12012] Correctly drop default value constraints on MSSQL
Diffstat (limited to 'phpBB/phpbb/template/twig/node/includecss.php')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-01 02:53:16 +0000
a03f7a1707b5c309b83fea728b.zip'>drakx-cafadbb6ee35e3a03f7a1707b5c309b83fea728b.zip
use ifup/ifdown with the boot option to handle ifplugd
Diffstat
-rw-r--r--perl-install/network/netconnect.pm8
-rw-r--r--perl-install/network/tools.pm14
2 files changed, 2 insertions, 20 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 1cf2786fc..c45c77f93 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -158,18 +158,12 @@ sub real_main {
);
my $offer_to_connect = sub {
- network::tools::stop_ifplugd($net->{net_interface});
-
if ($net->{type} eq 'adsl' && !member($net->{adsl}{method}, qw(static dhcp)) ||
member($net->{type}, qw(modem isdn isdn_external))) {
return "ask_connect_now";
} else {
network::tools::stop_net_interface($net, 0);
- if ($ethntf->{MII_NOT_SUPPORTED} eq "yes" || $::isInstall) {
- network::tools::start_net_interface($net, 0);
- } else {
- network::tools::start_ifplugd($net->{net_interface});
- }
+ network::tools::start_net_interface($net, 0);
}
return "end";
};
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index f4a22a5e1..0c88cf055 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -60,7 +60,7 @@ sub run_interface_command {
my ($command, $intf, $detach) = @_;
my @command =
!$> || system("/usr/sbin/usernetctl $intf report") == 0 ?
- ($command, $intf) :
+ ($command, $intf, if_(!$::isInstall, "boot")) :
wrap_command_for_root($command, $intf);
run_program::raw({ detach => $detach, root => $::prefix }, @command);
}
@@ -85,18 +85,6 @@ sub stop_net_interface {
stop_interface($net->{net_interface}, $detach);
}
-sub start_ifplugd {
- my ($interface) = @_;
- run_program::run('/sbin/ifplugd', '-b', '-i', $interface);
-}
-
-sub stop_ifplugd {
- my ($interface) = @_;
- my $ifplugd = chomp_(cat_("/var/run/ifplugd.$interface.pid"));
- $ifplugd and kill(15, $ifplugd);
- sleep 1;
-}
-
sub connected() { gethostbyname("www.mandriva.com") ? 1 : 0 }
# request a ref on a bg_connect and a ref on a scalar
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-01 02:53:16 +0000