diff options
| -rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
| -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 |
4 files changed, 7 insertions, 5 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 5efabd1cfc..7535f63a01 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 DISTRO_NAME = "OpenSlug" -DISTRO_VERSION = "2.2-beta" +DISTRO_VERSION = "2.4-beta" DISTRO_TYPE ?= "beta" # Add to the user's feeds from local.conf (there may be none) 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" |