From d2e4ca30c0b6ec1a4910f9b368f4755abafea263 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 22 Aug 2012 18:58:23 -0500
Subject: LinHES-config: mv_install add filesystem type to fstab when building
it.
Was set to auto but that caused some problems with the initrd and mounting.
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_install.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 1425f9b..97b4913 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=80
+pkgrel=81
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'
@@ -118,7 +118,7 @@ build() {
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=('d1ad14e1fb1d49b38dd27a96f6c75309'
+md5sums=('0b29bb0819aad086f612699815132ec5'
'c68322a6f6f86f050035a81907f5c1db'
'f909edd79b8a222fb42fb3958851b53a'
'2596460462cf6c889cf8f95485537b20'
@@ -129,7 +129,7 @@ md5sums=('d1ad14e1fb1d49b38dd27a96f6c75309'
'68199e861c2933ccbb84735b9b440157'
'2a7f3b34e522acfd08283b86c8926aba'
'60103d94ada98ac583fea620294f14d3'
- '803a835d226a0677de5d50df335b5766'
+ '36b0ce0589fd522217f90e0d0e5315c0'
'ecf9e5df20683a769c4a8a8f2d65de85'
'895d4e842d7457a48a6d2ce0e9c833b7'
'8ba06c2ce6129371548cc360ccca27f8'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 72c94f8..260a275 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -675,9 +675,9 @@ def create_fstab(extralines):
fstab_list.append(line)
line = '''/dev/sr0 /media/cdrom auto ro,user,noauto,unhide 0 0\n'''
fstab_list.append(line)
- line = '''UUID=ROOTUID / auto defaults,noatime 0 1\n'''
+ line = '''UUID=ROOTUID / %s defaults,noatime 0 1\n''' %(hostoptions["rootfs"])
fstab_list.append(line)
- line = '''UUID=DATAUID %s auto defaults,noatime 0 1\n''' %(data_config.DATAMOUNT)
+ line = '''UUID=DATAUID %s %s defaults,noatime 0 1\n''' %(data_config.DATAMOUNT,hostoptions["datafs"])
fstab_list.append(line)
line = '''UUID=SWAPUID swap swap defaults 0 0 \n'''
fstab_list.append(line)
--
cgit v0.12