diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2009-04-10 16:01:23 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2009-04-10 16:01:23 -0700 |
| commit | e557e8a53145506bd95cd37c5e672169ad85b23a (patch) | |
| tree | dcaa330a658e7c06f2766845cbc5dfbeaea2de24 /update-initramfs | |
| parent | 2e53aeece24d032eb852d6c784d17081c821e268 (diff) | |
| parent | b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb (diff) | |
| download | initramfs-tools-e557e8a53145506bd95cd37c5e672169ad85b23a.tar.gz initramfs-tools-e557e8a53145506bd95cd37c5e672169ad85b23a.zip | |
Merge branch 'upstream' into jenner
Conflicts:
debian/changelog
Diffstat (limited to 'update-initramfs')
| -rwxr-xr-x | update-initramfs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/update-initramfs b/update-initramfs index 9830a7d..11f630f 100755 --- a/update-initramfs +++ b/update-initramfs @@ -265,9 +265,6 @@ run_bootloader() if flash-kernel --supported >/dev/null 2>&1; then flash-kernel fi - if glantank-update-kernel --supported >/dev/null 2>&1; then - glantank-update-kernel - fi } compare_sha1() |