Hello community,
here is the log from the commit of package network-autoconfig for
openSUSE:Factory checked in at 2014-01-14 21:47:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/network-autoconfig (Old)
and /work/SRC/openSUSE:Factory/.network-autoconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "network-autoconfig"
Changes:
--------
--- /work/SRC/openSUSE:Factory/network-autoconfig/network-autoconfig.changes
2011-09-23 02:14:38.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.network-autoconfig.new/network-autoconfig.changes
2014-01-14 21:47:11.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 14 09:56:47 UTC 2014 - mvid...@suse.com
+
+- ported to wicked (FATE#316111)
+- 1.0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ network-autoconfig.spec ++++++
--- /var/tmp/diff_new_pack.v1aLxA/_old 2014-01-14 21:47:12.000000000 +0100
+++ /var/tmp/diff_new_pack.v1aLxA/_new 2014-01-14 21:47:12.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package network-autoconfig
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,16 @@
#
-
Name: network-autoconfig
-Version: 0.8
-Release: 1
-License: MIT
+Version: 1.0
+Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-Requires: dhcpcd
+Requires: wicked
Requires(pre): %insserv_prereq
-Group: System/Boot
Summary: Find a connected eth interface and create an ifcfg for it
+License: MIT
+Group: System/Boot
Url: http://gitorious.org/opensuse/network-autoconfig
Source0: README
@@ -64,4 +63,5 @@
%doc README
/etc/init.d/boot.network-autoconfig
/usr/sbin/network-autoconfig
+
%changelog
++++++ README ++++++
--- /var/tmp/diff_new_pack.v1aLxA/_old 2014-01-14 21:47:12.000000000 +0100
+++ /var/tmp/diff_new_pack.v1aLxA/_new 2014-01-14 21:47:12.000000000 +0100
@@ -6,4 +6,4 @@
This script will be run at the first boot of a machine.
The log of the run is saved to /var/log/network-autoconfig .
-Requirements: SUSE Linux, dhcpcd.
+Requirements: SUSE Linux, wicked: https://github.com/openSUSE/wicked/
++++++ network-autoconfig ++++++
--- /var/tmp/diff_new_pack.v1aLxA/_old 2014-01-14 21:47:12.000000000 +0100
+++ /var/tmp/diff_new_pack.v1aLxA/_new 2014-01-14 21:47:12.000000000 +0100
@@ -1,11 +1,11 @@
-#! /bin/sh
+#! /bin/bash
# network-autoconfig: Find a connected eth interface and create an ifcfg for
it.
# This script should run at the first boot of a machine
# that has several interfaces
# Author: Martin Vidner <mvid...@suse.cz>
-# Reference: https://fate.novell.com/309518
-
+# Reference: https://fate.suse.com/309518 https://fate.suse.com/316111
# Copyright (C) 2010 Novell, Inc.
+# Copyright © 2014 SUSE LLC
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
@@ -55,10 +55,13 @@
# $1 is interface name, like eth7
# returns true/false
-# requires dhcpcd.rpm
+# requires wicked.rpm
connected() {
echo >&2 "$0: Trying $1"
- PATH=/usr/sbin:/sbin:$PATH dhcpcd-test $1 | grep ^IPADDR
+ local WBINDIR=/usr/lib/wicked/bin
+ $WBINDIR/wickedd-dhcp6 --test $1 | grep ^IPADDR && return 0
+ $WBINDIR/wickedd-dhcp4 --test $1 | grep ^IPADDR && return 0
+ return 1
}
# $1 is interface name, like eth7
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
