From 7020b9631e04bb70e103cbf8a6eaabcfaaa8d6ef Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 13 Dec 2008 21:14:47 -0600 Subject: add stuff to check for check_upgrade and set the enviroment var. --- .../i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh | 11 +++++++++-- .../rootoverlay/root/LinHES-install.sh | 11 +++++++++-- .../i686-testing-local/rootoverlay/root/LinHES-install.sh | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh index f11b365..85762da 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh @@ -14,10 +14,17 @@ xhost + CMDLINE=$(cat /proc/cmdline) echo $CMDLINE |grep -q nfsroot NFSROOT=$? -if [ x$NFSROOT = x1 ] +echo $CMDLINE |grep -q clean_upgrade +if [ $? = 0 ] then + export CLEAN_UPGRADE=YES +else + export CLEAN_UPGRADE=NO +fi - unbuffer MythVantage & +if [ x$NFSROOT = x1 ] +then + unbuffer MythVantage & else NETBOOT=YES MythVantage & fi diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh index f11b365..85762da 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh @@ -14,10 +14,17 @@ xhost + CMDLINE=$(cat /proc/cmdline) echo $CMDLINE |grep -q nfsroot NFSROOT=$? -if [ x$NFSROOT = x1 ] +echo $CMDLINE |grep -q clean_upgrade +if [ $? = 0 ] then + export CLEAN_UPGRADE=YES +else + export CLEAN_UPGRADE=NO +fi - unbuffer MythVantage & +if [ x$NFSROOT = x1 ] +then + unbuffer MythVantage & else NETBOOT=YES MythVantage & fi diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh index f11b365..85762da 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh @@ -14,10 +14,17 @@ xhost + CMDLINE=$(cat /proc/cmdline) echo $CMDLINE |grep -q nfsroot NFSROOT=$? -if [ x$NFSROOT = x1 ] +echo $CMDLINE |grep -q clean_upgrade +if [ $? = 0 ] then + export CLEAN_UPGRADE=YES +else + export CLEAN_UPGRADE=NO +fi - unbuffer MythVantage & +if [ x$NFSROOT = x1 ] +then + unbuffer MythVantage & else NETBOOT=YES MythVantage & fi -- cgit v0.12 From adae5d40ca2d4795d2cd01149e83fbae6c299b84 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 13 Dec 2008 21:15:30 -0600 Subject: profile sync --- build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks | 1 + build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks | 1 + 2 files changed, 2 insertions(+) diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks index 35a096d..c1d8923 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks @@ -182,3 +182,4 @@ nfs-utils netkit-telnet ntp syslog-ng +mythappletrailers diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks index 35a096d..c1d8923 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks @@ -182,3 +182,4 @@ nfs-utils netkit-telnet ntp syslog-ng +mythappletrailers -- cgit v0.12 From b51bc67ce3eab78d142600a77061dbc247f06fb1 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 14 Dec 2008 13:23:34 -0600 Subject: don't autoload floppy.ko during install closes FS#21 --- build_tools/clarch/larch/profiles/i686-testing-REMOTE/rcconfx | 2 +- build_tools/clarch/larch/profiles/i686-testing-local-httpd/rcconfx | 2 +- build_tools/clarch/larch/profiles/i686-testing-local/rcconfx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rcconfx b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rcconfx index 47ce29d..3b867a6 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rcconfx +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rcconfx @@ -7,7 +7,7 @@ HARDWARECLOCK="UTC" TIMEZONE="UTC" KEYMAP="us" -MODULES=(floppy) +#MODULES=(floppy) HOSTNAME="larch5" diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rcconfx b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rcconfx index 47ce29d..3b867a6 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rcconfx +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rcconfx @@ -7,7 +7,7 @@ HARDWARECLOCK="UTC" TIMEZONE="UTC" KEYMAP="us" -MODULES=(floppy) +#MODULES=(floppy) HOSTNAME="larch5" diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rcconfx b/build_tools/clarch/larch/profiles/i686-testing-local/rcconfx index 47ce29d..3b867a6 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/rcconfx +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rcconfx @@ -7,7 +7,7 @@ HARDWARECLOCK="UTC" TIMEZONE="UTC" KEYMAP="us" -MODULES=(floppy) +#MODULES=(floppy) HOSTNAME="larch5" -- cgit v0.12