diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-04-03 22:33:02 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-04-03 22:33:02 (GMT) |
| commit | 972d85587c4c79656fa2401c13eb3e4c9802e024 (patch) | |
| tree | 6fe02f7c56fd456079cd7756b03941b3701a3419 /abs/core-testing | |
| parent | d2ea2dba1c901e7c415ba36bbaaf31c1fc7b1d25 (diff) | |
| download | linhes_pkgbuild-972d85587c4c79656fa2401c13eb3e4c9802e024.zip linhes_pkgbuild-972d85587c4c79656fa2401c13eb3e4c9802e024.tar.gz linhes_pkgbuild-972d85587c4c79656fa2401c13eb3e4c9802e024.tar.bz2 | |
LinHES-config: Better method to scrubnfs.
Only delete lines between
#startscrub
#endscrub
Closes FS#314
Diffstat (limited to 'abs/core-testing')
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/systemconfig.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 3599ca8..36e4552 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=369 +pkgrel=374 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates ) diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index 695be64..7a6f0fe 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -243,11 +243,13 @@ function setupevrouter { function scrubnfs { cp_and_log /etc/fstab $TEMPLATES/fstab.conf.template - grep -v nfs $TEMPLATES/fstab.conf.template > ${BASE}/etc/fstab + + sed '/^#STARTSCRUB.*$/,/^#ENDSCRUB.*$/d' $TEMPLATES/fstab.conf.template > ${BASE}/etc/fstab } function setupfstab () { # setupfstab $NFSserver $NFSshare $NFSmount + echo "#STARTSCRUB --------------anything in this block will be scrubbed" >> ${BASE}/etc/fstab echo "$1 $2 nfs" >> ${BASE}/etc/fstab if [ ! -e "$2" ] then @@ -258,7 +260,7 @@ function setupfstab () { then mount $2 & fi - + echo "#ENDSCRUB" >> ${BASE}/etc/fstab } function setupncidclient |