diff options
| author | Turbo Fredriksson <[email protected]> | 2015-07-24 12:49:03 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-07-24 15:05:33 -0700 |
| commit | 48511ea6454224bc96ac518501a89ba52d7a5102 (patch) | |
| tree | bfdd2163d89ef023b23c05a4ae14b1386de63ded /config/deb.am | |
| parent | 96c080cb9c2c1c4e669bdc6930128bc676bc5552 (diff) | |
Fix some minor issues with the SYSV init and initramfs scripts.
This is some minor fixes to commits 2cac7f5f11756663525a5d4604d9f0a3202d4024
and 2a34db1bdbcecf5019c4a59f2a44c92fe82010f2.
* Make sure to alien'ate the new initramfs rpm package as well!
The rpm package is build correctly, but alien isn't run on it to
create the deb.
* Before copying file from COPY_FILE_LIST, make sure the DESTDIR/dir exists.
* Include /lib/udev/vdev_id file in the initrd.
* Because the initrd needs to use '/sbin/modprobe' instead of 'modprobe',
we need to use this in load_module() as well.
* Make sure that load_module() can be used more globaly, instead of
calling '/sbin/modprobe' all over the place.
* Make sure that check_module_loaded() have a parameter - module to
check.
Signed-off-by: Turbo Fredriksson <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3626
Diffstat (limited to 'config/deb.am')
| -rw-r--r-- | config/deb.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/deb.am b/config/deb.am index acde650ce..648417b2a 100644 --- a/config/deb.am +++ b/config/deb.am @@ -37,9 +37,12 @@ if CONFIG_USER pkg6=libzfs2-devel-$${version}.$${arch}.rpm; \ pkg7=$${name}-test-$${version}.$${arch}.rpm; \ pkg8=$${name}-dracut-$${version}.$${arch}.rpm; \ + pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \ fakeroot $(ALIEN) --bump=0 --scripts --to-deb \ - $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 $$pkg8; \ - $(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 $$pkg8; + $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \ + $$pkg8 $$pkg9; + $(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \ + $$pkg8 $$pkg9; endif deb: deb-kmod deb-utils |