| Message ID | 1362406776-5368-1-git-send-email-jabk@prevas.dk |
|---|---|
| State | Accepted |
| Delegated to: | Jacob Kjaergaard |
| Headers | show |
Jacob Barsoe <jabk@prevas.dk> writes: > From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk> > > openssh will not start unless user sshd exists. > --- > recipes/openssh/files/group | 1 + > recipes/openssh/files/passwd | 1 + > recipes/openssh/openssh.inc | 9 +++++++-- > 3 files changed, 9 insertions(+), 2 deletions(-) > create mode 100644 recipes/openssh/files/group > create mode 100644 recipes/openssh/files/passwd > > diff --git a/recipes/openssh/files/group b/recipes/openssh/files/group > new file mode 100644 > index 0000000..a5f15a3 > --- /dev/null > +++ b/recipes/openssh/files/group > @@ -0,0 +1 @@ > +sshd:*:74: > diff --git a/recipes/openssh/files/passwd b/recipes/openssh/files/passwd > new file mode 100644 > index 0000000..34d0b79 > --- /dev/null > +++ b/recipes/openssh/files/passwd > @@ -0,0 +1 @@ > +sshd:*:74:74::/home/sshd:/bin/sh > diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc > index 1c04b60..1261508 100644 > --- a/recipes/openssh/openssh.inc > +++ b/recipes/openssh/openssh.inc > @@ -12,10 +12,11 @@ LICENSE = "BSD" > > RECIPE_TYPES = "machine" > > -inherit autotools > +inherit autotools passwd > > SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz" > SRC_URI += "file://sshd_config file://ssh_config file://init" > +SRC_URI += "file://passwd file://group" > > DEPENDS = "libcrypto libssl libz libdl libutil libresolv libcrypt" > > @@ -71,4 +72,8 @@ FILES_${PN}-sshd-doc = "${mandir}/*/moduli.* ${mandir}/*/sshd_config.*" > > RDEPENDS_${PN} += "${AUTO_PACKAGE_UTILS_PACKAGES}" > AUTO_PACKAGE_UTILS_RDEPENDS = "libc libgcc libdl libutil libcrypto libz" > -RDEPENDS_${PN}-sshd = "${PN}-keygen" Is this intentional? If so, I guess it should be in a separate commit with description of why. > + > +inherit sysvinit > +RECIPE_FLAGS = "sshd_sysvinit_start sshd_sysvinit_stop" > +DEFAULT_USE_sshd_sysvinit_start = "25" > +DEFAULT_USE_sshd_sysvinit_stop = "0" /Esben
Jacob Barsøe Kjærgaard <jacob.kjaergaard@prevas.dk> writes: > On 03/04/2013 04:15 PM, Esben Haabendal wrote: >> Jacob Barsoe <jabk@prevas.dk> writes: >> >>> From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk> >>> >>> openssh will not start unless user sshd exists. >>> --- >>> recipes/openssh/files/group | 1 + >>> recipes/openssh/files/passwd | 1 + >>> recipes/openssh/openssh.inc | 9 +++++++-- >>> 3 files changed, 9 insertions(+), 2 deletions(-) >>> create mode 100644 recipes/openssh/files/group >>> create mode 100644 recipes/openssh/files/passwd >>> >>> diff --git a/recipes/openssh/files/group b/recipes/openssh/files/group >>> new file mode 100644 >>> index 0000000..a5f15a3 >>> --- /dev/null >>> +++ b/recipes/openssh/files/group >>> @@ -0,0 +1 @@ >>> +sshd:*:74: >>> diff --git a/recipes/openssh/files/passwd b/recipes/openssh/files/passwd >>> new file mode 100644 >>> index 0000000..34d0b79 >>> --- /dev/null >>> +++ b/recipes/openssh/files/passwd >>> @@ -0,0 +1 @@ >>> +sshd:*:74:74::/home/sshd:/bin/sh >>> diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc >>> index 1c04b60..1261508 100644 >>> --- a/recipes/openssh/openssh.inc >>> +++ b/recipes/openssh/openssh.inc >>> @@ -12,10 +12,11 @@ LICENSE = "BSD" >>> RECIPE_TYPES = "machine" >>> -inherit autotools >>> +inherit autotools passwd >>> SRC_URI = >>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz" >>> SRC_URI += "file://sshd_config file://ssh_config file://init" >>> +SRC_URI += "file://passwd file://group" >>> DEPENDS = "libcrypto libssl libz libdl libutil libresolv libcrypt" >>> @@ -71,4 +72,8 @@ FILES_${PN}-sshd-doc = "${mandir}/*/moduli.* >>> ${mandir}/*/sshd_config.*" >>> RDEPENDS_${PN} += "${AUTO_PACKAGE_UTILS_PACKAGES}" >>> AUTO_PACKAGE_UTILS_RDEPENDS = "libc libgcc libdl libutil libcrypto libz" >>> -RDEPENDS_${PN}-sshd = "${PN}-keygen" >> Is this intentional? If so, I guess it should be in a separate commit >> with description of why. > No this is not intentional. So, should I merge this without the line above? /Esben
Jacob Barsøe Kjærgaard <jacob.kjaergaard@prevas.dk> writes: > On 03/05/2013 09:54 AM, Esben Haabendal wrote: >> Jacob Barsøe Kjærgaard <jacob.kjaergaard@prevas.dk> writes: >> >>> On 03/04/2013 04:15 PM, Esben Haabendal wrote: >>>> Jacob Barsoe <jabk@prevas.dk> writes: >>>> >>>>> From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk> >>>>> >>>>> openssh will not start unless user sshd exists. >>>>> --- >>>>> recipes/openssh/files/group | 1 + >>>>> recipes/openssh/files/passwd | 1 + >>>>> recipes/openssh/openssh.inc | 9 +++++++-- >>>>> 3 files changed, 9 insertions(+), 2 deletions(-) >>>>> create mode 100644 recipes/openssh/files/group >>>>> create mode 100644 recipes/openssh/files/passwd >>>>> >>>>> diff --git a/recipes/openssh/files/group b/recipes/openssh/files/group >>>>> new file mode 100644 >>>>> index 0000000..a5f15a3 >>>>> --- /dev/null >>>>> +++ b/recipes/openssh/files/group >>>>> @@ -0,0 +1 @@ >>>>> +sshd:*:74: >>>>> diff --git a/recipes/openssh/files/passwd b/recipes/openssh/files/passwd >>>>> new file mode 100644 >>>>> index 0000000..34d0b79 >>>>> --- /dev/null >>>>> +++ b/recipes/openssh/files/passwd >>>>> @@ -0,0 +1 @@ >>>>> +sshd:*:74:74::/home/sshd:/bin/sh >>>>> diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc >>>>> index 1c04b60..1261508 100644 >>>>> --- a/recipes/openssh/openssh.inc >>>>> +++ b/recipes/openssh/openssh.inc >>>>> @@ -12,10 +12,11 @@ LICENSE = "BSD" >>>>> RECIPE_TYPES = "machine" >>>>> -inherit autotools >>>>> +inherit autotools passwd >>>>> SRC_URI = >>>>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz" >>>>> SRC_URI += "file://sshd_config file://ssh_config file://init" >>>>> +SRC_URI += "file://passwd file://group" >>>>> DEPENDS = "libcrypto libssl libz libdl libutil libresolv libcrypt" >>>>> @@ -71,4 +72,8 @@ FILES_${PN}-sshd-doc = "${mandir}/*/moduli.* >>>>> ${mandir}/*/sshd_config.*" >>>>> RDEPENDS_${PN} += "${AUTO_PACKAGE_UTILS_PACKAGES}" >>>>> AUTO_PACKAGE_UTILS_RDEPENDS = "libc libgcc libdl libutil libcrypto libz" >>>>> -RDEPENDS_${PN}-sshd = "${PN}-keygen" >>>> Is this intentional? If so, I guess it should be in a separate commit >>>> with description of why. >>> No this is not intentional. >> So, should I merge this without the line above? >> >> /Esben > Yes please, the patch line should be omitted. Otherwise the use of > openssh-sshd package will lack keygen package. Merged to master. /Esben
diff --git a/recipes/openssh/files/group b/recipes/openssh/files/group new file mode 100644 index 0000000..a5f15a3 --- /dev/null +++ b/recipes/openssh/files/group @@ -0,0 +1 @@ +sshd:*:74: diff --git a/recipes/openssh/files/passwd b/recipes/openssh/files/passwd new file mode 100644 index 0000000..34d0b79 --- /dev/null +++ b/recipes/openssh/files/passwd @@ -0,0 +1 @@ +sshd:*:74:74::/home/sshd:/bin/sh diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc index 1c04b60..1261508 100644 --- a/recipes/openssh/openssh.inc +++ b/recipes/openssh/openssh.inc @@ -12,10 +12,11 @@ LICENSE = "BSD" RECIPE_TYPES = "machine" -inherit autotools +inherit autotools passwd SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz" SRC_URI += "file://sshd_config file://ssh_config file://init" +SRC_URI += "file://passwd file://group" DEPENDS = "libcrypto libssl libz libdl libutil libresolv libcrypt" @@ -71,4 +72,8 @@ FILES_${PN}-sshd-doc = "${mandir}/*/moduli.* ${mandir}/*/sshd_config.*" RDEPENDS_${PN} += "${AUTO_PACKAGE_UTILS_PACKAGES}" AUTO_PACKAGE_UTILS_RDEPENDS = "libc libgcc libdl libutil libcrypto libz" -RDEPENDS_${PN}-sshd = "${PN}-keygen" + +inherit sysvinit +RECIPE_FLAGS = "sshd_sysvinit_start sshd_sysvinit_stop" +DEFAULT_USE_sshd_sysvinit_start = "25" +DEFAULT_USE_sshd_sysvinit_stop = "0"
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk> openssh will not start unless user sshd exists. --- recipes/openssh/files/group | 1 + recipes/openssh/files/passwd | 1 + recipes/openssh/openssh.inc | 9 +++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 recipes/openssh/files/group create mode 100644 recipes/openssh/files/passwd