QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: do not start network during install

Browse Source
This commit is contained in:
Marek Marczykowski 2013-01-26 22:26:08 +01:00
parent a3970b15fd
commit da044ddca2
4 changed files with 7 additions and 1202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
anaconda/pyanaconda/install.py
View File

@ -67,9 +67,9 @@ def doConfiguration(storage, payload, ksdata, instClass):
ksdata.firewall.execute(storage, ksdata, instClass) ksdata.firewall.execute(storage, ksdata, instClass)
ksdata.xconfig.execute(storage, ksdata, instClass) ksdata.xconfig.execute(storage, ksdata, instClass)
if not flags.flags.imageInstall: #if not flags.flags.imageInstall:
with progress_report(_("Writing network configuration")): # with progress_report(_("Writing network configuration")):
ksdata.network.execute(storage, ksdata, instClass) # ksdata.network.execute(storage, ksdata, instClass)
# Creating users and groups requires some pre-configuration. # Creating users and groups requires some pre-configuration.
with progress_report(_("Creating users")): with progress_report(_("Creating users")):

5
anaconda/pyanaconda/network.py
View File

@ -830,7 +830,7 @@ def write_sysconfig_network(rootpath, ksdata, overwrite=False):
f = open(cfgfile, "w") f = open(cfgfile, "w")
f.write("# Generated by anaconda\n") f.write("# Generated by anaconda\n")
f.write("NETWORKING=yes\n") f.write("NETWORKING=no\n")
gateway = ipv6_defaultgw = None gateway = ipv6_defaultgw = None
for iface in reversed(getDevices()): for iface in reversed(getDevices()):
@ -967,7 +967,8 @@ def wait_for_dhcp():
def update_hostname(ksdata, hostname=None): def update_hostname(ksdata, hostname=None):
if not hostname: if not hostname:
hostname = getHostname() # Default to 'dom0' in Qubes
hostname = 'dom0'
log.debug("updating hostname %s" % hostname) log.debug("updating hostname %s" % hostname)
hostname_found = False hostname_found = False
for nd in ksdata.network.network: for nd in ksdata.network.network:

1197
anaconda/pyanaconda/ui/gui/spokes/network.py
View File

File diff suppressed because it is too large Load Diff

1
lorax-templates-qubes/templates/runtime-postinstall.tmpl
View File

@ -27,6 +27,7 @@ systemctl disable systemd-readahead-collect.service \
systemd-readahead-replay.service \ systemd-readahead-replay.service \
mdmonitor.service \ mdmonitor.service \
mdmonitor-takeover.service \ mdmonitor-takeover.service \
NetworkManager.service \
lvm2-monitor.service lvm2-monitor.service
## These services can't be disabled normally (they're linked into place in ## These services can't be disabled normally (they're linked into place in
## /usr/lib/systemd rather than /etc/systemd), so we have to mask them. ## /usr/lib/systemd rather than /etc/systemd), so we have to mask them.