Marcus Meissner
73faa804ea
- 40network: always start netroot in ifup.sh (bnc#881235) * Add: 0066-40network-always-start-netroot-in-ifup.sh.patch - 95fcoe: check() always returns 255 * Add: 0067-95fcoe-check-always-returns-255.patch - 95fcoe-uefi: Test for EFI firmware (bnc#882412) * Add: 0068-95fcoe-uefi-Test-for-EFI-firmware.patch - Rename patches to match git repository: * Old: more-fips-adjustments.patch * New: 0057-01fips-Include-some-more-hmacs.patch * Old: dracut-check-supported.patch * New: 0058-dracut-add-warning-when-including-unsupported-module.patch - Add 99suse module to git repository: * Remove: parse-suse-initrd.sh * Remove: module-setup-initrd.sh * Add: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch - Add write-ifcfg-suse.sh to git repository: * Remove: write-ifcfg-suse.sh * Add: 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch - Fixup error messages in write-ifcfg-suse.sh (bnc#881286) * Add: 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch - Add missing 'libgcc_s.so' library (bnc#881692): * Add: 0062-95iscsi-Install-libgcc_s-library.patch * Add: 0063-90multipath-Install-libgcc_s-library.patch - Install missing scsi_dh_alua module (bnc#871617) * Add: 0064-90kernel-modules-install-scsi_dh_alua.patch - 95iscsi: fixup bnx2i offload booting (bnc#855747) * Add: 0065-95iscsi-Fixup-bnx2i-offload-booting.patch Add: more-fips-adjustments.patch OBS-URL: https://build.opensuse.org/request/show/237520 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=160
56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
From ad967a08bbf67171a75acc84a9ea2ffbd9461aa5 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 4 Jun 2014 12:04:10 +0200
|
|
Subject: 40network: always start netroot in ifup.sh
|
|
|
|
It's totally irrelevant how the network is configured when
|
|
trying to setup netroot. It only matters if it could be
|
|
configured at all.
|
|
So change the logic the check for correct network setup
|
|
and then start netroot.
|
|
|
|
References: bnc#881235
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/40network/ifup.sh | 22 ++++++++--------------
|
|
1 file changed, 8 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
index 934c61e..494017b 100755
|
|
--- a/modules.d/40network/ifup.sh
|
|
+++ b/modules.d/40network/ifup.sh
|
|
@@ -420,21 +420,15 @@ for p in $(getargs ip=); do
|
|
do_static ;;
|
|
esac
|
|
|
|
- > /tmp/net.${netif}.up
|
|
+ if [ $? -eq 0 ]; then
|
|
+ > /tmp/net.${netif}.up
|
|
|
|
- case $autoconf in
|
|
- dhcp|on|any|dhcp6)
|
|
- ;;
|
|
- *)
|
|
- if [ $? -eq 0 ]; then
|
|
- setup_net $netif
|
|
- source_hook initqueue/online $netif
|
|
- if [ -z "$manualup" ]; then
|
|
- /sbin/netroot $netif
|
|
- fi
|
|
- fi
|
|
- ;;
|
|
- esac
|
|
+ setup_net $netif
|
|
+ source_hook initqueue/online $netif
|
|
+ if [ -z "$manualup" ]; then
|
|
+ /sbin/netroot $netif
|
|
+ fi
|
|
+ fi
|
|
|
|
exit 0
|
|
done
|
|
--
|
|
1.8.4.5
|
|
|