Djam/livecd-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/livecd-tools.git synced 2025-02-23 23:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

XXX Use dracut module network-legacy to configure network for now

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/575
This commit is contained in:
Mikhail Novosyolov 2020-11-12 17:07:51 +03:00
parent 4457940a06
commit 3b9658030b
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
0003-Add-livenet-and-anaconda-initrd-modules.patch
View file

@ -5,7 +5,16 @@ Subject: [PATCH] Add livenet and anaconda initrd modules
We need livenet to be able to fetch squashfs images in PXE boots We need livenet to be able to fetch squashfs images in PXE boots
We need Anaconda module for fully functional Anaconda in similar use cases We need Anaconda module for fully functional Anaconda in similar use cases
Anaconda depdends from livenet, but let's just be sure that livenet is in initrd Anaconda depdends from livenet, but let's just be sure that livenet is in initrd.
Add network-legacy because:
* livenet pulls either network-manager or network-legacy
* network-manager is default
* but, if network-legacy is defined, network-manager is not pulled
* currently DHCP fails with NetworkManager+dhclient:
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/575
* we need dhclient outside of initrd in NetworkManager due to it working better than internal DHCP client
* so run dhclient directly for now via network-legacy
--- ---
imgcreate/live.py | 2 +- imgcreate/live.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -19,7 +28,7 @@ index 9a57884..e9ca5d6 100644
f.write('filesystems+="' + self.__extra_filesystems() + ' "\n') f.write('filesystems+="' + self.__extra_filesystems() + ' "\n')
f.write('add_drivers+="' + self.__extra_drivers() + ' "\n') f.write('add_drivers+="' + self.__extra_drivers() + ' "\n')
- f.write('add_dracutmodules+=" dmsquash-live pollcdrom "\n') - f.write('add_dracutmodules+=" dmsquash-live pollcdrom "\n')
+ f.write('add_dracutmodules+=" dmsquash-live pollcdrom livenet anaconda "\n') + f.write('add_dracutmodules+=" dmsquash-live pollcdrom livenet network-legacy anaconda "\n')
f.write('hostonly="no"\n') f.write('hostonly="no"\n')
f.write('dracut_rescue_image="no"\n') f.write('dracut_rescue_image="no"\n')
f.close() f.close()

2
livecd-tools.spec
View file

@ -10,7 +10,7 @@ Name: livecd-tools
Summary: Tools for building live CDs Summary: Tools for building live CDs
Epoch: 1 Epoch: 1
Version: 27.1 Version: 27.1
Release: 21 Release: 22
License: GPLv2 License: GPLv2
Group: System/Base Group: System/Base
URL: https://github.com/livecd-tools/livecd-tools URL: https://github.com/livecd-tools/livecd-tools