From 9c9505429b54c286503d01cb1c8dba37243f1c27 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 30 Jul 2011 14:24:22 -0500 Subject: linhes-config/system-config: update fstab template to use the newer format devpts /dev/pts devpts defaults 0 0 shm /dev/shm tmpfs nodev,nosuid 0 0 --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_install.py | 4 ++-- abs/core/system-templates/PKGBUILD | 2 +- abs/core/system-templates/system-templates-2.0-4.src.tar.gz | 1 + abs/core/system-templates/templates/fstab.conf.template | 9 +++++++-- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 120000 abs/core/system-templates/system-templates-2.0-4.src.tar.gz diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2136a64..2289196 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=20 +pkgrel=21 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=('4bece36b26e390e609fd7a4f5c710986' +md5sums=('c1f6bd445284408767ab8ab4c4164aed' '1a4694fcd694b362c339bda781ed0f3e' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 5892444..9dcc7b7 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -526,9 +526,9 @@ def create_fstab(extralines): f = open(fstabfile, 'w') line = '''# \n''' fstab_list.append(line) - line = '''none /dev/pts devpts defaults 0 0 \n''' + line = '''devpts /dev/pts devpts defaults 0 0 \n''' fstab_list.append(line) - line = '''none /dev/shm tmpfs defaults 0 0\n''' + line = '''shm /dev/shm tmpfs nodev,nosuid 0 0 \n''' fstab_list.append(line) line = '''/dev/sr0 /media/cdrom auto ro,user,noauto,unhide 0 0\n''' fstab_list.append(line) diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 1b3e3e3..bd53e14 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=2.0 -pkgrel=3 +pkgrel=4 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz new file mode 120000 index 0000000..111669c --- /dev/null +++ b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/system-templates-2.0-4.src.tar.gz \ No newline at end of file diff --git a/abs/core/system-templates/templates/fstab.conf.template b/abs/core/system-templates/templates/fstab.conf.template index f8544cf..2bf5547 100755 --- a/abs/core/system-templates/templates/fstab.conf.template +++ b/abs/core/system-templates/templates/fstab.conf.template @@ -2,8 +2,13 @@ # /etc/fstab: static file system information # # -none /dev/pts devpts defaults 0 0 -none /dev/shm tmpfs defaults 0 0 +#none /dev/pts devpts defaults 0 0 +#none /dev/shm tmpfs defaults 0 0 + +# +devpts /dev/pts devpts defaults 0 0 +shm /dev/shm tmpfs nodev,nosuid 0 0 + /dev/cdrom /mnt/cd iso9660 ro,user,noauto,unhide 0 0 /dev/dvd /mnt/dvd udf ro,user,noauto,unhide 0 0 -- cgit v0.12