diff options
Diffstat (limited to 'recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch')
-rw-r--r-- | recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch index 1c6022b7..e4bb72a0 100644 --- a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch +++ b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 0990db9b9723589606104d42ac2cf865b78e50a1 Mon Sep 17 00:00:00 2001 | 1 | From 3a7112a38d2c44b6fa49e0da1dc4765defd88dbb Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 11:44:44 -0400 | 3 | Date: Thu, 31 May 2018 11:44:44 -0400 |
4 | Subject: [PATCH] template: make busybox template compatible with | 4 | Subject: [PATCH] template: make busybox template compatible with |
5 | |||
5 | core-image-minimal | 6 | core-image-minimal |
6 | 7 | ||
7 | The busybox template makes a lot of assumptions about how the busybox | 8 | The busybox template makes a lot of assumptions about how the busybox |
@@ -16,12 +17,13 @@ core-image-minimal to be able to demonstrate that it can work as well | |||
16 | as to have it available for the ptests. | 17 | as to have it available for the ptests. |
17 | 18 | ||
18 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 19 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
20 | |||
19 | --- | 21 | --- |
20 | templates/lxc-busybox.in | 16 +++++++++++++--- | 22 | templates/lxc-busybox.in | 16 +++++++++++++--- |
21 | 1 file changed, 13 insertions(+), 3 deletions(-) | 23 | 1 file changed, 13 insertions(+), 3 deletions(-) |
22 | 24 | ||
23 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | 25 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in |
24 | index 7d00bf5..5a99103 100644 | 26 | index 9637a71..45b386f 100644 |
25 | --- a/templates/lxc-busybox.in | 27 | --- a/templates/lxc-busybox.in |
26 | +++ b/templates/lxc-busybox.in | 28 | +++ b/templates/lxc-busybox.in |
27 | @@ -181,6 +181,19 @@ configure_busybox() | 29 | @@ -181,6 +181,19 @@ configure_busybox() |
@@ -44,8 +46,8 @@ index 7d00bf5..5a99103 100644 | |||
44 | # symlink busybox for the commands it supports | 46 | # symlink busybox for the commands it supports |
45 | # it would be nice to just use "chroot $rootfs busybox --install -s /bin" | 47 | # it would be nice to just use "chroot $rootfs busybox --install -s /bin" |
46 | # but that only works right in a chroot with busybox >= 1.19.0 | 48 | # but that only works right in a chroot with busybox >= 1.19.0 |
47 | @@ -191,9 +204,6 @@ configure_busybox() | 49 | @@ -189,9 +202,6 @@ configure_busybox() |
48 | xargs -n1 ln -s busybox | 50 | ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox |
49 | ) | 51 | ) |
50 | 52 | ||
51 | - # relink /sbin/init | 53 | - # relink /sbin/init |
@@ -54,6 +56,3 @@ index 7d00bf5..5a99103 100644 | |||
54 | # /etc/fstab must exist for "mount -a" | 56 | # /etc/fstab must exist for "mount -a" |
55 | touch "${rootfs}/etc/fstab" | 57 | touch "${rootfs}/etc/fstab" |
56 | 58 | ||
57 | -- | ||
58 | 2.7.4 | ||
59 | |||