From 4077f5d9f773081059c5414d46e47d05ce00a106 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 27 Apr 2018 19:43:14 +0000 Subject: LinHES-config: hide some boot messages with splash --- abs/core/LinHES-config/09_mythvantge_runit_grub | 2 +- abs/core/LinHES-config/PKGBUILD | 11 ++++++----- abs/core/LinHES-config/config.install | 7 ++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/abs/core/LinHES-config/09_mythvantge_runit_grub b/abs/core/LinHES-config/09_mythvantge_runit_grub index aef11a1..137d8f6 100644 --- a/abs/core/LinHES-config/09_mythvantge_runit_grub +++ b/abs/core/LinHES-config/09_mythvantge_runit_grub @@ -30,7 +30,7 @@ menuentry 'LinHES' --class arch --class gnu-linux --class gnu --class os $menuen search --no-floppy --fs-uuid --set=root $boot_device_id fi echo 'Loading Linux core repo kernel ...' - linux /boot/vmlinuz-linux root=UUID=$boot_device_id ro quiet splash udev.log-priority=3 init=/sbin/runit $install_modules + linux /boot/vmlinuz-linux root=UUID=$boot_device_id ro quiet splash udev.log-priority=3 loglevel=3 init=/sbin/runit $install_modules echo 'Loading initial ramdisk ...' initrd /boot/initramfs-linux.img } diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 6b1bcd8..f07539a 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,12 +1,13 @@ pkgname=LinHES-config pkgver=8.5.1 -pkgrel=3 +pkgrel=4 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' - 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-pyparted' - 'python2-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa' - 'python-iplib' 'sudo' 'setserial' 'udevil' 'balance' 'runit-scripts>=8.3-4' ) + 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python2-pyparted' + 'python2-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa' + 'python-iplib' 'sudo' 'setserial' 'udevil' 'balance' + 'mythinstall' 'runit-scripts>=8.3-4' ) arch=('i686' 'x86_64') source=(mv_install.py 09_mythvantge_runit_grub @@ -145,7 +146,7 @@ package() { } md5sums=('518c868141fe443e9258144c029ed3f9' - '51525188ac6f6034422c5d71d0c84408' + 'bee51ac2c232ab134eec127f5c8846ad' 'f6e9dd7bc6cf0aaa3bd203dab4cb79b9' '2596460462cf6c889cf8f95485537b20' '985891a43f7c4c983eb2a362162f1a0f' diff --git a/abs/core/LinHES-config/config.install b/abs/core/LinHES-config/config.install index 50c66c7..332f033 100644 --- a/abs/core/LinHES-config/config.install +++ b/abs/core/LinHES-config/config.install @@ -40,7 +40,12 @@ post_upgrade() { /usr/MythVantage/bin/systemconfig.py -m hostype fi - /usr/MythVantage/bin/systemconfig.py -m locale,vnc,ir + if [ $(vercmp $2 8.5.1-4) -lt 0 ]; then + #reconfig to include grub + /usr/MythVantage/bin/systemconfig.py -m locale,vnc,ir,advanced + else + /usr/MythVantage/bin/systemconfig.py -m locale,vnc,ir + fi echo " Removing pts and shm from fstab..." cp -a /etc/fstab /etc/fstab.backup.pre_pts_shm -- cgit v0.12