diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-19 22:37:14 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-19 22:37:14 +0000 |
| commit | e16e52340d8139c27fcd0118c34bf6380c1777d6 (patch) | |
| tree | 536a2005e90760093227c560ad71ce94aceed768 /packages | |
| parent | bff0dec540fe6de806d7ea3f7dc9f566d37b79bc (diff) | |
| parent | 70f1c204b65ebfc97628c76520c0e2c1aed19f40 (diff) | |
propagate from branch 'org.openembedded.dev' (head 4ebdb5bb78b28c6a866bf5b6492e5fc7c9a839b9)
to branch 'org.openembedded.nslu2-linux' (head aa532a4ba0ea2a76e4470138c314b376c07c7751)
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/openslug-init/openslug-init-0.10/functions | 5 | ||||
| -rw-r--r-- | packages/openslug-init/openslug-init_0.10.bb | 2 | ||||
| -rw-r--r-- | packages/samba/samba_3.0.14a.bb | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions index 43b109977d..55f3397462 100755 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/packages/openslug-init/openslug-init-0.10/functions @@ -307,8 +307,9 @@ umountflash() { # handle this entry, since this is currently only used for unmounting # the flash root partition we know a file which must exist... - case "$type" in - jffs2) test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" || + case "$mp/$type" in + //jffs2);; # skip / + */jffs2)test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" || umount "$mp" || { echo "$0: $mp: unable to umount $ffsdev" >&2 return 1 diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index fd2080ff65..e26b118a6a 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r40" +PR = "r41" SRC_URI = "file://linuxrc \ file://boot/flash \ diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index 395decfdf8..fdd3cd6685 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -16,6 +16,7 @@ INITSCRIPT_NAME = "samba" # level, later levels put the shutdown later too - see the links # in rc6.d, the shutdown must precede network shutdown). INITSCRIPT_PARAMS = "defaults" +#CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" # The file system settings --foodir=dirfoo and overridden unconditionally # in the samba config by --with-foodir=dirfoo - even if the --with is not @@ -39,7 +40,7 @@ do_install_append() { install -d "${D}${sysconfdir}/init.d" install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba install -d "${D}${sysconfdir}/samba" - install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf.default + install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf } PACKAGES =+ "swat" |