diff options
| author | Britney Fransen <brfransen@gmail.com> | 2016-12-20 02:55:29 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2016-12-20 02:55:29 (GMT) |
| commit | fad7b3a009934bae753e989294aa29af5e9b658b (patch) | |
| tree | b2d64a71dff1b494deb21af7f5f4162e5ad5f160 | |
| parent | ec446a3a8bf9d90b9b6cd90bde043ed73f8f9c07 (diff) | |
| download | linhes_pkgbuild-fad7b3a009934bae753e989294aa29af5e9b658b.zip linhes_pkgbuild-fad7b3a009934bae753e989294aa29af5e9b658b.tar.gz linhes_pkgbuild-fad7b3a009934bae753e989294aa29af5e9b658b.tar.bz2 | |
LinHES-config: plymouth_config.py: make sure v86d is before plymouth in mkinitcpio.conf
| -rwxr-xr-x | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/plymouth_config.py | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index a3096f0..7ecd615 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.4.2 -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' @@ -191,5 +191,5 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' '3866086e6af5e3528a66eff492f2f4dd' 'c9279fa095af624ee3d9bc75d3328360' '02cf69074d2bbacef05fa3e451af9af3' - '10354854c29d894d3598639eaa1df72c' + '18a47236637c364af27c14ac0aafc801' '7acbd2064db905e76372a0618b24a6d9') diff --git a/abs/core/LinHES-config/plymouth_config.py b/abs/core/LinHES-config/plymouth_config.py index bb60722..a3ade2b 100755 --- a/abs/core/LinHES-config/plymouth_config.py +++ b/abs/core/LinHES-config/plymouth_config.py @@ -120,14 +120,16 @@ class plymouth_driver(): add_modules = ['i915'] remove_hooks = ['v86d'] else: - #add_modules = ['nfs','jm'] - remove_modules = ['i915'] - add_hooks = ['v86d'] + #add_modules = ['nfs','jm'] + remove_modules = ['i915'] + #remove and add to ensure v86d is first + remove_hooks = ['v86d','plymouth'] + add_hooks = ['v86d','plymouth'] - new_hooks = self.add_hooks(add_hooks , new_hooks) new_hooks = self.remove_hooks(remove_hooks, new_hooks) - new_modules = self.add_modules(add_modules, new_modules) + new_hooks = self.add_hooks(add_hooks , new_hooks) new_modules = self.remove_modules(remove_modules, new_modules) + new_modules = self.add_modules(add_modules, new_modules) self.new_hooks = new_hooks self.new_modules = new_modules @@ -156,7 +158,6 @@ class plymouth_driver(): if line.startswith('MODULES='): new_line = 'MODULES="%s"'%(" ".join(self.new_modules)) f.write(new_line) - f.write("\n") f.close() except: print " plymouth_config: couldn't write %s" %conf_file |