diff --git a/chroot-tasks.py b/chroot-tasks.py index afd721a..389bd37 100755 --- a/chroot-tasks.py +++ b/chroot-tasks.py @@ -87,7 +87,7 @@ def boottoolsSoftwareCompile(): print ('boottoolsSoftwareCompile: spartlnx', file=sys.stderr) try: utils.run (['which', 'spartl64.run']) except: - utils.run (['wget', '--quiet', 'http://damien.guibouret.free.fr/savepart.zip']) + utils.run (['wget', '--tries=5', 'http://damien.guibouret.free.fr/savepart.zip']) utils.run (['unzip', '-o', 'savepart.zip', '-d', '/sbin/', 'spartl64.run', 'spartlnx.run']) utils.run (['mkdir', '/usr/share/doc/spartlnx']) utils.run (['unzip', '-j', '-o', 'savepart.zip', '-d', '/usr/share/doc/spartlnx/', 'doc/en/*']) @@ -115,12 +115,21 @@ def boottoolsRemovePackages(): print ('boottoolsRemovePackages', file=sys.stderr) apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip']) -def setup_resolvconf(): - if os.path.islink('/etc/resolc.conf'): - os.unlink ('/etc/resolv.conf') +def setup_resolvconf1(): + print ('setup_resolvconf1', file=sys.stderr) + subprocess.run (['ls', '-l', '/etc/resolv.conf']) + os.unlink ('/etc/resolv.conf') f = open ('/etc/resolv.conf', 'w') f.write ('nameserver 8.8.8.8') f.close() + subprocess.run (['ls', '-l', '/etc/resolv.conf']) + +def setup_resolvconf2(): + print ('setup_resolvconf2', file=sys.stderr) + subprocess.run (['ls', '-l', '/etc/resolv.conf']) + os.unlink ('/etc/resolv.conf') + os.symlink ('/run/resolvconf/resolv.conf', '/etc/resolv.conf') + subprocess.run (['ls', '-l', '/etc/resolv.conf']) def boottoolsInitrdGenerate (osrelease): print ('boottoolsInitrdGenerate', file=sys.stderr) @@ -159,10 +168,10 @@ if __name__ == '__main__': debconf_settings = config['General'].get ('debconf_settings') updateCaCertificates() - setup_resolvconf() + setup_resolvconf1() boottoolsSoftwareInstall (args.osarch, args.osrelease) boottoolsSoftwareCompile() boottoolsPythonModules() boottoolsRemovePackages() - setup_resolvconf() ## do this again, since someone seems to be overwriting the file + setup_resolvconf2() boottoolsInitrdGenerate (args.osrelease)