From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 11 Jul 2005 21:10:17 +0000 (+0000)
Subject: Add fix from whiterussian
X-Git-Tag: reboot~32383
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d79a95028528794226418c28bf072b046a34b9d8;p=openwrt%2Fstaging%2Fnoltari.git

Add fix from whiterussian

SVN-Revision: 1412
---

diff --git a/openwrt/package/osiris/patches/install-non-interactive.patch b/openwrt/package/osiris/patches/install-non-interactive.patch
deleted file mode 100644
index ac5a177731..0000000000
--- a/openwrt/package/osiris/patches/install-non-interactive.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ruN osiris-4.1.8-orig/Makefile.am osiris-4.1.8-1/Makefile.am
---- osiris-4.1.8-orig/Makefile.am	2005-01-13 06:49:15.000000000 +0100
-+++ osiris-4.1.8-1/Makefile.am	2005-04-22 23:11:32.000000000 +0200
-@@ -72,5 +72,5 @@
- # everything.
- 
- install-data-local:
--	@cd ./src/install;./install.sh
-+	@cd ./src/install;./install.sh non-interactive
- 	@rm ./src/osirisd/modules/libmodules.a
-diff -ruN osiris-4.1.8-orig/Makefile.in osiris-4.1.8-1/Makefile.in
---- osiris-4.1.8-orig/Makefile.in	2005-04-04 14:51:19.000000000 +0200
-+++ osiris-4.1.8-1/Makefile.in	2005-04-22 23:11:32.000000000 +0200
-@@ -505,7 +505,7 @@
- # everything.
- 
- install-data-local:
--	@cd ./src/install;./install.sh
-+	@cd ./src/install;./install.sh non-interactive
- 	@rm ./src/osirisd/modules/libmodules.a
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -ruN osiris-4.1.8-orig/configure osiris-4.1.8-1/configure
-diff -ruN osiris-4.1.8-orig/configure.ac osiris-4.1.8-1/configure.ac
-diff -ruN osiris-4.1.8-orig/ipkg/osirisd/CONTROL/control osiris-4.1.8-1/ipkg/osirisd/CONTROL/control
-diff -ruN osiris-4.1.8-orig/ipkg/osirisd/etc/init.d/osirisd osiris-4.1.8-1/ipkg/osirisd/etc/init.d/osirisd
-diff -ruN osiris-4.1.8-orig/ipkg/osirisd-static/CONTROL/control osiris-4.1.8-1/ipkg/osirisd-static/CONTROL/control
-diff -ruN osiris-4.1.8-orig/ipkg/rules osiris-4.1.8-1/ipkg/rules
-diff -ruN osiris-4.1.8-orig/ipkg/version osiris-4.1.8-1/ipkg/version
-diff -ruN osiris-4.1.8-orig/src/install/install.sh.in osiris-4.1.8-1/src/install/install.sh.in
---- osiris-4.1.8-orig/src/install/install.sh.in	2005-04-15 22:38:31.000000000 +0200
-+++ osiris-4.1.8-1/src/install/install.sh.in	2005-04-22 23:41:21.000000000 +0200
-@@ -14,7 +14,9 @@
- 
- SERVICE_DESC="Osiris Host Integrity Monitor"
- 
--INTERACTIVE=1
-+if [ -z "${INTERACTIVE}" ]; then
-+    INTERACTIVE=1
-+fi
- PACKAGE_MODE=0
- NO_USER_ADDED=0
- 
-@@ -1117,18 +1119,6 @@
- 
-  # look for interactive mode argument.
- 
--if [ -z "${1}" ] ; then
--    INTERACTIVE=1
--else
--    INTERACTIVE=0
--fi
--
--# Change behaviour if we are creating packages.
--if [ -n "$DESTDIR" ]; then
--    PACKAGE_MODE=1
--    INTERACTIVE=0
--fi
--
- pre_install
- create_users_and_groups
- prompts
-diff -ruN osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/Makefile osiris-4.1.8-1/src/osirisd/modules/mod_nvram/Makefile
-diff -ruN osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/README osiris-4.1.8-1/src/osirisd/modules/mod_nvram/README
-diff -ruN osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/mod_nvram.c osiris-4.1.8-1/src/osirisd/modules/mod_nvram/mod_nvram.c
-diff -ruN osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/Makefile osiris-4.1.8-1/src/osirisd/modules/mod_uptime/Makefile
-diff -ruN osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/README osiris-4.1.8-1/src/osirisd/modules/mod_uptime/README
-diff -ruN osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/mod_uptime.c osiris-4.1.8-1/src/osirisd/modules/mod_uptime/mod_uptime.c
-diff -ruN osiris-4.1.8-orig/src/osirisd/osirisd.c osiris-4.1.8-1/src/osirisd/osirisd.c
-diff -ruN osiris-4.1.8-orig/src/osirisd/rootpriv.c osiris-4.1.8-1/src/osirisd/rootpriv.c