From 1ed68530466f71d4077f50597c73103f3e5d4d9b Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 17 Jan 2009 18:03:11 -0600
Subject: add chroot_mount_points to create /media/{cdrom|dvd} and /mnt Closes
 FS#103

---
 abs/core-testing/LinHES-config/PKGBUILD             |  2 +-
 abs/core-testing/LinHES-config/install_functions.sh |  2 ++
 abs/core-testing/LinHES-config/install_proxy.sh     | 12 ++++++++++--
 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
-- 
cgit v0.12

