diff options
| -rw-r--r-- | recipes-containers/docker/docker_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/docker/files/docker.init | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index 6ce9fe03..04dc76d0 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
| @@ -122,7 +122,7 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docke | |||
| 122 | 122 | ||
| 123 | INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" | 123 | INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" |
| 124 | INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" | 124 | INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" |
| 125 | INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 125 | INITSCRIPT_PARAMS_${PN} = "defaults" |
| 126 | 126 | ||
| 127 | do_install() { | 127 | do_install() { |
| 128 | mkdir -p ${D}/${bindir} | 128 | mkdir -p ${D}/${bindir} |
diff --git a/recipes-containers/docker/files/docker.init b/recipes-containers/docker/files/docker.init index 9c01c758..2e8eb9e4 100644 --- a/recipes-containers/docker/files/docker.init +++ b/recipes-containers/docker/files/docker.init | |||
| @@ -28,6 +28,7 @@ exec="/usr/bin/$prog" | |||
| 28 | pidfile="/var/run/$prog.pid" | 28 | pidfile="/var/run/$prog.pid" |
| 29 | lockfile="/var/lock/subsys/$prog" | 29 | lockfile="/var/lock/subsys/$prog" |
| 30 | logfile="/var/log/$prog" | 30 | logfile="/var/log/$prog" |
| 31 | other_args="--registry-mirror=http://localhost:5000 --insecure-registry=http://localhost:5000 --raw-logs" | ||
| 31 | 32 | ||
| 32 | [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog | 33 | [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog |
| 33 | 34 | ||
| @@ -38,8 +39,8 @@ start() { | |||
| 38 | 39 | ||
| 39 | if ! [ -f $pidfile ]; then | 40 | if ! [ -f $pidfile ]; then |
| 40 | printf "Starting $prog:\t" | 41 | printf "Starting $prog:\t" |
| 41 | echo "\n$(date)\n" >> $logfile | 42 | echo -e "\n$(date)\n" >> $logfile |
| 42 | "$unshare" -m -- $exec -d $other_args &>> $logfile & | 43 | "$unshare" -m -- $exec daemon $other_args &>> $logfile & |
| 43 | pid=$! | 44 | pid=$! |
| 44 | touch $lockfile | 45 | touch $lockfile |
| 45 | # wait up to 10 seconds for the pidfile to exist. see | 46 | # wait up to 10 seconds for the pidfile to exist. see |
