[lxc-devel] [lxc/lxc] e76e31: Adaptation to latest busybox

[Christian Brauner]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: e76e315c1111d8361093c24ff5fabb5e3e292e26
      https://github.com/lxc/lxc/commit/e76e315c1111d8361093c24ff5fabb5e3e292e26
  Author: Rachid Koucha <47061324+Rachid-Koucha at users.noreply.github.com>
  Date:   2019-12-27 (Fri, 27 Dec 2019)

  Changed paths:
    M templates/lxc-busybox.in

  Log Message:
  -----------
  Adaptation to latest busybox

In busybox 1.30, the help of udhcpc for "-s" option changed:
--> busybox v1.27.2: -s,--script PROG	Run PROG at DHCP events (default /usr/share/udhcpc/default.script)
--> busybox v1.30.1: -s PROG		Run PROG at DHCP events (default /etc/udhcpc/default.script)
So, I changed the command line which extracts the script name to make it work for both versions

Signed-off-by: Rachid Koucha <rachid.koucha at gmail.com>


  Commit: 2b0d48477ad64b22bcdc68f6e5aec082828645f1
      https://github.com/lxc/lxc/commit/2b0d48477ad64b22bcdc68f6e5aec082828645f1
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2019-12-27 (Fri, 27 Dec 2019)

  Changed paths:
    M templates/lxc-busybox.in

  Log Message:
  -----------
  Merge pull request #3244 from Rachid-Koucha/master

Adaptation to latest busybox


Compare: https://github.com/lxc/lxc/compare/d55ea1ec6c18...2b0d48477ad6