← Back to branch summary

~wesley-wiedenmeier/curtin/install-kernel

« back to all changes in this revision

Viewing changes to curtin/commands/curthooks.py

  • Committer: Wesley Wiedenmeier
  • Date: 2016-01-28 03:23:52 UTC
  • mfrom: (327.1.1 trunk.install-kernel-fix)
  • Revision ID: wesley.wiedenmeier@gmail.com-20160128032352-8glav7okvoq9q6oq
Merge from lp:~smoser/curtin/trunk.install-kernel-fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
curtin/commands/curthooks.py
197
197
                    LOG.warn("Couldn't determine default kernel for release")
198
198
                    return
199
199
 
200
 
        util.apt_update(target)
201
 
        out, err = in_chroot(['apt-cache', 'search', package], capture=True)
202
 
 
203
 
        if (len(out.strip()) > 0 and
204
 
                not util.has_pkg_installed(package, target)):
205
 
            util.install_packages([package], target=target)
 
200
        if util.has_pkg_available(package, target):
 
201
            if util.has_pkg_installed(package, target):
 
202
                LOG.debug("Kernel package '%s' already installed", package)
 
203
            else:
 
204
                LOG.debug("installing kernel package '%s'", package)
 
205
                util.install_packages([package], target=target)
206
206
        else:
207
 
            LOG.warn("Tried to install kernel %s but package not found."
208
 
                     % package)
209
207
            if kernel_fallback is not None:
 
208
                LOG.info("Kernel package '%s' not available.  "
 
209
                         "Installing fallback package '%s'.",
 
210
                         package, kernel_fallback)
210
211
                util.install_packages([kernel_fallback], target=target)
 
212
            else:
 
213
                LOG.warn("Kernel package '%s' not available and no fallback."
 
214
                         " System may not boot.", package)
211
215
 
212
216
 
213
217
def apply_debconf_selections(cfg, target):