diff --git a/boottools/apt.py b/boottools/apt.py index b75a5a7..7fe0656 100644 --- a/boottools/apt.py +++ b/boottools/apt.py @@ -62,5 +62,4 @@ def install (pkgs, opts={}): for k in opts: opts_list += ['-o', f'{k}={opts[k]}'] print ('about to install these packages: "{}"'.format (' '.join (pkgs))) import subprocess - subprocess.run (['apt-get', '--yes', 'update']) subprocess.run (['apt-get', '--yes', 'install'] + pkgs + opts_list) diff --git a/chroot-tasks.py b/chroot-tasks.py index 6d0288e..a3229ad 100755 --- a/chroot-tasks.py +++ b/chroot-tasks.py @@ -32,7 +32,7 @@ def boottoolsSoftwareInstall (osarch, osrelease): pkgs32 = [] if 'i386' != osarch: utils.run (['dpkg', '--add-architecture', 'i386']) - pkgs32 = 'lib32gcc-s1 lib32stdc++6 lib32z1 libc6-i386'.split (' ') ## nserrano: he cambiado lib32gcc1 por lib32gcc-s1 pero como queramos crear un oglive viejo, esto va a petar + pkgs32 = 'lib32gcc-s1 lib32stdc++6 lib32z1 libc6-i386'.split (' ') _oghook_deactivate() @@ -44,6 +44,9 @@ def boottoolsSoftwareInstall (osarch, osrelease): for section in config.options('Packages'): pkgs += re.split (r'[ \n]', config['Packages'].get(section).strip()) + apt.update() + apt.upgrade() + pkgs = [f'linux-image-{osrelease}', f'linux-headers-{osrelease}', f'linux-modules-{osrelease}', f'linux-modules-extra-{osrelease}', 'dkms', 'shim-signed', 'openssl', 'sshfs', 'kexec-tools'] + pkgs32 + pkgs print (f'boottoolsSoftwareInstall: installing packages: {str(pkgs)}', file=sys.stderr) apt.install (pkgs, opts={'DPkg::Options::': '--force-confdef'}) ## --force-confdef is required to avoid an interactive question regarding /etc/ssh/ssh_config @@ -85,7 +88,7 @@ def boottoolsSoftwareCompile(): try: utils.run (['which', 'spartl64.run']) except: utils.run (['wget', '--quiet', 'http://damien.guibouret.free.fr/savepart.zip']) - utils.run (['unzip', '-o', 'savepart.zip', '-d', '/sbin/', 'spartl64.run']) + 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/*'])