summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-07-29 18:22:11 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-07-29 18:22:11 (GMT)
commite448340b2083b20a2216c6d23078e6c125ce5d70 (patch)
tree2b22f1c3735c70d684ba54ff4a7b67673fc7ec13
parentfbf715df052b415a094d8ae1ea8460d00555114e (diff)
downloadlinhes_pkgbuild-e448340b2083b20a2216c6d23078e6c125ce5d70.zip
linhes_pkgbuild-e448340b2083b20a2216c6d23078e6c125ce5d70.tar.gz
linhes_pkgbuild-e448340b2083b20a2216c6d23078e6c125ce5d70.tar.bz2
LinHES-config: account for change in mkinitcpio
added -b to point to the new root
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/mv_install.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index bdf3e0f..2136a64 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.2
-pkgrel=18
+pkgrel=20
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'
@@ -101,7 +101,7 @@ build() {
install -m 0755 issue $startdir/pkg/etc/issue
}
-md5sums=('39af24fdaba5c1bb241e63c0b7c757c2'
+md5sums=('4bece36b26e390e609fd7a4f5c710986'
'1a4694fcd694b362c339bda781ed0f3e'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 4c4c555..5892444 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -669,7 +669,7 @@ def grub_it():
logging.info("Running grub-install")
runcmd(cmd)
rootuuid = find_uuid(hostoptions["rootpartition"])
- cmd = " mkinitcpio -g %s/boot/kernel26.img" % data_config.MOUNTPOINT
+ cmd = " mkinitcpio -b %s -g %s/boot/kernel26.img" %(data_config.MOUNTPOINT, data_config.MOUNTPOINT)
logging.info("Running mkinitcpio")
runcmd(cmd)
logging.info("Adding root uuid to grub menu")