summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-01-18 00:03:11 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-01-18 00:03:11 (GMT)
commit1ed68530466f71d4077f50597c73103f3e5d4d9b (patch)
treef46a85b86fdb26557d6e0bcfd593aca471537946 /abs
parent9df97849f3f2455f4719597b417c8b5f072b6bd5 (diff)
downloadlinhes_pkgbuild-1ed68530466f71d4077f50597c73103f3e5d4d9b.zip
linhes_pkgbuild-1ed68530466f71d4077f50597c73103f3e5d4d9b.tar.gz
linhes_pkgbuild-1ed68530466f71d4077f50597c73103f3e5d4d9b.tar.bz2
add chroot_mount_points to create /media/{cdrom|dvd} and /mnt
Closes FS#103
Diffstat (limited to 'abs')
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/install_functions.sh2
-rwxr-xr-xabs/core-testing/LinHES-config/install_proxy.sh12
3 files changed, 13 insertions, 3 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index ff8612c..b155084 100755
--- 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=197
+pkgrel=201
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 )
diff --git a/abs/core-testing/LinHES-config/install_functions.sh b/abs/core-testing/LinHES-config/install_functions.sh
index e9d2461..79fee1d 100755
--- a/abs/core-testing/LinHES-config/install_functions.sh
+++ b/abs/core-testing/LinHES-config/install_functions.sh
@@ -356,6 +356,8 @@ device_node () {
}
+
+
function create_fstab()
{
echo "creating fstab"
diff --git a/abs/core-testing/LinHES-config/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh
index 011dfac..2dd8666 100755
--- a/abs/core-testing/LinHES-config/install_proxy.sh
+++ b/abs/core-testing/LinHES-config/install_proxy.sh
@@ -19,7 +19,14 @@ BACKUPFILE="/myth/backup/mythconverg.sql.gz"
#TEMPNET="Hostip"$default_interface
#eval MYTHIP=\$${TEMPNET}
+function create_chroot_mnt_points() {
+ echo "Creating directory for media in chroot"
+ mkdir -p $mountpoint/media/cdrom
+ mkdir -p $mountpoint/media/dvd
+ mkdir -p $mountpoint/mnt
+
+}
function cp_and_log () {
ls $1 >/dev/null 2>&1
status=$?
@@ -186,7 +193,7 @@ full_install () {
$run copy_it $disk ALL
rm $mountpoint/etc/fstab
$run fstab_fix_it $disk $rootfs $datafs FULL_INSTALL
- echo "Configuring system" > /tmp/.install_state
+ echo "Configuring system" > /tmp/.install_state
progress 100
#progress 99
sleep 1
@@ -213,6 +220,7 @@ full_install () {
#cp -rp $MV_ROOT/bin/*.sh "$mountpoint"$MV_ROOT/bin/
cp_and_log "$MV_ROOT/bin/*.sh" "$mountpoint"$MV_ROOT/bin/
chmod -R 755 ${mountpoint}/root
+ create_chroot_mnt_points
cp_and_log /etc/mtab "$mountpoint"/etc/mtab
# cp_and_log /etc/hostname "$mountpoint"/etc/hostname
apply_new_auth
@@ -337,7 +345,7 @@ function upgrade () {
fi
echo $run fstab_fix_it $disk UPGRADE $MYTHMOUNT
$run fstab_fix_it $disk UPGRADE $MYTHMOUNT
-
+ create_chroot_mnt_points
#echo "Writing boot sector" > /tmp/.install_state
#progress 99