From 2977acb7eedc1934fa051d69d3e88e633db0d1d7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 May 2016 14:01:17 +0000
Subject: LinHES-config: mv_advanced.py: run grub-mkconfig when setting up
splash
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_advanced.py | 3 +++
abs/core/LinHES-config/mv_install.py | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 363c691..8af08e7 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.4
-pkgrel=8
+pkgrel=9
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -137,7 +137,7 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
+md5sums=('97b810ddc35d1f441dbe8cdd6886e2af'
'51525188ac6f6034422c5d71d0c84408'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
@@ -161,7 +161,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
'd3490e93f313bbbcbc6c3693c56b9c17'
'e959df98947eb0d2ea64ff616b61aab5'
'2506860a416e1988934225d80d501c2c'
- 'c0549457750c4f8e8038d904a0f3012a'
+ 'f57200b66b6cf384f2c784b3e4303503'
'b3505d27b65a4d35e252e2d256909e80'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'02b4378b17bca6bebdcc2258a80dfc6b'
diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py
index de10d78..d67e420 100755
--- a/abs/core/LinHES-config/mv_advanced.py
+++ b/abs/core/LinHES-config/mv_advanced.py
@@ -97,6 +97,9 @@ def setup_splash(Usebootsplash):
#this is needed in case grub-mkconfig is run
cmd = ''' sed -i "s/^GRUB_DEFAULT.*$/GRUB_DEFAULT="1"/g" /etc/default/grub'''
mv_common.runcmd(cmd)
+ logging.info(" Running grub-mkconfig")
+ cmd="grub-mkconfig -o /boot/grub/grub.cfg"
+ mv_common.runcmd(cmd)
return
#def setup_rrd(UseRRD):
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 7dfbddb..ed3e342 100644
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -1242,7 +1242,7 @@ def grub_it():
new_line='''GRUB_COLOR_HIGHLIGHT="black/yellow"\n'''
if line.find(hidden_time) != -1 :
- new_line="GRUB_HIDDEN_TIMEOUT=5\n"
+ new_line="GRUB_HIDDEN_TIMEOUT=3\n"
newgrub.append(new_line)
--
cgit v0.12