diff options
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core/LinHES-config/blacklist_nouveau.conf | 2 | ||||
| -rw-r--r-- | abs/core/LinHES-config/blacklist_pcspkr.conf | 1 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_advanced.py | 18 |
4 files changed, 28 insertions, 19 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 4ab3f97..8c7a010 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -47,7 +47,7 @@ source=(mv_install.py 09_mythvantge_runit_grub myth_user_call.py mythvantage.cfg config-sudo.rules - hdhr.conf) + hdhr.conf blacklist_nouveau.conf blacklist_pcspkr.conf ) backup=(etc/mythvantage.cfg) install=config.install @@ -113,21 +113,25 @@ build() { #sysctrl conf install -o root -g root -D -m 0755 hdhr.conf $startdir/pkg/etc/sysctl.d/hdhr.conf + + #modules blacklist files + install -o root -g root -D -m 0755 blacklist_pcspkr.conf $startdir/pkg/etc/modprobe.d/blacklist_pcspkr.conf + install -o root -g root -D -m 0755 blacklist_nouveau.conf $startdir/pkg/etc/modprobe.d/blacklist_nouveau.conf } -md5sums=('5d40d7ce4cd99fae059cac37cef9440f' - '8aec4b2310e4c5375e32df37d37964dd' - '16b98fcb3753ef6cfc35075c326d30e4' +md5sums=('d1ad14e1fb1d49b38dd27a96f6c75309' + 'c68322a6f6f86f050035a81907f5c1db' + 'f909edd79b8a222fb42fb3958851b53a' '2596460462cf6c889cf8f95485537b20' '985891a43f7c4c983eb2a362162f1a0f' '13172731c8b08d669336da31cece5775' '5a31addfbdc1154b05997f972a32fa33' - 'c20f73d4da5d7e15e1f3eb85c7dcb49a' + 'f73d6d6f98839e900cb6685bf5dc4eae' '68199e861c2933ccbb84735b9b440157' '2a7f3b34e522acfd08283b86c8926aba' '60103d94ada98ac583fea620294f14d3' - '960017a34d9cc78af6298f45aad6eb8e' + '803a835d226a0677de5d50df335b5766' 'ecf9e5df20683a769c4a8a8f2d65de85' - '6d32a88e76b0a97b0ce67d37ef6394aa' + '895d4e842d7457a48a6d2ce0e9c833b7' '8ba06c2ce6129371548cc360ccca27f8' '55fccb1da0417a896b724f7cfc32dd5a' 'ab2aa42c2947148c2b1cac0ade6d1d55' @@ -136,11 +140,11 @@ md5sums=('5d40d7ce4cd99fae059cac37cef9440f' '9151c74fcaf18ec4cf5e757cfdbc7017' '3d1e4a119f38cff0498bf8a67e94e4b3' '71fd2d0d448fc2fcd15415a1beed7109' - '61ccbf573ee196e3edf53a512820b431' + '51034e5030158c619f21e5593a300f7b' 'd66c0e470e54a1551bdf60d8df85108d' 'b845de3e05c1734cce4b9ac5e8f1baaf' '6801f87992b44118a12b6dfe6ea68127' - '5e69839659d65ddda35b8a9982dc29e9' + 'eaf5b9bab2a52beb8ad5ca6f0f56026d' '2934fd80277e4598856f3171ccef9bfd' '824e49d9b01fed295c704ab68908b464' 'fe5e31b833cc6707209e9d656b6eb53c' @@ -152,4 +156,6 @@ md5sums=('5d40d7ce4cd99fae059cac37cef9440f' '2596460462cf6c889cf8f95485537b20' 'a63ff9ef5250965aeabc74bfa8e43981' '4804aa93aaad3dfcfff08cd9ffd68836' - '0fa6fffd87f350380d45f1f8a5b7babe') + '0fa6fffd87f350380d45f1f8a5b7babe' + '6ec39b010c0ed8901ea896c7e153d330' + '3866086e6af5e3528a66eff492f2f4dd') diff --git a/abs/core/LinHES-config/blacklist_nouveau.conf b/abs/core/LinHES-config/blacklist_nouveau.conf new file mode 100644 index 0000000..e09e227 --- /dev/null +++ b/abs/core/LinHES-config/blacklist_nouveau.conf @@ -0,0 +1,2 @@ +blacklist nouveau +install nouveau /bin/false diff --git a/abs/core/LinHES-config/blacklist_pcspkr.conf b/abs/core/LinHES-config/blacklist_pcspkr.conf new file mode 100644 index 0000000..b46792e --- /dev/null +++ b/abs/core/LinHES-config/blacklist_pcspkr.conf @@ -0,0 +1 @@ +blacklist pcspkr diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py index e72b6bc..98664da 100755 --- a/abs/core/LinHES-config/mv_advanced.py +++ b/abs/core/LinHES-config/mv_advanced.py @@ -98,13 +98,13 @@ def setup_splash(Usebootsplash): mv_common.runcmd(cmd) return -def setup_rrd(UseRRD): - if UseRRD == "1": - logging.info(" Enabling rrd_stats") - mv_common.pacinstall("rrd_stats") - else: - logging.info(" Disabling rrd_stats") - mv_common.pacremove("rrd_stats") +#def setup_rrd(UseRRD): + #if UseRRD == "1": + #logging.info(" Enabling rrd_stats") + #mv_common.pacinstall("rrd_stats") + #else: + #logging.info(" Disabling rrd_stats") + #mv_common.pacremove("rrd_stats") def setup_hobbit(UseHobbit,SystemType,dbhost): @@ -405,8 +405,8 @@ def setup_advanced(systemconfig,data_config): setup_hobbit(systemconfig.get("UseHobbit"), systemconfig.get("SystemType"), systemconfig.get("dbhost")) - if data_config.SYSTEMTYPE == "LinHES": - setup_rrd(systemconfig.get("UseRRD")) + #if data_config.SYSTEMTYPE == "LinHES": + #setup_rrd(systemconfig.get("UseRRD")) setup_evrouter(systemconfig.get("UseEvrouter"), systemconfig.get("EvrouterConfig"), |