Added upgrade-inhibit.htm, which prevents entering maintenance mode when a rootfs...

BKrev: 429f093929kgF5p0J4e9KdS1BFoWQw

diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch
index 5439637..6f0e1ea 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/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,43 @@
+@@ -1,4 +1,41 @@
  ## Simple beta script to verify csr
 +
 +if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi
@@ -11,12 +11,10 @@
 +
 +if [ -f /.ramdisk ] ; then
 +   echo "Root filesystem is running in maintenance mode ..."
-+   ( cd /home/httpd/html/Management ; mv upgrade-maint.htm upgrade.htm )
-+fi
-+
-+if ( [ -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-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 )
 +fi
 +
 +# Wait for the USB disks to be recognised.

diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-inhibit.htm b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-inhibit.htm
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb
index e8fc963..d80da29 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 
-PR = "r65"
+PR = "r66"
 
 UNSLUNG_VERSION = "4.21-beta"
 
@@ -39,7 +39,8 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.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://maintmode.cgi file://upgrade-maint.htm \
+          file://upgrade-nomaint.htm file://upgrade-inhibit.htm \
           file://rc.bootbin \
           "
 
@@ -95,11 +96,14 @@ do_compile () {
        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
        install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade.htm
        sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \
                ${S}/home/httpd/html/Management/upgrade-maint.htm
        sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \
                ${S}/home/httpd/html/Management/upgrade-nomaint.htm
+       sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \
+               ${S}/home/httpd/html/Management/upgrade-inhibit.htm
        sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \
                ${S}/home/httpd/html/Management/upgrade.htm
 }