pool/ignition
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 833824 from devel:kubic:ignition

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/833824
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2020-09-11 22:13:54 +00:00 committed by Git OBS Bridge
commit 564af4c1ed
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
02_ignition_firstboot
View File

@ -8,8 +8,8 @@ set flagpath="/boot/writable"
# to be used later on the kernel command line. # to be used later on the kernel command line.
set ignition_firstboot="" set ignition_firstboot=""
if ! [ -f "${flagpath}/firstboot_happened" ]; then if ! [ -f "${flagpath}/firstboot_happened" ]; then
# default to dhcp networking parameters to be used with ignition # This defaults to DHCP in dracut
set ignition_network_kcmdline='rd.neednet=1 ip=dhcp' set ignition_network_kcmdline=''
# source in the `ignition.firstboot` file which could override the # source in the `ignition.firstboot` file which could override the
# above $ignition_network_kcmdline with static networking config. # above $ignition_network_kcmdline with static networking config.

2
ignition-enable-network.sh
View File

@ -3,7 +3,7 @@
. /lib/dracut-lib.sh . /lib/dracut-lib.sh
if [ -f /run/ignition/neednet ] && ! getargbool 0 'rd.neednet'; then if [ -f /run/ignition/neednet ] && ! getargbool 0 'rd.neednet'; then
echo "rd.neednet=1 ip=dhcp" > /etc/cmdline.d/40-ignition-neednet.conf echo "rd.neednet=1" > /etc/cmdline.d/40-ignition-neednet.conf
# Re-trigger generation of network rules # Re-trigger generation of network rules
. /lib/dracut/hooks/pre-udev/60-net-genrules.sh . /lib/dracut/hooks/pre-udev/60-net-genrules.sh

8
ignition.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 4 12:07:21 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- 02_ignition_firstboot, ignition-enable-network.sh: Drop ip=dhcp,
it's the default anyway and avoids a delay on boot (boo#1173402)
- 02_ignition_firstboot: Drop rd.neednet=1, both ignition and
combustion enable it themselves when necessary
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 3 15:04:30 UTC 2020 - Ignaz Forster <iforster@suse.com> Thu Sep 3 15:04:30 UTC 2020 - Ignaz Forster <iforster@suse.com>