summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-09-25 07:32:49 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-09-25 07:32:49 (GMT)
commitc8604e5387a6401ea4bc9695faa6f04184b02412 (patch)
tree27759172549668ad4498f0e86738b54aeb033a0a
parent54c1519c2b81b3fb95d4534ba4a2232e1f10eac2 (diff)
downloadlinhes_pkgbuild-c8604e5387a6401ea4bc9695faa6f04184b02412.zip
linhes_pkgbuild-c8604e5387a6401ea4bc9695faa6f04184b02412.tar.gz
linhes_pkgbuild-c8604e5387a6401ea4bc9695faa6f04184b02412.tar.bz2
filesystem:Fix for proper handling of optical media.
-rw-r--r--abs/core-testing/filesystem/PKGBUILD4
-rw-r--r--abs/core-testing/filesystem/filesystem.install8
-rw-r--r--abs/core-testing/filesystem/fstab3
3 files changed, 11 insertions, 4 deletions
diff --git a/abs/core-testing/filesystem/PKGBUILD b/abs/core-testing/filesystem/PKGBUILD
index d8b8161..02649c3 100644
--- a/abs/core-testing/filesystem/PKGBUILD
+++ b/abs/core-testing/filesystem/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=filesystem
pkgver=2009.01
-pkgrel=1
+pkgrel=2
pkgdesc="Base filesystem"
arch=(i686 x86_64)
license=('GPL')
@@ -26,7 +26,7 @@ md5sums=('f4cf8d0a2de2658165148d5f64d81675'
'2c24792d97ef3cf0d73b60d4c429730b'
'8a9042a2cedf6b6b47eb8973f14289cb'
'019e5c24f9befef395a28e7ef2e4e5b9'
- '4e2f238bae5cbf716ff73c9404404269'
+ 'c4f23a66a1bcc08fd164639bdafbc60a'
'e5d8323a4dbee7a6d0d2a19cbf4b819f'
'81b3cb42a6ddabc2ed2310511ee9c859'
'd41d8cd98f00b204e9800998ecf8427e'
diff --git a/abs/core-testing/filesystem/filesystem.install b/abs/core-testing/filesystem/filesystem.install
index 92b336f..5be51ed 100644
--- a/abs/core-testing/filesystem/filesystem.install
+++ b/abs/core-testing/filesystem/filesystem.install
@@ -57,4 +57,12 @@ post_upgrade() {
echo "adding new group: scanner"
usr/sbin/groupadd -g 96 scanner >/dev/null
fi
+ cp /etc/fstab /etc/fstab.orig
+ if grep -q /dev/sro /etc/fstab
+ then
+ exit
+ else
+ grep -v /dev/dvd /etc/fstab > /tmp/fstab
+ cat /tmp/fstab | sed -e 's|/dev/cdrom|/dev/sr0|g' > /etc/fstab
+ fi
}
diff --git a/abs/core-testing/filesystem/fstab b/abs/core-testing/filesystem/fstab
index a609a32..c3a01cb 100644
--- a/abs/core-testing/filesystem/fstab
+++ b/abs/core-testing/filesystem/fstab
@@ -5,7 +5,6 @@
none /dev/pts devpts defaults 0 0
none /dev/shm tmpfs defaults 0 0
-/dev/cdrom /media/cd auto ro,user,noauto,unhide 0 0
-/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0
+/dev/sr0 /media/cd auto ro,user,noauto,unhide 0 0
/dev/fd0 /media/fl auto user,noauto 0 0