diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-18 21:43:11 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-18 21:43:11 +0000 |
| commit | bdc0886ca344263cd06be258cffaf2bbc66532db (patch) | |
| tree | 244761e2cefcab8ce0643fb9411b5ca72b32385e | |
| parent | 1c87ee48b7a6e4adea79103d960194cd63519da5 (diff) | |
| parent | 76acf05d9628c26420247b4f987850ac439d6007 (diff) | |
merge of 0c0e42d7342579eb1ee491a6b8a0a8610fe644c5
and e02ee9b6b5e60c69a2a2ea80c0f196cf79009da7
| -rw-r--r-- | packages/base-files/base-files_3.0.14.bb | 3 | ||||
| -rw-r--r-- | packages/ftpd-topfield/files/init | 2 | ||||
| -rw-r--r-- | packages/ftpd-topfield/ftpd-topfield_0.5.2.bb (renamed from packages/ftpd-topfield/ftpd-topfield_0.5.1.bb) | 2 | ||||
| -rwxr-xr-x | packages/openslug-init/openslug-init-0.10/functions | 11 | ||||
| -rw-r--r-- | packages/openslug-init/openslug-init_0.10.bb | 2 |
5 files changed, 12 insertions, 8 deletions
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index d546ed5c09..ec58e08bef 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r37" +PR = "r38" LICENSE = "GPL" SRC_URI = " \ @@ -126,6 +126,7 @@ do_install_append_openslug() { rm -r ${D}/mnt/* rmdir ${D}/home/root install -m 0755 -d ${D}/root + ln -s ../root ${D}/home/root } PACKAGES = "${PN}-doc ${PN}" diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init index a4cd501e10..0816e8bb7d 100644 --- a/packages/ftpd-topfield/files/init +++ b/packages/ftpd-topfield/files/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/ftpd-topfield NAME=ftpd-topfield DESC="FTP daemon for the Topfield PVR" -ARGS="-D -e" +ARGS="-D -P 21 -e" test -f $DAEMON || exit 0 diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb index 625cbe28fb..6a6665c8ed 100644 --- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" DEPENDS = "libusb" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_1 \ +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \ cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \ file://init" diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions index ac8e195abd..61b5eb2776 100755 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/packages/openslug-init/openslug-init-0.10/functions @@ -209,10 +209,13 @@ ifup(){ # is not left running so this will only work for # the lease length time! ifconfig "$iface" up - test -n "$hostname" && HOSTNAME="-H $hostname" - # The script writes the required shell variable assignments - # to file descriptor 9 - eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + if test "$(config boot)" != static + then + test -n "$hostname" && HOSTNAME="-H $hostname" + # The script writes the required shell variable assignments + # to file descriptor 9 + eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + fi test -n "$broadcast" && BROADCAST="broadcast $broadcast" test -n "$subnet" && NETMASK="netmask $subnet" diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 59b8c0fd5d..60726d8dc2 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 = "r38" +PR = "r39" SRC_URI = "file://linuxrc \ file://boot/flash \ |