Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-05-02 09:51:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-04-26 11:44:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-05-02 09:52:07.000000000 +0200
@@ -1,0 +2,35 @@
+Wed Apr 30 15:18:45 UTC 2014 - trenn(a)suse.de
+
+- Update to lateste git HEAD 48b7ab1b35adf1f3f09f883ef14ea0a3fba1e468
+ Added: dracut_v37_to_HEAD.patch
+ Modified: 0013-Correct-paths-for-openSUSE.patch
+ Modified: mdraid-setup.patch
+ Modified: replace_dhclient_with_wickedd_dhcp_supplicants.patch
+ Deleted: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch
+ Deleted: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch
+
+- Fix lvm and other possible not working thing due to new parameter:
+ hostonly-cmdline which has to be active by default
+ bnc#874000 bnc#874905 bnc#874363
+ Added: mkinird_differ_host_and_cmdline_only_properly.patch
+- Make write-ifcfg-suse.sh more update robust
+ Avoid rebasing of diff with every update touching this file by adding
+ write-ifcfg-suse.sh as source file and copy/link in .spec file.
+ Modified: change_write_ifcfg_to_suse.patch
+
+-------------------------------------------------------------------
+Tue Apr 29 15:43:28 UTC 2014 - meissner(a)suse.com
+
+- consolidate -fips-aesni into -fips again. The problem due to it
+ was split off upstream was solved in the kernel.
+
+-------------------------------------------------------------------
+Fri Apr 25 13:48:45 UTC 2014 - meissner(a)suse.com
+
+- Create new -fips and -fips-aesni subpackage for kernel
+ integrity checking. bnc#856310 FATE#316930
+- add spaces around "network" in 01-dist.conf, as the addmodules
+ list is concatenated and you never know which config is before or
+ after and what it does.
+
+-------------------------------------------------------------------
Old:
----
0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch
0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch
New:
----
dracut_v37_to_HEAD.patch
mkinird_differ_host_and_cmdline_only_properly.patch
write-ifcfg-suse.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.vyxN3R/_old 2014-05-02 09:52:09.000000000 +0200
+++ /var/tmp/diff_new_pack.vyxN3R/_new 2014-05-02 09:52:09.000000000 +0200
@@ -34,6 +34,8 @@
Source4: purge-kernels
Source5: purge-kernels.service
Source6: dracut-installkernel
+Source7: write-ifcfg-suse.sh
+Patch1: dracut_v37_to_HEAD.patch
Patch10: 0006-Install-bin-mount.patch
Patch11: 0013-Correct-paths-for-openSUSE.patch
Patch12: 0014-Check-for-plymouth-lib-directories.patch
@@ -53,12 +55,11 @@
Patch27: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch
Patch28: 0016-90multipath-add-67-kpartx-compat.rules.patch
Patch29: 0017-90multipath-install-dracut-specific-service-file.patch
-Patch30: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch
-Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch
Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch
Patch33: 0021-90multipath-install-correct-multipath-rules.patch
Patch34: add_dracuts_network_params_for_iscsi.patch
Patch35: 0022-90multipath-Fixup-service-file-for-booting.patch
+Patch36: mkinird_differ_host_and_cmdline_only_properly.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@@ -95,8 +96,20 @@
event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as
NFS, iSCSI, NBD, FCoE with the dracut-network package.
+%package fips
+Summary: Dracut modules to build a dracut initramfs with an integrity check
+Group: System/Base
+Requires: %{name} = %{version}-%{release}
+Requires: hmaccalc
+
+%description fips
+This package requires everything which is needed to build an
+initramfs with dracut, which does an integrity check of the kernel
+and its cryptography during startup.
+
%prep
%setup -q
+%patch1 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
@@ -116,12 +129,11 @@
%patch27 -p1
%patch28 -p1
%patch29 -p1
-%patch30 -p1
-%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
+%patch36 -p1
%build
%configure\
@@ -135,9 +147,6 @@
echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh
-rm -fr %{buildroot}%{dracutlibdir}/modules.d/01fips
-rm -fr %{buildroot}%{dracutlibdir}/modules.d/02fips-aesni
-
# we do not support dash in the initramfs
rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash
rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox
@@ -162,8 +171,13 @@
touch %{buildroot}%{_localstatedir}/log/dracut.log
install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
-echo 'add_dracutmodules+="network"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
+echo '### Generated File - Please do not edit, create a new config file instead ###' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
+echo 'add_dracutmodules+=" network "' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
echo 'compress="xz --check=crc32 -6"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
+echo 'hostonly="yes"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
+echo 'hostonly_cmdline="yes"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
+
+install -m 0644 dracut.conf.d/fips.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/40-fips.conf
%ifarch %ix86 x86_64
echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf
@@ -184,8 +198,11 @@
install -D -m 0755 %{SOURCE6} %{buildroot}/sbin/installkernel
%if 0%{?suse_version}
+install -D -m 0755 %{SOURCE7} %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-suse.sh
+rm -f %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh
ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-suse.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh
%else
+mv %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh
ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh
%endif
@@ -195,6 +212,13 @@
%preun
%service_del_preun purge-kernels.service
+%files fips
+%defattr(-,root,root,0755)
+%doc COPYING
+%config %{_sysconfdir}/dracut.conf.d/40-fips.conf
+%{dracutlibdir}/modules.d/01fips
+%{dracutlibdir}/modules.d/02fips-aesni
+
%files
%defattr(-,root,root,0755)
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
++++++ 0013-Correct-paths-for-openSUSE.patch ++++++
--- /var/tmp/diff_new_pack.vyxN3R/_old 2014-05-02 09:52:09.000000000 +0200
+++ /var/tmp/diff_new_pack.vyxN3R/_new 2014-05-02 09:52:09.000000000 +0200
@@ -14,11 +14,11 @@
modules.d/98systemd/rescue.service | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/dracut.sh b/dracut.sh
-index c1ef474..dddb488 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -774,7 +774,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
+Index: dracut-037/dracut.sh
+===================================================================
+--- dracut-037.orig/dracut.sh
++++ dracut-037/dracut.sh
+@@ -774,7 +774,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
@@ -27,10 +27,10 @@
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
-diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
-index a091f89..92b2fa3 100755
---- a/modules.d/10i18n/module-setup.sh
-+++ b/modules.d/10i18n/module-setup.sh
+Index: dracut-037/modules.d/10i18n/module-setup.sh
+===================================================================
+--- dracut-037.orig/modules.d/10i18n/module-setup.sh
++++ dracut-037/modules.d/10i18n/module-setup.sh
@@ -96,6 +96,8 @@ install() {
install_base() {
@@ -40,10 +40,10 @@
if ! dracut_module_included "systemd"; then
inst ${moddir}/console_init.sh /lib/udev/console_init
-diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service
-index edc2461..d80900f 100644
---- a/modules.d/98systemd/rescue.service
-+++ b/modules.d/98systemd/rescue.service
+Index: dracut-037/modules.d/98systemd/rescue.service
+===================================================================
+--- dracut-037.orig/modules.d/98systemd/rescue.service
++++ dracut-037/modules.d/98systemd/rescue.service
@@ -16,7 +16,7 @@ Environment=HOME=/
Environment=DRACUT_SYSTEMD=1
Environment=NEWROOT=/sysroot
@@ -53,6 +53,3 @@
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f -- /.console_lock
ExecStopPost=-/usr/bin/systemctl --fail --no-block default
---
-1.8.1.4
-
++++++ change_write_ifcfg_to_suse.patch ++++++
++++ 763 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/dracut/change_write_ifcfg_to_suse.patch
++++ and /work/SRC/openSUSE:Factory/.dracut.new/change_write_ifcfg_to_suse.patch
++++++ dracut_v37_to_HEAD.patch ++++++
++++ 720 lines (skipped)
++++++ mdraid-setup.patch ++++++
--- /var/tmp/diff_new_pack.vyxN3R/_old 2014-05-02 09:52:09.000000000 +0200
+++ /var/tmp/diff_new_pack.vyxN3R/_new 2014-05-02 09:52:09.000000000 +0200
@@ -13,10 +13,10 @@
modules.d/90mdraid/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index ac745d1..767b3aa 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
+Index: dracut-037/modules.d/90mdraid/module-setup.sh
+===================================================================
+--- dracut-037.orig/modules.d/90mdraid/module-setup.sh
++++ dracut-037/modules.d/90mdraid/module-setup.sh
@@ -86,7 +86,7 @@ install() {
for rule in 64-md-raid.rules 64-md-raid-assembly.rules; do
rule_path="${initdir}${udevdir}/rules.d/${rule}"
@@ -26,6 +26,3 @@
"${rule_path}"
done
---
-1.8.1.4
-
++++++ mkinird_differ_host_and_cmdline_only_properly.patch ++++++
Index: dracut-037/mkinitrd-suse.sh
===================================================================
--- dracut-037.orig/mkinitrd-suse.sh
+++ dracut-037/mkinitrd-suse.sh
@@ -297,7 +297,11 @@ targets=( $targets )
[[ $kernels ]] && kernels=( $kernels )
[[ $logfile ]] && dracut_args="${dracut_args} --logfile $logfile"
-[[ $host_only == 1 ]] && dracut_args="${dracut_args} --hostonly"
+if [[ $host_only == 1 ]];then
+ dracut_args="${dracut_args} --hostonly --hostonly-cmdline"
+else
+ dracut_args="${dracut_args} --no-hostonly --no-hostonly-cmdline"
+fi
[[ $force == 1 ]] && dracut_args="${dracut_args} --force"
[[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline ${dracut_cmdline}"
[ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1
Index: dracut-037/mkinitrd-suse.8
===================================================================
--- dracut-037.orig/mkinitrd-suse.8
+++ dracut-037/mkinitrd-suse.8
@@ -139,7 +139,10 @@ script after the initrd(s) have been cre
.PP
\fB\-A\fR
.RS 4
-Create a so called "monster initrd" which includes all available features and modules\&.
+Create a so called "monster initrd" which includes all available features and
+modules. This calls dracut with \-\-no\-hostonly and \-\-no-hostonly\-cmdline
+parameters internally (instead of \-\-hostonly, \-\-hostonly\-cmdline by
+default).\&.
.RE
.PP
\fB\-v, \-\-verbose\fR
++++++ replace_dhclient_with_wickedd_dhcp_supplicants.patch ++++++
--- /var/tmp/diff_new_pack.vyxN3R/_old 2014-05-02 09:52:09.000000000 +0200
+++ /var/tmp/diff_new_pack.vyxN3R/_new 2014-05-02 09:52:09.000000000 +0200
@@ -20,12 +20,11 @@
delete mode 100644 modules.d/40network/dhclient.conf
delete mode 100755 modules.d/40network/kill-dhclient.sh
-diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
-deleted file mode 100755
-index 50e8932..0000000
---- a/modules.d/40network/dhclient-script.sh
+Index: dracut-037/modules.d/40network/dhclient-script.sh
+===================================================================
+--- dracut-037.orig/modules.d/40network/dhclient-script.sh
+++ /dev/null
-@@ -1,152 +0,0 @@
+@@ -1,156 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
@@ -92,13 +91,17 @@
- search=$(printf -- "$new_domain_search")
- namesrv=$new_domain_name_servers
- hostname=$new_host_name
-- lease_time=$new_dhcp_lease_time
+- [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
+- [ -n "$new_max_life" ] && lease_time=$new_max_life
+- preferred_lft=$lease_time
+- [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
-
- [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
-
- ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
-- dev ${netif} scope global valid_lft ${lease_time} \
-- preferred_lft ${lease_time}
+- dev ${netif} scope global \
+- ${lease_time:+valid_lft $lease_time} \
+- ${preferred_lft:+preferred_lft ${preferred_lft}}
-
- [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
- if [ -n "$namesrv" ] ; then
@@ -178,19 +181,18 @@
-esac
-
-exit 0
-diff --git a/modules.d/40network/dhclient.conf b/modules.d/40network/dhclient.conf
-deleted file mode 100644
-index dbf5882..0000000
---- a/modules.d/40network/dhclient.conf
+Index: dracut-037/modules.d/40network/dhclient.conf
+===================================================================
+--- dracut-037.orig/modules.d/40network/dhclient.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-request subnet-mask, broadcast-address, time-offset, routers,
- domain-name, domain-name-servers, domain-search, host-name,
- root-path, interface-mtu;
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 51b0d52..25ce094 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
+Index: dracut-037/modules.d/40network/ifup.sh
+===================================================================
+--- dracut-037.orig/modules.d/40network/ifup.sh
++++ dracut-037/modules.d/40network/ifup.sh
@@ -88,21 +88,106 @@ else
[ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
fi
@@ -312,10 +314,9 @@
if [ -e /tmp/bridge.info ]; then
. /tmp/bridge.info
# start bridge if necessary
-diff --git a/modules.d/40network/kill-dhclient.sh b/modules.d/40network/kill-dhclient.sh
-deleted file mode 100755
-index 78060f5..0000000
---- a/modules.d/40network/kill-dhclient.sh
+Index: dracut-037/modules.d/40network/kill-dhclient.sh
+===================================================================
+--- dracut-037.orig/modules.d/40network/kill-dhclient.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
@@ -335,10 +336,10 @@
- read PID < $f;
- kill -9 $PID >/dev/null 2>&1
-done
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1df4174..b54f873 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
+Index: dracut-037/modules.d/40network/module-setup.sh
+===================================================================
+--- dracut-037.orig/modules.d/40network/module-setup.sh
++++ dracut-037/modules.d/40network/module-setup.sh
@@ -2,11 +2,14 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
@@ -385,6 +386,3 @@
_arch=$(uname -m)
---
-1.8.1.4
-
++++++ write-ifcfg-suse.sh ++++++
#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
# NFS root might have reached here before /tmp/net.ifaces was written
udevadm settle --timeout=30
if [ -e /tmp/bridge.info ]; then
. /tmp/bridge.info
fi
if [ -e /tmp/vlan.info ]; then
. /tmp/vlan.info
fi
mkdir -m 0755 -p /tmp/ifcfg/
mkdir -m 0755 -p /tmp/ifcfg-leases/
get_vid() {
case "$1" in
vlan*)
echo ${1#vlan}
;;
*.*)
echo ${1##*.}
;;
esac
}
for netup in /tmp/net.*.did-setup ; do
[ -f $netup ] || continue
netif=${netup%%.did-setup}
netif=${netif##*/net.}
[ -e /tmp/ifcfg/ifcfg-$netif ] && continue
unset bridge
unset bond
unset bondslaves
unset bondname
unset bondoptions
unset uuid
unset ip
unset gw
unset mtu
unset mask
unset macaddr
unset slave
unset ethname
[ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info
uuid=$(cat /proc/sys/kernel/random/uuid)
if [ "$netif" = "$bridgename" ]; then
bridge=yes
elif [ "$netif" = "$bondname" ]; then
# $netif can't be bridge and bond at the same time
bond=yes
fi
if [ "$netif" = "$vlanname" ]; then
vlan=yes
fi
cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
{
echo "# Generated by dracut initrd"
echo "NAME='$netif'"
if [ -f /tmp/net.$netif.has_ibft_config ]; then
echo "STARTMODE='nfsroot'"
else
echo "STARTMODE='auto'"
fi
local bootproto="static"
if [ -f /tmp/leaseinfo.${netif}.dhcp.ipv6 ]; then
bootproto="dhcp6"
fi
if [ -f /tmp/leaseinfo.${netif}.dhcp.ipv4 ]; then
if [ "$bootproto" = "dhcp6" ]; then
bootproto="dhcp"
else
bootproto="dhcp4"
fi
fi
echo "BOOTPROTO='$bootproto'"
if [ "$bootproto" = "static" ]; then
# If we've booted with static ip= lines, the override file is there
[ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
echo "IPADDR='$ip'"
if [ -n "$mask" ]; then
if strstr "$mask" "."; then
echo "NETMASK='$mask'"
else
echo "PREFIXLEN='$mask'"
fi
fi
if [ -n "$gw" ]; then
echo "GATEWAY='$gw'"
fi
fi
[ -n "$mtu" ] && echo "MTU='$mtu'"
} > /tmp/ifcfg/ifcfg-$netif
# bridge needs different things written to ifcfg
if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then
# standard interface
{
if [ -n "$macaddr" ]; then
echo "LLADDR='$macaddr'"
else
echo "LLADDR='$(cat /sys/class/net/$netif/address)'"
fi
echo "INTERFACETYPE='Ethernet'"
} >> /tmp/ifcfg/ifcfg-$netif
fi
if [ -n "$vlan" ]; then
{
echo "INTERFACETYPE='Vlan'"
echo "VLAN_ID='$(get_vid $vlanname)'"
echo "ETHERDEVICE='$phydevice'"
} >> /tmp/ifcfg/ifcfg-$netif
fi
if [ -n "$bond" ] ; then
# bond interface
{
# This variable is an indicator of a bond interface for initscripts
echo "BONDING_MASTER='yes'"
echo "BONDING_MODULE_OPTS='$bondoptions'"
echo "INTERFACETYPE='Bond'"
} >> /tmp/ifcfg/ifcfg-$netif
local i=0
for slave in $bondslaves ; do
echo "BONDING_SLAVE_$i='$slave'" >> /tmp/ifcfg/ifcfg-$netif
i=$((i+1))
# write separate ifcfg file for the raw eth interface
{
echo "# Generated by dracut initrd"
echo "NAME='$slave'"
echo "INTERFACETYPE='Ethernet'"
echo "STARTMODE='hotplug'"
echo "BOOTPROTO='none'"
echo "# ETHTOOL=''"
} >> /tmp/ifcfg/ifcfg-$slave
done
fi
if [ -n "$bridge" ] ; then
# bridge
{
echo "INTERFACETYPE='Bridge'"
echo "BRIDGE='yes'"
echo "BRIDGE_STP='off'"
echo "BRIDGE_FORWARDDELAY='0'"
echo -n "BRIDGE_PORTS='"
} >> /tmp/ifcfg/ifcfg-$netif
if [ "$ethname" = "$bondname" ] ; then
{
for slave in $bondslaves ; do
echo -n "$bondname "
done
echo "'"
} >> /tmp/ifcfg/ifcfg-$netif
else
echo "$ethname'" >> /tmp/ifcfg/ifcfg-$netif
fi
fi
done
# Pass network opts
mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network
mkdir -m 0755 -p /run/initramfs/state/var/run/wicked
echo "files /etc/sysconfig/network" >> /run/initramfs/rwtab
echo "files /var/run/wicked" >> /run/initramfs/rwtab
{
cp /tmp/net.* /run/initramfs/
cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf
copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network
cp /tmp/leaseinfo.* /run/initramfs/state/var/run/wicked/
} > /dev/null 2>&1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
