summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-09-25 08:18:27 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-09-25 08:18:27 (GMT)
commit17d3f58dee6c759b639450bf641ea770a21edf75 (patch)
tree244c10577f52f2805e8c8b912b97a7042cb2178c
parentc8604e5387a6401ea4bc9695faa6f04184b02412 (diff)
downloadlinhes_pkgbuild-17d3f58dee6c759b639450bf641ea770a21edf75.zip
linhes_pkgbuild-17d3f58dee6c759b639450bf641ea770a21edf75.tar.gz
linhes_pkgbuild-17d3f58dee6c759b639450bf641ea770a21edf75.tar.bz2
LinHES-config:Fix for optical media handling.
-rw-r--r--abs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/mv_install.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 7951881..83a1c71 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.0
-pkgrel=98
+pkgrel=99
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted
diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py
index 7d72c22..19295ca 100755
--- a/abs/core-testing/LinHES-config/mv_install.py
+++ b/abs/core-testing/LinHES-config/mv_install.py
@@ -518,9 +518,7 @@ def create_fstab(extralines):
fstab_list.append(line)
line = '''none /dev/shm tmpfs defaults 0 0\n'''
fstab_list.append(line)
- line = '''/dev/cdrom /media/cdrom auto ro,user,noauto,unhide 0 0\n'''
- fstab_list.append(line)
- line = '''/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0\n'''
+ 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'''
fstab_list.append(line)