diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-06-11 08:02:57 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2005-06-11 08:02:57 +0000 |
| commit | 13aab84e0f22d2648b1c70e1acace80ab82fe46c (patch) | |
| tree | 28eb8a5a85ba1ced7692135f022f670bab62b230 /packages/nslu2-binary-only | |
| parent | b6a70a163b042a110ee0b69590edef91103e4ff3 (diff) | |
Unslung 5.3-alpha: Replacement maintenance mode with code to force entry into RedBoot Upgrade Mode
BKrev: 42aa9ab1a0AgLpxndHr-C3NotrfZYw
Diffstat (limited to 'packages/nslu2-binary-only')
4 files changed, 12 insertions, 19 deletions
diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs/rc-diversion.patch index 71094f6e10..cf0b3c1cc5 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/rc-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs/rc-diversion.patch @@ -1,6 +1,6 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-09-01 21:47:47.000000000 -0400 -@@ -1,4 +1,44 @@ +@@ -1,4 +1,41 @@ ## Simple beta script to verify csr + +if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi @@ -11,13 +11,10 @@ + +if [ -f /.ramdisk ] ; then + echo "Root filesystem is running in maintenance mode ..." -+ ( cd /home/httpd/html/Management ; cp upgrade-maint.htm upgrade.htm ) +elif ( [ -f /.sda1root ] || [ -f /.sdb1root ] || [ -f /.sda2root ] || [ -f /.sdb2root ] ) ; then + echo "Root filesystem is running from an external disk ..." -+ ( cd /home/httpd/html/Management ; cp upgrade-inhibit.htm upgrade.htm ) +else + echo "Root filesystem is running from jffs2 ..." -+ ( cd /home/httpd/html/Management ; cp upgrade-nomaint.htm upgrade.htm ) +fi + +# Wait for the USB disks to be recognised. diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi b/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi index e69de29bb2..0eee123550 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi +++ b/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi @@ -0,0 +1,4 @@ +#!/bin/sh + +/sbin/devio ">>/dev/mtdblock5" "fb#255" 2>/dev/null +/usr/sbin/DO_Reboot 2>/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb index 84457973d7..78c86cf3b0 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r3" +PR = "r5" DEPENDS = "nslu2-linksys-libs" @@ -37,10 +37,8 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r29.tar.bz2 \ file://initialise-mtab.patch;patch=1 \ file://wait-for-quotacheck.patch;patch=1 \ file://mount_usbdevfs.patch;patch=1 \ - file://maintmode.cgi file://upgrade-maint.htm \ - file://upgrade-nomaint.htm file://upgrade-inhibit.htm \ + file://upgrade.htm file://upgrade.cgi \ file://rc.bootbin \ - file://upgrade.cgi \ " S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r29" @@ -87,19 +85,13 @@ do_compile () { # Remove the libraries, because they are in nslu2-linksys-libs now rm -rf ${S}/lib - # Install maintenance mode files - mv ${S}/home/httpd/html/Management/upgrade.cgi ${S}/home/httpd/html/Management/upgrade-real.cgi + # Install upgrade mode files + mv ${S}/home/httpd/html/Management/upgrade.htm ${S}/home/httpd/html/Management/upgrade-old.htm + mv ${S}/home/httpd/html/Management/upgrade.cgi ${S}/home/httpd/html/Management/upgrade-old.cgi + install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management install -m 755 ${WORKDIR}/upgrade.cgi ${S}/home/httpd/html/Management - install -m 755 ${WORKDIR}/maintmode.cgi ${S}/home/httpd/html/Management - install -m 644 ${WORKDIR}/upgrade-maint.htm ${S}/home/httpd/html/Management/upgrade-maint.htm - install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade-nomaint.htm - install -m 644 ${WORKDIR}/upgrade-inhibit.htm ${S}/home/httpd/html/Management/upgrade-inhibit.htm sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ - ${S}/home/httpd/html/Management/upgrade-maint.htm - sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ - ${S}/home/httpd/html/Management/upgrade-nomaint.htm - sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ - ${S}/home/httpd/html/Management/upgrade-inhibit.htm + ${S}/home/httpd/html/Management/upgrade.htm } do_install () { |