1 |
commit: 96dc776787d23238a4e8dfedc4514911a3d84c37 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 23 21:56:17 2014 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 23 22:05:18 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=96dc7767 |
7 |
|
8 |
gen_cmdline: fix pkg path getting stuff deleted |
9 |
|
10 |
If you pass --minkernpackage=X, --modulespackage=X or --kerncache=X with |
11 |
a relative path, then it's creates the output file in a temporary |
12 |
working dir that is later removed during cleanup. |
13 |
|
14 |
Resolve the paths during argument parsing to prevent this. |
15 |
|
16 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
17 |
|
18 |
--- |
19 |
gen_cmdline.sh | 3 +++ |
20 |
1 file changed, 3 insertions(+) |
21 |
|
22 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
23 |
index ca6cbcf..6ef6ae0 100755 |
24 |
--- a/gen_cmdline.sh |
25 |
+++ b/gen_cmdline.sh |
26 |
@@ -501,14 +501,17 @@ parse_cmdline() { |
27 |
;; |
28 |
--minkernpackage=*) |
29 |
CMD_MINKERNPACKAGE=`parse_opt "$*"` |
30 |
+ [ ${CMD_MINKERNPACKAGE:0:1} != / ] && CMD_MINKERNPACKAGE=$PWD/$CMD_MINKERNPACKAGE |
31 |
print_info 2 "MINKERNPACKAGE: ${CMD_MINKERNPACKAGE}" |
32 |
;; |
33 |
--modulespackage=*) |
34 |
CMD_MODULESPACKAGE=`parse_opt "$*"` |
35 |
+ [ ${CMD_MODULESPACKAGE:0:1} != / ] && CMD_MODULESPACKAGE=$PWD/$CMD_MODULESPACKAGE |
36 |
print_info 2 "MODULESPACKAGE: ${CMD_MODULESPACKAGE}" |
37 |
;; |
38 |
--kerncache=*) |
39 |
CMD_KERNCACHE=`parse_opt "$*"` |
40 |
+ [ ${CMD_KERNCACHE:0:1} != / ] && CMD_KERNCACHE=$PWD/$CMD_KERNCACHE |
41 |
print_info 2 "KERNCACHE: ${CMD_KERNCACHE}" |
42 |
;; |
43 |
--kernname=*) |