deac/linux-update
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

type fixed. config will not be overwritten, if exists

Browse source
This commit is contained in:
Denis Knauf 2013-04-11 15:55:03 +02:00
parent cd5a2e60f1
commit 8273ad411d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linux-update.rb
View file

@ -61,7 +61,7 @@ module LinuxUpdate
end end
def make *opts, &block def make *opts, &block
block ||= lambda {|rd| IO::copy_stream rd, STDOUT } } block ||= lambda {|rd| IO::copy_stream rd, STDOUT }
dir = @dir.to_s dir = @dir.to_s
rd, wr = IO.pipe rd, wr = IO.pipe
pid = fork do pid = fork do
@ -286,7 +286,7 @@ module LinuxUpdate
ELD ELD
def oldconfig version = nil def oldconfig version = nil
version, config = base.oldconfig_prepare( version, options[:config]) version, config = base.oldconfig_prepare( version, options[:config])
version.import_config config if nil != options['config'] and config version.import_config config if nil != options['config'] and config and not version.config.exist?
version.oldconfig version.oldconfig
end end
@ -301,7 +301,7 @@ module LinuxUpdate
desc 'menuconfig|configure [VERSION]', 'Configure your linux-VERSION. (default: most actual version).' desc 'menuconfig|configure [VERSION]', 'Configure your linux-VERSION. (default: most actual version).'
def menuconfig version = nil def menuconfig version = nil
version, config = base.oldconfig_prepare( version, options[:config]) version, config = base.oldconfig_prepare( version, options[:config])
version.import_config config if nil != options['config'] and config version.import_config config if nil != options['config'] and config and not version.config.exist?
version.menuconfig version.menuconfig
end end
map configure: :menuconfig map configure: :menuconfig
@ -321,7 +321,7 @@ module LinuxUpdate
desc 'all [VERSION]', 'Will oldconfig, compile and install kernel and modules. See these methods.' desc 'all [VERSION]', 'Will oldconfig, compile and install kernel and modules. See these methods.'
def all version = nil def all version = nil
version, config = base.oldconfig_prepare( version, options[:config]) version, config = base.oldconfig_prepare( version, options[:config])
version.import_config config if nil != options['config'] and config version.import_config config if nil != options['config'] and config and not version.config.exist?
version.oldconfig version.oldconfig
version.compile version.compile
version.install version.install