diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-06-02 13:27:21 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2005-06-02 13:27:21 +0000 |
| commit | a99e493d47374651dd66adcc653e7529b002a7f0 (patch) | |
| tree | 15bcc838afba75d8dfb7c648777b7d9346d3512b | |
| parent | a524f9e46fa181b5577916b849293ff180a59cc5 (diff) | |
Added upgrade-inhibit.htm, which prevents entering maintenance mode when a rootfs is loaded from an external disk
BKrev: 429f093929kgF5p0J4e9KdS1BFoWQw
3 files changed, 10 insertions, 8 deletions
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 5439637ee8..6f0e1ea0bf 100644 --- 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-inhibit.htm diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb index e8fc963b1a..d80da29d46 100644 --- 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,12 +96,15 @@ 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 } |